From 859739c01510861a1ae262e419447bd1648ea2e9 Mon Sep 17 00:00:00 2001
From: Alexander Diewald <diewald@fortiss.org>
Date: Tue, 24 Jan 2017 14:15:47 +0000
Subject: [PATCH] - Delete content of generated-src (committed by accident). -
 Set svn:ignore property for generated-src.

---
 .../dsl/model/MOEAExplorationExpression.java  |  55 --
 .../exploration/dsl/model/ModelFactory.java   |  33 -
 .../exploration/dsl/model/ModelPackage.java   | 149 ---
 .../expressions/ArithmeticExpression.java     |  21 -
 .../model/expressions/BooleanExpression.java  |  21 -
 .../expressions/ConstraintExpression.java     |  85 --
 .../model/expressions/ElementExpression.java  |  53 -
 .../dsl/model/expressions/Expression.java     |  22 -
 .../model/expressions/ExpressionsFactory.java |  62 --
 .../model/expressions/ExpressionsPackage.java | 541 ----------
 .../expressions/ObjectiveExpression.java      |  22 -
 .../model/expressions/PrefixExpression.java   |  81 --
 .../impl/ConstraintExpressionImpl.java        | 282 ------
 .../impl/ElementExpressionImpl.java           | 160 ---
 .../impl/ExpressionsFactoryImpl.java          | 119 ---
 .../impl/ExpressionsPackageImpl.java          | 425 --------
 .../impl/ObjectiveExpressionImpl.java         | 308 ------
 .../util/ExpressionsAdapterFactory.java       | 269 -----
 .../expressions/util/ExpressionsSwitch.java   | 279 ------
 .../dsl/model/impl/ModelFactoryImpl.java      |  84 --
 .../dsl/model/impl/ModelPackageImpl.java      | 233 -----
 .../dsl/model/operators/ArithmeticOp.java     |  22 -
 .../operators/ArithmeticOperatorEnum.java     | 265 -----
 .../model/operators/BooleanOperatorEnum.java  | 265 -----
 .../dsl/model/operators/ComparisonOp.java     |  23 -
 .../operators/ComparisonOperatorEnum.java     | 292 ------
 .../dsl/model/operators/DualOperator.java     |  52 -
 .../dsl/model/operators/LocationOp.java       |  25 -
 .../model/operators/LocationOperatorEnum.java | 211 ----
 .../dsl/model/operators/Operator.java         |  80 --
 .../dsl/model/operators/OperatorsFactory.java | 100 --
 .../dsl/model/operators/OperatorsPackage.java | 816 ---------------
 .../operators/OptimizationDirection.java      |  22 -
 .../operators/OptimizationDirectionEnum.java  | 211 ----
 .../dsl/model/operators/QuantifierEnum.java   | 237 -----
 .../dsl/model/operators/QuantifierOp.java     |  22 -
 .../dsl/model/operators/SummationOp.java      |  22 -
 .../operators/impl/ArithmeticOpImpl.java      |  77 --
 .../operators/impl/ComparisonOpImpl.java      |  77 --
 .../operators/impl/DualOperatorImpl.java      | 351 -------
 .../model/operators/impl/LocationOpImpl.java  |  79 --
 .../operators/impl/OperatorsFactoryImpl.java  | 336 -------
 .../operators/impl/OperatorsPackageImpl.java  | 650 ------------
 .../impl/OptimizationDirectionImpl.java       | 261 -----
 .../operators/impl/QuantifierOpImpl.java      | 261 -----
 .../model/operators/impl/SummationOpImpl.java | 263 -----
 .../util/OperatorsAdapterFactory.java         | 306 ------
 .../model/operators/util/OperatorsSwitch.java | 326 ------
 .../dsl/model/patterns/ElementProperty.java   |  94 --
 .../dsl/model/patterns/LocationPattern.java   |  26 -
 .../dsl/model/patterns/LocationProperty.java  |  57 --
 .../dsl/model/patterns/PatternsFactory.java   | 100 --
 .../dsl/model/patterns/PatternsPackage.java   | 631 ------------
 .../patterns/SinglePropValueComparison.java   |  22 -
 .../model/patterns/TwoPropCalcExpression.java |  24 -
 .../patterns/TwoPropertyValueComparison.java  |  22 -
 .../dsl/model/patterns/ValueComparison.java   |  26 -
 .../patterns/impl/ElementPropertyImpl.java    | 232 -----
 .../patterns/impl/LocationPatternImpl.java    |  58 --
 .../patterns/impl/LocationPropertyImpl.java   | 206 ----
 .../patterns/impl/PatternsFactoryImpl.java    | 216 ----
 .../patterns/impl/PatternsPackageImpl.java    | 523 ----------
 .../impl/SinglePropValueComparisonImpl.java   |  42 -
 .../impl/TwoPropCalcExpressionImpl.java       |  44 -
 .../impl/TwoPropertyValueComparisonImpl.java  |  42 -
 .../patterns/impl/ValueComparisonImpl.java    |  45 -
 .../patterns/util/PatternsAdapterFactory.java | 423 --------
 .../model/patterns/util/PatternsSwitch.java   | 433 --------
 .../dsl/model/types/ArithmeticVariable.java   |  22 -
 .../dsl/model/types/IntegerLiteral.java       |  22 -
 .../dsl/model/types/ModelElementVariable.java |  24 -
 .../dsl/model/types/NumberLiteral.java        |  53 -
 .../dsl/model/types/RealLiteral.java          |  22 -
 .../exploration/dsl/model/types/SetType.java  |  21 -
 .../dsl/model/types/TypesFactory.java         |  98 --
 .../dsl/model/types/TypesPackage.java         | 467 ---------
 .../exploration/dsl/model/types/Variable.java |  53 -
 .../types/impl/ArithmeticVariableImpl.java    |  39 -
 .../model/types/impl/IntegerLiteralImpl.java  |  52 -
 .../types/impl/ModelElementVariableImpl.java  | 216 ----
 .../model/types/impl/NumberLiteralImpl.java   | 154 ---
 .../dsl/model/types/impl/RealLiteralImpl.java |  52 -
 .../dsl/model/types/impl/SetTypeImpl.java     |  39 -
 .../model/types/impl/TypesFactoryImpl.java    | 163 ---
 .../model/types/impl/TypesPackageImpl.java    | 402 --------
 .../dsl/model/types/impl/VariableImpl.java    | 154 ---
 .../model/types/util/TypesAdapterFactory.java | 288 ------
 .../dsl/model/types/util/TypesSwitch.java     | 302 ------
 .../dsl/model/util/ModelAdapterFactory.java   | 120 ---
 .../dsl/model/util/ModelSwitch.java           | 110 ---
 .../af3/exploration/model/CommonFactory.java  |  33 -
 .../af3/exploration/model/CommonPackage.java  | 176 ----
 .../model/MOExplorationObjective.java         |  52 -
 .../model/impl/CommonFactoryImpl.java         |  84 --
 .../model/impl/CommonPackageImpl.java         | 216 ----
 .../ComponentAllocationConstraint.java        |  26 -
 .../ComponentDislocationConstraint.java       |  26 -
 .../model/location/LocationConstraint.java    |  48 -
 .../model/location/LocationDimension.java     |  22 -
 .../model/location/LocationFactory.java       |  62 --
 .../model/location/LocationPackage.java       | 410 --------
 .../ComponentAllocationConstraintImpl.java    | 268 -----
 .../ComponentDislocationConstraintImpl.java   | 268 -----
 .../location/impl/LocationConstraintImpl.java | 432 --------
 .../location/impl/LocationFactoryImpl.java    | 119 ---
 .../location/impl/LocationPackageImpl.java    | 301 ------
 .../location/util/LocationAdapterFactory.java | 312 ------
 .../model/location/util/LocationSwitch.java   | 318 ------
 .../exploration/model/time/DeadlineComp.java  |  24 -
 .../model/time/DeadlineConstraint.java        | 110 ---
 .../exploration/model/time/LatencyCalc.java   |  22 -
 .../model/time/PeriodConstraint.java          |  86 --
 .../exploration/model/time/TimeDimension.java |  22 -
 .../exploration/model/time/TimeFactory.java   |  69 --
 .../exploration/model/time/TimePackage.java   | 444 ---------
 .../model/time/impl/DeadlineCompImpl.java     |  44 -
 .../time/impl/DeadlineConstraintImpl.java     | 613 ------------
 .../model/time/impl/LatencyCalcImpl.java      |  41 -
 .../model/time/impl/PeriodConstraintImpl.java | 595 -----------
 .../model/time/impl/TimeFactoryImpl.java      | 128 ---
 .../model/time/impl/TimePackageImpl.java      | 347 -------
 .../model/time/util/TimeAdapterFactory.java   | 444 ---------
 .../model/time/util/TimeSwitch.java           | 434 --------
 .../model/util/CommonAdapterFactory.java      | 214 ----
 .../exploration/model/util/CommonSwitch.java  | 194 ----
 .../moea/model/DseSpecification.java          | 130 ---
 .../moea/model/ExplorationManager.java        |  45 -
 .../moea/model/ImplementsComponentRef.java    |  56 --
 .../exploration/moea/model/MoeaFactory.java   |  69 --
 .../exploration/moea/model/MoeaPackage.java   | 561 -----------
 .../af3/exploration/moea/model/VoterType.java |  53 -
 .../exploration/moea/model/VoterType_t.java   | 181 ----
 .../moea/model/feature/FeatureFactory.java    |  60 --
 .../moea/model/feature/FeaturePackage.java    | 261 -----
 .../moea/model/feature/SafetyExploration.java |  44 -
 .../moea/model/feature/TaskInstantiation.java |  18 -
 .../moea/model/feature/TaskMapping.java       |  18 -
 .../feature/impl/FeatureFactoryImpl.java      | 168 ----
 .../feature/impl/FeaturePackageImpl.java      | 285 ------
 .../feature/impl/SafetyExplorationImpl.java   | 151 ---
 .../feature/impl/TaskInstantiationImpl.java   |  41 -
 .../model/feature/impl/TaskMappingImpl.java   |  41 -
 .../feature/util/FeatureAdapterFactory.java   | 176 ----
 .../model/feature/util/FeatureSwitch.java     | 172 ----
 .../moea/model/impl/DseSpecificationImpl.java | 605 ------------
 .../model/impl/ExplorationManagerImpl.java    | 330 -------
 .../impl/ImplementsComponentRefImpl.java      | 339 -------
 .../moea/model/impl/MoeaFactoryImpl.java      | 179 ----
 .../moea/model/impl/MoeaPackageImpl.java      | 396 --------
 .../moea/model/impl/VoterTypeImpl.java        | 332 -------
 .../moea/model/parameters/EAOptimizer.java    | 161 ---
 .../moea/model/parameters/ExecutionModel.java | 211 ----
 .../moea/model/parameters/IOptimizer.java     |  22 -
 .../model/parameters/ParametersFactory.java   |  51 -
 .../model/parameters/ParametersPackage.java   | 398 --------
 .../model/parameters/SystemParameters.java    |  56 --
 .../parameters/impl/EAOptimizerImpl.java      | 379 -------
 .../impl/ParametersFactoryImpl.java           | 157 ---
 .../impl/ParametersPackageImpl.java           | 335 -------
 .../parameters/impl/SystemParametersImpl.java | 164 ----
 .../util/ParametersAdapterFactory.java        | 156 ---
 .../parameters/util/ParametersSwitch.java     | 153 ---
 .../ComponentMultiAllocationConstraint.java   |  64 --
 .../ComponentMultiDislocationConstraint.java  |  64 --
 .../model/predefined/EnergyMinObjective.java  |  25 -
 .../model/predefined/FailureMinObjective.java | 115 ---
 .../moea/model/predefined/FailureMode.java    | 211 ----
 .../moea/model/predefined/FailureType.java    | 238 -----
 .../predefined/MultiLocationConstraint.java   |  71 --
 .../model/predefined/PredefinedFactory.java   | 107 --
 .../model/predefined/PredefinedPackage.java   | 929 ------------------
 .../model/predefined/ReliabilityAnalysis.java |  27 -
 .../model/predefined/SafetyComparison.java    |  28 -
 .../SafetyIntegrityLevelConstraint.java       |  64 --
 ...omponentMultiAllocationConstraintImpl.java | 297 ------
 ...mponentMultiDislocationConstraintImpl.java | 297 ------
 .../impl/EnergyMinObjectiveImpl.java          | 489 ---------
 .../impl/FailureMinObjectiveImpl.java         | 633 ------------
 .../impl/MultiLocationConstraintImpl.java     | 155 ---
 .../impl/PredefinedFactoryImpl.java           | 249 -----
 .../impl/PredefinedPackageImpl.java           | 616 ------------
 .../impl/ReliabilityAnalysisImpl.java         | 312 ------
 .../predefined/impl/SafetyComparisonImpl.java |  47 -
 .../SafetyIntegrityLevelConstraintImpl.java   | 597 -----------
 .../util/PredefinedAdapterFactory.java        | 653 ------------
 .../predefined/util/PredefinedSwitch.java     | 663 -------------
 .../model/solutions/ExplorationResult.java    |  53 -
 .../solutions/ExplorationSolutionSet.java     |  98 --
 .../SingleExplorationSolutionMap.java         | 174 ----
 .../model/solutions/SolutionsFactory.java     |  60 --
 .../model/solutions/SolutionsPackage.java     | 564 -----------
 .../impl/EJavaClassToEJavaObjectMapImpl.java  | 288 ------
 .../solutions/impl/ExplorationResultImpl.java | 154 ---
 .../impl/ExplorationSolutionSetImpl.java      | 284 ------
 ...ationTargetToExplorationResultMapImpl.java | 343 -------
 .../SingleExplorationSolutionMapImpl.java     | 271 -----
 .../solutions/impl/SolutionsFactoryImpl.java  | 143 ---
 .../solutions/impl/SolutionsPackageImpl.java  | 497 ----------
 .../util/SolutionsAdapterFactory.java         | 215 ----
 .../model/solutions/util/SolutionsSwitch.java | 215 ----
 .../moea/model/util/MoeaAdapterFactory.java   | 290 ------
 .../moea/model/util/MoeaSwitch.java           | 284 ------
 202 files changed, 39937 deletions(-)
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/MOEAExplorationExpression.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/ModelFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/ModelPackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ArithmeticExpression.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/BooleanExpression.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ConstraintExpression.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ElementExpression.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/Expression.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ExpressionsFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ExpressionsPackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ObjectiveExpression.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/PrefixExpression.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ConstraintExpressionImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ElementExpressionImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ExpressionsFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ExpressionsPackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ObjectiveExpressionImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/util/ExpressionsAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/util/ExpressionsSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/impl/ModelFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/impl/ModelPackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ArithmeticOp.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ArithmeticOperatorEnum.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/BooleanOperatorEnum.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ComparisonOp.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ComparisonOperatorEnum.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/DualOperator.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/LocationOp.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/LocationOperatorEnum.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/Operator.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OperatorsFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OperatorsPackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OptimizationDirection.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OptimizationDirectionEnum.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/QuantifierEnum.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/QuantifierOp.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/SummationOp.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/ArithmeticOpImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/ComparisonOpImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/DualOperatorImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/LocationOpImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OperatorsFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OperatorsPackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OptimizationDirectionImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/QuantifierOpImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/SummationOpImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/util/OperatorsAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/util/OperatorsSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/ElementProperty.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/LocationPattern.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/LocationProperty.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/PatternsFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/PatternsPackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/SinglePropValueComparison.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/TwoPropCalcExpression.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/TwoPropertyValueComparison.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/ValueComparison.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/ElementPropertyImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/LocationPatternImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/LocationPropertyImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/PatternsFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/PatternsPackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/SinglePropValueComparisonImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/TwoPropCalcExpressionImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/TwoPropertyValueComparisonImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/ValueComparisonImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/util/PatternsAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/util/PatternsSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/ArithmeticVariable.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/IntegerLiteral.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/ModelElementVariable.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/NumberLiteral.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/RealLiteral.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/SetType.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/TypesFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/TypesPackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/Variable.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/ArithmeticVariableImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/IntegerLiteralImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/ModelElementVariableImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/NumberLiteralImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/RealLiteralImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/SetTypeImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/TypesFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/TypesPackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/VariableImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/util/TypesAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/util/TypesSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/util/ModelAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/util/ModelSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/CommonFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/CommonPackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/MOExplorationObjective.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/impl/CommonFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/impl/CommonPackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/ComponentAllocationConstraint.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/ComponentDislocationConstraint.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationConstraint.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationDimension.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationPackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/ComponentAllocationConstraintImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/ComponentDislocationConstraintImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationConstraintImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationPackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/util/LocationAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/util/LocationSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/DeadlineComp.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/DeadlineConstraint.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/LatencyCalc.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/PeriodConstraint.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimeDimension.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimeFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimePackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/DeadlineCompImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/DeadlineConstraintImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/LatencyCalcImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/PeriodConstraintImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/TimeFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/TimePackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/util/TimeAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/util/TimeSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/util/CommonAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/util/CommonSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/DseSpecification.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/ExplorationManager.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/ImplementsComponentRef.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/MoeaFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/MoeaPackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/VoterType.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/VoterType_t.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/FeatureFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/FeaturePackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/SafetyExploration.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/TaskInstantiation.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/TaskMapping.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/FeatureFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/FeaturePackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/SafetyExplorationImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/TaskInstantiationImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/TaskMappingImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/util/FeatureAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/util/FeatureSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/DseSpecificationImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/ExplorationManagerImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/ImplementsComponentRefImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/MoeaFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/MoeaPackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/VoterTypeImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/EAOptimizer.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ExecutionModel.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/IOptimizer.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ParametersFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ParametersPackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/SystemParameters.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/EAOptimizerImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/ParametersFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/ParametersPackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/SystemParametersImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/util/ParametersAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/util/ParametersSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ComponentMultiAllocationConstraint.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ComponentMultiDislocationConstraint.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/EnergyMinObjective.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureMinObjective.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureMode.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureType.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/MultiLocationConstraint.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/PredefinedFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/PredefinedPackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ReliabilityAnalysis.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/SafetyComparison.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/SafetyIntegrityLevelConstraint.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ComponentMultiAllocationConstraintImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ComponentMultiDislocationConstraintImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/EnergyMinObjectiveImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/FailureMinObjectiveImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/MultiLocationConstraintImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/PredefinedFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/PredefinedPackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ReliabilityAnalysisImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/SafetyComparisonImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/SafetyIntegrityLevelConstraintImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/util/PredefinedAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/util/PredefinedSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/ExplorationResult.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/ExplorationSolutionSet.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SingleExplorationSolutionMap.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SolutionsFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SolutionsPackage.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/EJavaClassToEJavaObjectMapImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationResultImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationSolutionSetImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationTargetToExplorationResultMapImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SingleExplorationSolutionMapImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SolutionsFactoryImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SolutionsPackageImpl.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/util/SolutionsAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/util/SolutionsSwitch.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/util/MoeaAdapterFactory.java
 delete mode 100644 org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/util/MoeaSwitch.java

diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/MOEAExplorationExpression.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/MOEAExplorationExpression.java
deleted file mode 100644
index 647d5957..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/MOEAExplorationExpression.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>MOEA Exploration Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.dsl.model.ModelPackage#getMOEAExplorationExpression()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface MOEAExplorationExpression extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Expression</em>' containment reference.
-	 * @see #setExpression(Expression)
-	 * @see org.fortiss.af3.exploration.dsl.model.ModelPackage#getMOEAExplorationExpression_Expression()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	Expression getExpression();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression#getExpression <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expression</em>' containment reference.
-	 * @see #getExpression()
-	 * @generated
-	 */
-	void setExpression(Expression value);
-
-} // MOEAExplorationExpression
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/ModelFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/ModelFactory.java
deleted file mode 100644
index c560d1f5..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/ModelFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.ModelPackage
- * @generated
- */
-public interface ModelFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ModelFactory eINSTANCE = org.fortiss.af3.exploration.dsl.model.impl.ModelFactoryImpl.init();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ModelPackage getModelPackage();
-
-} //ModelFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/ModelPackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/ModelPackage.java
deleted file mode 100644
index 3778beed..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/ModelPackage.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.ModelFactory
- * @model kind="package"
- * @generated
- */
-public interface ModelPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "model";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/explorationdsl";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-explorationdsl";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ModelPackage eINSTANCE = org.fortiss.af3.exploration.dsl.model.impl.ModelPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression <em>MOEA Exploration Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression
-	 * @see org.fortiss.af3.exploration.dsl.model.impl.ModelPackageImpl#getMOEAExplorationExpression()
-	 * @generated
-	 */
-	int MOEA_EXPLORATION_EXPRESSION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MOEA_EXPLORATION_EXPRESSION__EXPRESSION = 0;
-
-	/**
-	 * The number of structural features of the '<em>MOEA Exploration Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MOEA_EXPLORATION_EXPRESSION_FEATURE_COUNT = 1;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression <em>MOEA Exploration Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>MOEA Exploration Expression</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression
-	 * @generated
-	 */
-	EClass getMOEAExplorationExpression();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression#getExpression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Expression</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression#getExpression()
-	 * @see #getMOEAExplorationExpression()
-	 * @generated
-	 */
-	EReference getMOEAExplorationExpression_Expression();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ModelFactory getModelFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression <em>MOEA Exploration Expression</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression
-		 * @see org.fortiss.af3.exploration.dsl.model.impl.ModelPackageImpl#getMOEAExplorationExpression()
-		 * @generated
-		 */
-		EClass MOEA_EXPLORATION_EXPRESSION = eINSTANCE.getMOEAExplorationExpression();
-
-		/**
-		 * The meta object literal for the '<em><b>Expression</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MOEA_EXPLORATION_EXPRESSION__EXPRESSION = eINSTANCE.getMOEAExplorationExpression_Expression();
-
-	}
-
-} //ModelPackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ArithmeticExpression.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ArithmeticExpression.java
deleted file mode 100644
index 117cd91a..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ArithmeticExpression.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Arithmetic Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getArithmeticExpression()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface ArithmeticExpression<T> extends Expression {
-} // ArithmeticExpression
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/BooleanExpression.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/BooleanExpression.java
deleted file mode 100644
index 5d8e2816..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/BooleanExpression.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getBooleanExpression()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface BooleanExpression extends Expression {
-} // BooleanExpression
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ConstraintExpression.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ConstraintExpression.java
deleted file mode 100644
index 82a99065..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ConstraintExpression.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constraint Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression#getPrefix <em>Prefix</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression#getPredicate <em>Predicate</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getConstraintExpression()
- * @model
- * @generated
- */
-public interface ConstraintExpression<T extends BooleanExpression> extends Expression {
-	/**
-	 * Returns the value of the '<em><b>Prefix</b></em>' containment reference list.
-	 * The list contents are of type {@link org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Prefix</em>' containment reference list.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getConstraintExpression_Prefix()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	EList<PrefixExpression> getPrefix();
-
-	/**
-	 * Returns the value of the '<em><b>Predicate</b></em>' containment reference list.
-	 * The list contents are of type {@link org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Predicate</em>' containment reference list.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getConstraintExpression_Predicate()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<BooleanExpression> getPredicate();
-
-	/**
-	 * Returns the value of the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Expression</em>' containment reference.
-	 * @see #setExpression(BooleanExpression)
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getConstraintExpression_Expression()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	T getExpression();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression#getExpression <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expression</em>' containment reference.
-	 * @see #getExpression()
-	 * @generated
-	 */
-	void setExpression(T value);
-
-} // ConstraintExpression
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ElementExpression.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ElementExpression.java
deleted file mode 100644
index b5ecabbf..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ElementExpression.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression#getModelElement <em>Model Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getElementExpression()
- * @model
- * @generated
- */
-public interface ElementExpression<ME extends IModelElement> extends Expression {
-	/**
-	 * Returns the value of the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Model Element</em>' reference.
-	 * @see #setModelElement(IModelElement)
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getElementExpression_ModelElement()
-	 * @model
-	 * @generated
-	 */
-	ME getModelElement();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression#getModelElement <em>Model Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Model Element</em>' reference.
-	 * @see #getModelElement()
-	 * @generated
-	 */
-	void setModelElement(ME value);
-
-} // ElementExpression
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/Expression.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/Expression.java
deleted file mode 100644
index 91c5bca8..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/Expression.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getExpression()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Expression extends EObject {
-} // Expression
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ExpressionsFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ExpressionsFactory.java
deleted file mode 100644
index 43282956..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ExpressionsFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions;
-
-import org.eclipse.emf.ecore.EFactory;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage
- * @generated
- */
-public interface ExpressionsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ExpressionsFactory eINSTANCE = org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Objective Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Objective Expression</em>'.
-	 * @generated
-	 */
-	ObjectiveExpression createObjectiveExpression();
-
-	/**
-	 * Returns a new object of class '<em>Constraint Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Constraint Expression</em>'.
-	 * @generated
-	 */
-	<T extends BooleanExpression> ConstraintExpression<T> createConstraintExpression();
-
-	/**
-	 * Returns a new object of class '<em>Element Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Element Expression</em>'.
-	 * @generated
-	 */
-	<ME extends IModelElement> ElementExpression<ME> createElementExpression();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ExpressionsPackage getExpressionsPackage();
-
-} //ExpressionsFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ExpressionsPackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ExpressionsPackage.java
deleted file mode 100644
index e2f689ef..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ExpressionsPackage.java
+++ /dev/null
@@ -1,541 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsFactory
- * @model kind="package"
- * @generated
- */
-public interface ExpressionsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "expressions";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/expressions";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-expressions";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ExpressionsPackage eINSTANCE = org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.Expression <em>Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.Expression
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getExpression()
-	 * @generated
-	 */
-	int EXPRESSION = 0;
-
-	/**
-	 * The number of structural features of the '<em>Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPRESSION_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ObjectiveExpressionImpl <em>Objective Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ObjectiveExpressionImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getObjectiveExpression()
-	 * @generated
-	 */
-	int OBJECTIVE_EXPRESSION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OBJECTIVE_EXPRESSION__OPERATOR = EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OBJECTIVE_EXPRESSION__RIGHT = EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Objective Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OBJECTIVE_EXPRESSION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ConstraintExpressionImpl <em>Constraint Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ConstraintExpressionImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getConstraintExpression()
-	 * @generated
-	 */
-	int CONSTRAINT_EXPRESSION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT_EXPRESSION__PREFIX = EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Predicate</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT_EXPRESSION__PREDICATE = EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT_EXPRESSION__EXPRESSION = EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Constraint Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT_EXPRESSION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression <em>Prefix Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getPrefixExpression()
-	 * @generated
-	 */
-	int PREFIX_EXPRESSION = 3;
-
-	/**
-	 * The feature id for the '<em><b>Quantifier</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREFIX_EXPRESSION__QUANTIFIER = EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Set</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREFIX_EXPRESSION__SET = EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Prefix Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREFIX_EXPRESSION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression <em>Boolean Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getBooleanExpression()
-	 * @generated
-	 */
-	int BOOLEAN_EXPRESSION = 4;
-
-	/**
-	 * The number of structural features of the '<em>Boolean Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BOOLEAN_EXPRESSION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression <em>Arithmetic Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getArithmeticExpression()
-	 * @generated
-	 */
-	int ARITHMETIC_EXPRESSION = 5;
-
-	/**
-	 * The number of structural features of the '<em>Arithmetic Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARITHMETIC_EXPRESSION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ElementExpressionImpl <em>Element Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ElementExpressionImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getElementExpression()
-	 * @generated
-	 */
-	int ELEMENT_EXPRESSION = 6;
-
-	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_EXPRESSION__MODEL_ELEMENT = EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Element Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_EXPRESSION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.expressions.Expression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Expression</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.Expression
-	 * @generated
-	 */
-	EClass getExpression();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ObjectiveExpression <em>Objective Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Objective Expression</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ObjectiveExpression
-	 * @generated
-	 */
-	EClass getObjectiveExpression();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression <em>Constraint Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Constraint Expression</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression
-	 * @generated
-	 */
-	EClass getConstraintExpression();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression#getPrefix <em>Prefix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Prefix</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression#getPrefix()
-	 * @see #getConstraintExpression()
-	 * @generated
-	 */
-	EReference getConstraintExpression_Prefix();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression#getPredicate <em>Predicate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Predicate</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression#getPredicate()
-	 * @see #getConstraintExpression()
-	 * @generated
-	 */
-	EReference getConstraintExpression_Predicate();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression#getExpression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Expression</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression#getExpression()
-	 * @see #getConstraintExpression()
-	 * @generated
-	 */
-	EReference getConstraintExpression_Expression();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression <em>Prefix Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Prefix Expression</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression
-	 * @generated
-	 */
-	EClass getPrefixExpression();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression#getQuantifier <em>Quantifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Quantifier</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression#getQuantifier()
-	 * @see #getPrefixExpression()
-	 * @generated
-	 */
-	EReference getPrefixExpression_Quantifier();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression#getSet <em>Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Set</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression#getSet()
-	 * @see #getPrefixExpression()
-	 * @generated
-	 */
-	EReference getPrefixExpression_Set();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression <em>Boolean Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Boolean Expression</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression
-	 * @generated
-	 */
-	EClass getBooleanExpression();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression <em>Arithmetic Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Arithmetic Expression</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression
-	 * @generated
-	 */
-	EClass getArithmeticExpression();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression <em>Element Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Element Expression</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression
-	 * @generated
-	 */
-	EClass getElementExpression();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression#getModelElement <em>Model Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Model Element</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression#getModelElement()
-	 * @see #getElementExpression()
-	 * @generated
-	 */
-	EReference getElementExpression_ModelElement();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ExpressionsFactory getExpressionsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.Expression <em>Expression</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.Expression
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getExpression()
-		 * @generated
-		 */
-		EClass EXPRESSION = eINSTANCE.getExpression();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ObjectiveExpressionImpl <em>Objective Expression</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ObjectiveExpressionImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getObjectiveExpression()
-		 * @generated
-		 */
-		EClass OBJECTIVE_EXPRESSION = eINSTANCE.getObjectiveExpression();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ConstraintExpressionImpl <em>Constraint Expression</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ConstraintExpressionImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getConstraintExpression()
-		 * @generated
-		 */
-		EClass CONSTRAINT_EXPRESSION = eINSTANCE.getConstraintExpression();
-
-		/**
-		 * The meta object literal for the '<em><b>Prefix</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONSTRAINT_EXPRESSION__PREFIX = eINSTANCE.getConstraintExpression_Prefix();
-
-		/**
-		 * The meta object literal for the '<em><b>Predicate</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONSTRAINT_EXPRESSION__PREDICATE = eINSTANCE.getConstraintExpression_Predicate();
-
-		/**
-		 * The meta object literal for the '<em><b>Expression</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONSTRAINT_EXPRESSION__EXPRESSION = eINSTANCE.getConstraintExpression_Expression();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression <em>Prefix Expression</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getPrefixExpression()
-		 * @generated
-		 */
-		EClass PREFIX_EXPRESSION = eINSTANCE.getPrefixExpression();
-
-		/**
-		 * The meta object literal for the '<em><b>Quantifier</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREFIX_EXPRESSION__QUANTIFIER = eINSTANCE.getPrefixExpression_Quantifier();
-
-		/**
-		 * The meta object literal for the '<em><b>Set</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREFIX_EXPRESSION__SET = eINSTANCE.getPrefixExpression_Set();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression <em>Boolean Expression</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getBooleanExpression()
-		 * @generated
-		 */
-		EClass BOOLEAN_EXPRESSION = eINSTANCE.getBooleanExpression();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression <em>Arithmetic Expression</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getArithmeticExpression()
-		 * @generated
-		 */
-		EClass ARITHMETIC_EXPRESSION = eINSTANCE.getArithmeticExpression();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ElementExpressionImpl <em>Element Expression</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ElementExpressionImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl#getElementExpression()
-		 * @generated
-		 */
-		EClass ELEMENT_EXPRESSION = eINSTANCE.getElementExpression();
-
-		/**
-		 * The meta object literal for the '<em><b>Model Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ELEMENT_EXPRESSION__MODEL_ELEMENT = eINSTANCE.getElementExpression_ModelElement();
-
-	}
-
-} //ExpressionsPackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ObjectiveExpression.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ObjectiveExpression.java
deleted file mode 100644
index db52dfcd..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/ObjectiveExpression.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Objective Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getObjectiveExpression()
- * @model
- * @generated
- */
-public interface ObjectiveExpression extends Expression, OptimizationDirection {
-} // ObjectiveExpression
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/PrefixExpression.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/PrefixExpression.java
deleted file mode 100644
index da7ced79..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/PrefixExpression.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions;
-
-import org.fortiss.af3.exploration.dsl.model.operators.QuantifierOp;
-
-import org.fortiss.af3.exploration.dsl.model.types.SetType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Prefix Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression#getQuantifier <em>Quantifier</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression#getSet <em>Set</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getPrefixExpression()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface PrefixExpression extends Expression {
-	/**
-	 * Returns the value of the '<em><b>Quantifier</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Quantifier</em>' containment reference.
-	 * @see #setQuantifier(QuantifierOp)
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getPrefixExpression_Quantifier()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	QuantifierOp getQuantifier();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression#getQuantifier <em>Quantifier</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Quantifier</em>' containment reference.
-	 * @see #getQuantifier()
-	 * @generated
-	 */
-	void setQuantifier(QuantifierOp value);
-
-	/**
-	 * Returns the value of the '<em><b>Set</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Set</em>' containment reference.
-	 * @see #setSet(SetType)
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#getPrefixExpression_Set()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	SetType<?> getSet();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression#getSet <em>Set</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Set</em>' containment reference.
-	 * @see #getSet()
-	 * @generated
-	 */
-	void setSet(SetType<?> value);
-
-} // PrefixExpression
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ConstraintExpressionImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ConstraintExpressionImpl.java
deleted file mode 100644
index f7c02e9a..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ConstraintExpressionImpl.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-import org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constraint Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ConstraintExpressionImpl#getPrefix <em>Prefix</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ConstraintExpressionImpl#getPredicate <em>Predicate</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ConstraintExpressionImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConstraintExpressionImpl<T extends BooleanExpression> extends EObjectImpl implements ConstraintExpression<T> {
-	/**
-	 * The cached value of the '{@link #getPrefix() <em>Prefix</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrefix()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<PrefixExpression> prefix;
-
-	/**
-	 * The cached value of the '{@link #getPredicate() <em>Predicate</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPredicate()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<BooleanExpression> predicate;
-
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected T expression;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConstraintExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExpressionsPackage.Literals.CONSTRAINT_EXPRESSION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<PrefixExpression> getPrefix() {
-		if (prefix == null) {
-			prefix = new EObjectContainmentEList.Resolving<PrefixExpression>(PrefixExpression.class, this, ExpressionsPackage.CONSTRAINT_EXPRESSION__PREFIX);
-		}
-		return prefix;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<BooleanExpression> getPredicate() {
-		if (predicate == null) {
-			predicate = new EObjectContainmentEList.Resolving<BooleanExpression>(BooleanExpression.class, this, ExpressionsPackage.CONSTRAINT_EXPRESSION__PREDICATE);
-		}
-		return predicate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public T getExpression() {
-		if (expression != null && expression.eIsProxy()) {
-			InternalEObject oldExpression = (InternalEObject)expression;
-			expression = (T)eResolveProxy(oldExpression);
-			if (expression != oldExpression) {
-				InternalEObject newExpression = (InternalEObject)expression;
-				NotificationChain msgs = oldExpression.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION, null, null);
-				if (newExpression.eInternalContainer() == null) {
-					msgs = newExpression.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION, oldExpression, expression));
-			}
-		}
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public T basicGetExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(T newExpression, NotificationChain msgs) {
-		T oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(T newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__PREFIX:
-				return ((InternalEList<?>)getPrefix()).basicRemove(otherEnd, msgs);
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__PREDICATE:
-				return ((InternalEList<?>)getPredicate()).basicRemove(otherEnd, msgs);
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION:
-				return basicSetExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__PREFIX:
-				return getPrefix();
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__PREDICATE:
-				return getPredicate();
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION:
-				if (resolve) return getExpression();
-				return basicGetExpression();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__PREFIX:
-				getPrefix().clear();
-				getPrefix().addAll((Collection<? extends PrefixExpression>)newValue);
-				return;
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__PREDICATE:
-				getPredicate().clear();
-				getPredicate().addAll((Collection<? extends BooleanExpression>)newValue);
-				return;
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION:
-				setExpression((T)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__PREFIX:
-				getPrefix().clear();
-				return;
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__PREDICATE:
-				getPredicate().clear();
-				return;
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION:
-				setExpression((T)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__PREFIX:
-				return prefix != null && !prefix.isEmpty();
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__PREDICATE:
-				return predicate != null && !predicate.isEmpty();
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION:
-				return expression != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ConstraintExpressionImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ElementExpressionImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ElementExpressionImpl.java
deleted file mode 100644
index f6565c5a..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ElementExpressionImpl.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ElementExpressionImpl#getModelElement <em>Model Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ElementExpressionImpl<ME extends IModelElement> extends EObjectImpl implements ElementExpression<ME> {
-	/**
-	 * The cached value of the '{@link #getModelElement() <em>Model Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getModelElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected ME modelElement;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ElementExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExpressionsPackage.Literals.ELEMENT_EXPRESSION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public ME getModelElement() {
-		if (modelElement != null && modelElement.eIsProxy()) {
-			InternalEObject oldModelElement = (InternalEObject)modelElement;
-			modelElement = (ME)eResolveProxy(oldModelElement);
-			if (modelElement != oldModelElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExpressionsPackage.ELEMENT_EXPRESSION__MODEL_ELEMENT, oldModelElement, modelElement));
-			}
-		}
-		return modelElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ME basicGetModelElement() {
-		return modelElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setModelElement(ME newModelElement) {
-		ME oldModelElement = modelElement;
-		modelElement = newModelElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionsPackage.ELEMENT_EXPRESSION__MODEL_ELEMENT, oldModelElement, modelElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ExpressionsPackage.ELEMENT_EXPRESSION__MODEL_ELEMENT:
-				if (resolve) return getModelElement();
-				return basicGetModelElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ExpressionsPackage.ELEMENT_EXPRESSION__MODEL_ELEMENT:
-				setModelElement((ME)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ExpressionsPackage.ELEMENT_EXPRESSION__MODEL_ELEMENT:
-				setModelElement((ME)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ExpressionsPackage.ELEMENT_EXPRESSION__MODEL_ELEMENT:
-				return modelElement != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ElementExpressionImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ExpressionsFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ExpressionsFactoryImpl.java
deleted file mode 100644
index 3f2ae172..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ExpressionsFactoryImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExpressionsFactoryImpl extends EFactoryImpl implements ExpressionsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ExpressionsFactory init() {
-		try {
-			ExpressionsFactory theExpressionsFactory = (ExpressionsFactory)EPackage.Registry.INSTANCE.getEFactory(ExpressionsPackage.eNS_URI);
-			if (theExpressionsFactory != null) {
-				return theExpressionsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ExpressionsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ExpressionsPackage.OBJECTIVE_EXPRESSION: return createObjectiveExpression();
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION: return createConstraintExpression();
-			case ExpressionsPackage.ELEMENT_EXPRESSION: return createElementExpression();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ObjectiveExpression createObjectiveExpression() {
-		ObjectiveExpressionImpl objectiveExpression = new ObjectiveExpressionImpl();
-		return objectiveExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T extends BooleanExpression> ConstraintExpression<T> createConstraintExpression() {
-		ConstraintExpressionImpl<T> constraintExpression = new ConstraintExpressionImpl<T>();
-		return constraintExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <ME extends IModelElement> ElementExpression<ME> createElementExpression() {
-		ElementExpressionImpl<ME> elementExpression = new ElementExpressionImpl<ME>();
-		return elementExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionsPackage getExpressionsPackage() {
-		return (ExpressionsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static ExpressionsPackage getPackage() {
-		return ExpressionsPackage.eINSTANCE;
-	}
-
-} //ExpressionsFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ExpressionsPackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ExpressionsPackageImpl.java
deleted file mode 100644
index 9231ed1e..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ExpressionsPackageImpl.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.ETypeParameter;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsFactory;
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-import org.fortiss.af3.exploration.dsl.model.expressions.ObjectiveExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression;
-
-import org.fortiss.af3.exploration.dsl.model.impl.ModelPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-import org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl;
-
-import org.fortiss.tooling.base.model.base.BasePackage;
-
-import org.fortiss.tooling.base.model.element.ElementPackage;
-
-import org.fortiss.tooling.base.model.layout.LayoutPackage;
-
-import org.fortiss.tooling.base.model.visualization.VisualizationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass expressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass objectiveExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass constraintExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass prefixExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass booleanExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass arithmeticExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass elementExpressionEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ExpressionsPackageImpl() {
-		super(eNS_URI, ExpressionsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link ExpressionsPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ExpressionsPackage init() {
-		if (isInited) return (ExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ExpressionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ExpressionsPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ElementPackage.eINSTANCE.eClass();
-		LayoutPackage.eINSTANCE.eClass();
-		BasePackage.eINSTANCE.eClass();
-		VisualizationPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ModelPackageImpl theModelPackage = (ModelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI) : ModelPackage.eINSTANCE);
-		OperatorsPackageImpl theOperatorsPackage = (OperatorsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI) instanceof OperatorsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI) : OperatorsPackage.eINSTANCE);
-		PatternsPackageImpl thePatternsPackage = (PatternsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PatternsPackage.eNS_URI) instanceof PatternsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PatternsPackage.eNS_URI) : PatternsPackage.eINSTANCE);
-		TypesPackageImpl theTypesPackage = (TypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI) instanceof TypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI) : TypesPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theExpressionsPackage.createPackageContents();
-		theModelPackage.createPackageContents();
-		theOperatorsPackage.createPackageContents();
-		thePatternsPackage.createPackageContents();
-		theTypesPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theExpressionsPackage.initializePackageContents();
-		theModelPackage.initializePackageContents();
-		theOperatorsPackage.initializePackageContents();
-		thePatternsPackage.initializePackageContents();
-		theTypesPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theExpressionsPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(ExpressionsPackage.eNS_URI, theExpressionsPackage);
-		return theExpressionsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExpression() {
-		return expressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getObjectiveExpression() {
-		return objectiveExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConstraintExpression() {
-		return constraintExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getConstraintExpression_Prefix() {
-		return (EReference)constraintExpressionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getConstraintExpression_Predicate() {
-		return (EReference)constraintExpressionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getConstraintExpression_Expression() {
-		return (EReference)constraintExpressionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPrefixExpression() {
-		return prefixExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPrefixExpression_Quantifier() {
-		return (EReference)prefixExpressionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPrefixExpression_Set() {
-		return (EReference)prefixExpressionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBooleanExpression() {
-		return booleanExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getArithmeticExpression() {
-		return arithmeticExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getElementExpression() {
-		return elementExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getElementExpression_ModelElement() {
-		return (EReference)elementExpressionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionsFactory getExpressionsFactory() {
-		return (ExpressionsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		expressionEClass = createEClass(EXPRESSION);
-
-		objectiveExpressionEClass = createEClass(OBJECTIVE_EXPRESSION);
-
-		constraintExpressionEClass = createEClass(CONSTRAINT_EXPRESSION);
-		createEReference(constraintExpressionEClass, CONSTRAINT_EXPRESSION__PREFIX);
-		createEReference(constraintExpressionEClass, CONSTRAINT_EXPRESSION__PREDICATE);
-		createEReference(constraintExpressionEClass, CONSTRAINT_EXPRESSION__EXPRESSION);
-
-		prefixExpressionEClass = createEClass(PREFIX_EXPRESSION);
-		createEReference(prefixExpressionEClass, PREFIX_EXPRESSION__QUANTIFIER);
-		createEReference(prefixExpressionEClass, PREFIX_EXPRESSION__SET);
-
-		booleanExpressionEClass = createEClass(BOOLEAN_EXPRESSION);
-
-		arithmeticExpressionEClass = createEClass(ARITHMETIC_EXPRESSION);
-
-		elementExpressionEClass = createEClass(ELEMENT_EXPRESSION);
-		createEReference(elementExpressionEClass, ELEMENT_EXPRESSION__MODEL_ELEMENT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		OperatorsPackage theOperatorsPackage = (OperatorsPackage)EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI);
-		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
-		ElementPackage theElementPackage = (ElementPackage)EPackage.Registry.INSTANCE.getEPackage(ElementPackage.eNS_URI);
-
-		// Create type parameters
-		ETypeParameter constraintExpressionEClass_T = addETypeParameter(constraintExpressionEClass, "T");
-		addETypeParameter(arithmeticExpressionEClass, "T");
-		ETypeParameter elementExpressionEClass_ME = addETypeParameter(elementExpressionEClass, "ME");
-
-		// Set bounds for type parameters
-		EGenericType g1 = createEGenericType(this.getBooleanExpression());
-		constraintExpressionEClass_T.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		elementExpressionEClass_ME.getEBounds().add(g1);
-
-		// Add supertypes to classes
-		objectiveExpressionEClass.getESuperTypes().add(this.getExpression());
-		objectiveExpressionEClass.getESuperTypes().add(theOperatorsPackage.getOptimizationDirection());
-		constraintExpressionEClass.getESuperTypes().add(this.getExpression());
-		prefixExpressionEClass.getESuperTypes().add(this.getExpression());
-		booleanExpressionEClass.getESuperTypes().add(this.getExpression());
-		arithmeticExpressionEClass.getESuperTypes().add(this.getExpression());
-		elementExpressionEClass.getESuperTypes().add(this.getExpression());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(expressionEClass, Expression.class, "Expression", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(objectiveExpressionEClass, ObjectiveExpression.class, "ObjectiveExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(constraintExpressionEClass, ConstraintExpression.class, "ConstraintExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getConstraintExpression_Prefix(), this.getPrefixExpression(), null, "prefix", null, 1, -1, ConstraintExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConstraintExpression_Predicate(), this.getBooleanExpression(), null, "predicate", null, 0, -1, ConstraintExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		g1 = createEGenericType(constraintExpressionEClass_T);
-		initEReference(getConstraintExpression_Expression(), g1, null, "expression", null, 1, 1, ConstraintExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(prefixExpressionEClass, PrefixExpression.class, "PrefixExpression", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPrefixExpression_Quantifier(), theOperatorsPackage.getQuantifierOp(), null, "quantifier", null, 1, 1, PrefixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		g1 = createEGenericType(theTypesPackage.getSetType());
-		EGenericType g2 = createEGenericType();
-		g1.getETypeArguments().add(g2);
-		initEReference(getPrefixExpression_Set(), g1, null, "set", null, 1, 1, PrefixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(booleanExpressionEClass, BooleanExpression.class, "BooleanExpression", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(arithmeticExpressionEClass, ArithmeticExpression.class, "ArithmeticExpression", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(elementExpressionEClass, ElementExpression.class, "ElementExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		g1 = createEGenericType(elementExpressionEClass_ME);
-		initEReference(getElementExpression_ModelElement(), g1, null, "modelElement", null, 0, 1, ElementExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-	}
-
-} //ExpressionsPackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ObjectiveExpressionImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ObjectiveExpressionImpl.java
deleted file mode 100644
index 35132e71..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/impl/ObjectiveExpressionImpl.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-import org.fortiss.af3.exploration.dsl.model.expressions.ObjectiveExpression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.Operator;
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-import org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection;
-import org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirectionEnum;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Objective Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ObjectiveExpressionImpl#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.expressions.impl.ObjectiveExpressionImpl#getRight <em>Right</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ObjectiveExpressionImpl extends EObjectImpl implements ObjectiveExpression {
-	/**
-	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOperator()
-	 * @generated
-	 * @ordered
-	 */
-	protected OptimizationDirectionEnum operator;
-
-	/**
-	 * The cached value of the '{@link #getRight() <em>Right</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRight()
-	 * @generated
-	 * @ordered
-	 */
-	protected ArithmeticExpression<?> right;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ObjectiveExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExpressionsPackage.Literals.OBJECTIVE_EXPRESSION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OptimizationDirectionEnum getOperator() {
-		return operator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOperator(OptimizationDirectionEnum newOperator) {
-		OptimizationDirectionEnum oldOperator = operator;
-		operator = newOperator;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionsPackage.OBJECTIVE_EXPRESSION__OPERATOR, oldOperator, operator));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ArithmeticExpression<?> getRight() {
-		if (right != null && ((EObject)right).eIsProxy()) {
-			InternalEObject oldRight = (InternalEObject)right;
-			right = (ArithmeticExpression<?>)eResolveProxy(oldRight);
-			if (right != oldRight) {
-				InternalEObject newRight = (InternalEObject)right;
-				NotificationChain msgs = oldRight.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT, null, null);
-				if (newRight.eInternalContainer() == null) {
-					msgs = newRight.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT, oldRight, right));
-			}
-		}
-		return right;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ArithmeticExpression<?> basicGetRight() {
-		return right;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRight(ArithmeticExpression<?> newRight, NotificationChain msgs) {
-		ArithmeticExpression<?> oldRight = right;
-		right = newRight;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT, oldRight, newRight);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRight(ArithmeticExpression<?> newRight) {
-		if (newRight != right) {
-			NotificationChain msgs = null;
-			if (right != null)
-				msgs = ((InternalEObject)right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT, null, msgs);
-			if (newRight != null)
-				msgs = ((InternalEObject)newRight).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT, null, msgs);
-			msgs = basicSetRight(newRight, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT, newRight, newRight));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT:
-				return basicSetRight(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ExpressionsPackage.OBJECTIVE_EXPRESSION__OPERATOR:
-				return getOperator();
-			case ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT:
-				if (resolve) return getRight();
-				return basicGetRight();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ExpressionsPackage.OBJECTIVE_EXPRESSION__OPERATOR:
-				setOperator((OptimizationDirectionEnum)newValue);
-				return;
-			case ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT:
-				setRight((ArithmeticExpression<?>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ExpressionsPackage.OBJECTIVE_EXPRESSION__OPERATOR:
-				setOperator((OptimizationDirectionEnum)null);
-				return;
-			case ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT:
-				setRight((ArithmeticExpression<?>)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ExpressionsPackage.OBJECTIVE_EXPRESSION__OPERATOR:
-				return operator != null;
-			case ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT:
-				return right != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Operator.class) {
-			switch (derivedFeatureID) {
-				case ExpressionsPackage.OBJECTIVE_EXPRESSION__OPERATOR: return OperatorsPackage.OPERATOR__OPERATOR;
-				case ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT: return OperatorsPackage.OPERATOR__RIGHT;
-				default: return -1;
-			}
-		}
-		if (baseClass == OptimizationDirection.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Operator.class) {
-			switch (baseFeatureID) {
-				case OperatorsPackage.OPERATOR__OPERATOR: return ExpressionsPackage.OBJECTIVE_EXPRESSION__OPERATOR;
-				case OperatorsPackage.OPERATOR__RIGHT: return ExpressionsPackage.OBJECTIVE_EXPRESSION__RIGHT;
-				default: return -1;
-			}
-		}
-		if (baseClass == OptimizationDirection.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (operator: ");
-		result.append(operator);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ObjectiveExpressionImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/util/ExpressionsAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/util/ExpressionsAdapterFactory.java
deleted file mode 100644
index d996e69d..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/util/ExpressionsAdapterFactory.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.*;
-
-import org.fortiss.af3.exploration.dsl.model.operators.Operator;
-import org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage
- * @generated
- */
-public class ExpressionsAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ExpressionsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionsAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ExpressionsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExpressionsSwitch<Adapter> modelSwitch =
-		new ExpressionsSwitch<Adapter>() {
-			@Override
-			public Adapter caseExpression(Expression object) {
-				return createExpressionAdapter();
-			}
-			@Override
-			public Adapter caseObjectiveExpression(ObjectiveExpression object) {
-				return createObjectiveExpressionAdapter();
-			}
-			@Override
-			public <T extends BooleanExpression> Adapter caseConstraintExpression(ConstraintExpression<T> object) {
-				return createConstraintExpressionAdapter();
-			}
-			@Override
-			public Adapter casePrefixExpression(PrefixExpression object) {
-				return createPrefixExpressionAdapter();
-			}
-			@Override
-			public Adapter caseBooleanExpression(BooleanExpression object) {
-				return createBooleanExpressionAdapter();
-			}
-			@Override
-			public <T> Adapter caseArithmeticExpression(ArithmeticExpression<T> object) {
-				return createArithmeticExpressionAdapter();
-			}
-			@Override
-			public <ME extends IModelElement> Adapter caseElementExpression(ElementExpression<ME> object) {
-				return createElementExpressionAdapter();
-			}
-			@Override
-			public <OP, RHT> Adapter caseOperator(Operator<OP, RHT> object) {
-				return createOperatorAdapter();
-			}
-			@Override
-			public Adapter caseOptimizationDirection(OptimizationDirection object) {
-				return createOptimizationDirectionAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.Expression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.Expression
-	 * @generated
-	 */
-	public Adapter createExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ObjectiveExpression <em>Objective Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ObjectiveExpression
-	 * @generated
-	 */
-	public Adapter createObjectiveExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression <em>Constraint Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression
-	 * @generated
-	 */
-	public Adapter createConstraintExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression <em>Prefix Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.PrefixExpression
-	 * @generated
-	 */
-	public Adapter createPrefixExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression <em>Boolean Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression
-	 * @generated
-	 */
-	public Adapter createBooleanExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression <em>Arithmetic Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression
-	 * @generated
-	 */
-	public Adapter createArithmeticExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression <em>Element Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression
-	 * @generated
-	 */
-	public Adapter createElementExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator <em>Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.Operator
-	 * @generated
-	 */
-	public Adapter createOperatorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection <em>Optimization Direction</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection
-	 * @generated
-	 */
-	public Adapter createOptimizationDirectionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ExpressionsAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/util/ExpressionsSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/util/ExpressionsSwitch.java
deleted file mode 100644
index e5a5e909..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/expressions/util/ExpressionsSwitch.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.expressions.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.*;
-
-import org.fortiss.af3.exploration.dsl.model.operators.Operator;
-import org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage
- * @generated
- */
-public class ExpressionsSwitch<T1> extends Switch<T1> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ExpressionsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionsSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ExpressionsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T1 doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ExpressionsPackage.EXPRESSION: {
-				Expression expression = (Expression)theEObject;
-				T1 result = caseExpression(expression);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ExpressionsPackage.OBJECTIVE_EXPRESSION: {
-				ObjectiveExpression objectiveExpression = (ObjectiveExpression)theEObject;
-				T1 result = caseObjectiveExpression(objectiveExpression);
-				if (result == null) result = caseExpression(objectiveExpression);
-				if (result == null) result = caseOptimizationDirection(objectiveExpression);
-				if (result == null) result = caseOperator(objectiveExpression);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ExpressionsPackage.CONSTRAINT_EXPRESSION: {
-				ConstraintExpression<?> constraintExpression = (ConstraintExpression<?>)theEObject;
-				T1 result = caseConstraintExpression(constraintExpression);
-				if (result == null) result = caseExpression(constraintExpression);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ExpressionsPackage.PREFIX_EXPRESSION: {
-				PrefixExpression prefixExpression = (PrefixExpression)theEObject;
-				T1 result = casePrefixExpression(prefixExpression);
-				if (result == null) result = caseExpression(prefixExpression);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ExpressionsPackage.BOOLEAN_EXPRESSION: {
-				BooleanExpression booleanExpression = (BooleanExpression)theEObject;
-				T1 result = caseBooleanExpression(booleanExpression);
-				if (result == null) result = caseExpression(booleanExpression);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ExpressionsPackage.ARITHMETIC_EXPRESSION: {
-				ArithmeticExpression<?> arithmeticExpression = (ArithmeticExpression<?>)theEObject;
-				T1 result = caseArithmeticExpression(arithmeticExpression);
-				if (result == null) result = caseExpression(arithmeticExpression);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ExpressionsPackage.ELEMENT_EXPRESSION: {
-				ElementExpression<?> elementExpression = (ElementExpression<?>)theEObject;
-				T1 result = caseElementExpression(elementExpression);
-				if (result == null) result = caseExpression(elementExpression);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseExpression(Expression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Objective Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Objective Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseObjectiveExpression(ObjectiveExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Constraint Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Constraint Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T extends BooleanExpression> T1 caseConstraintExpression(ConstraintExpression<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Prefix Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Prefix Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 casePrefixExpression(PrefixExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Boolean Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Boolean Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseBooleanExpression(BooleanExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseArithmeticExpression(ArithmeticExpression<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Element Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Element Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <ME extends IModelElement> T1 caseElementExpression(ElementExpression<ME> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Operator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Operator</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <OP, RHT> T1 caseOperator(Operator<OP, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Optimization Direction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Optimization Direction</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseOptimizationDirection(OptimizationDirection object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T1 defaultCase(EObject object) {
-		return null;
-	}
-
-} //ExpressionsSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/impl/ModelFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/impl/ModelFactoryImpl.java
deleted file mode 100644
index 5d599097..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/impl/ModelFactoryImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.dsl.model.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ModelFactory init() {
-		try {
-			ModelFactory theModelFactory = (ModelFactory)EPackage.Registry.INSTANCE.getEFactory(ModelPackage.eNS_URI);
-			if (theModelFactory != null) {
-				return theModelFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ModelFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelPackage getModelPackage() {
-		return (ModelPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static ModelPackage getPackage() {
-		return ModelPackage.eINSTANCE;
-	}
-
-} //ModelFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/impl/ModelPackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/impl/ModelPackageImpl.java
deleted file mode 100644
index cd3f6275..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/impl/ModelPackageImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-import org.fortiss.af3.exploration.dsl.model.ModelFactory;
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-import org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl;
-
-import org.fortiss.tooling.base.model.base.BasePackage;
-
-import org.fortiss.tooling.base.model.element.ElementPackage;
-
-import org.fortiss.tooling.base.model.layout.LayoutPackage;
-
-import org.fortiss.tooling.base.model.visualization.VisualizationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModelPackageImpl extends EPackageImpl implements ModelPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass moeaExplorationExpressionEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.dsl.model.ModelPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ModelPackageImpl() {
-		super(eNS_URI, ModelFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ModelPackage init() {
-		if (isInited) return (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ModelPackageImpl theModelPackage = (ModelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ModelPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ElementPackage.eINSTANCE.eClass();
-		LayoutPackage.eINSTANCE.eClass();
-		BasePackage.eINSTANCE.eClass();
-		VisualizationPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		OperatorsPackageImpl theOperatorsPackage = (OperatorsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI) instanceof OperatorsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI) : OperatorsPackage.eINSTANCE);
-		ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI) instanceof ExpressionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI) : ExpressionsPackage.eINSTANCE);
-		PatternsPackageImpl thePatternsPackage = (PatternsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PatternsPackage.eNS_URI) instanceof PatternsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PatternsPackage.eNS_URI) : PatternsPackage.eINSTANCE);
-		TypesPackageImpl theTypesPackage = (TypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI) instanceof TypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI) : TypesPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theModelPackage.createPackageContents();
-		theOperatorsPackage.createPackageContents();
-		theExpressionsPackage.createPackageContents();
-		thePatternsPackage.createPackageContents();
-		theTypesPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theModelPackage.initializePackageContents();
-		theOperatorsPackage.initializePackageContents();
-		theExpressionsPackage.initializePackageContents();
-		thePatternsPackage.initializePackageContents();
-		theTypesPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theModelPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(ModelPackage.eNS_URI, theModelPackage);
-		return theModelPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMOEAExplorationExpression() {
-		return moeaExplorationExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMOEAExplorationExpression_Expression() {
-		return (EReference)moeaExplorationExpressionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelFactory getModelFactory() {
-		return (ModelFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		moeaExplorationExpressionEClass = createEClass(MOEA_EXPLORATION_EXPRESSION);
-		createEReference(moeaExplorationExpressionEClass, MOEA_EXPLORATION_EXPRESSION__EXPRESSION);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		OperatorsPackage theOperatorsPackage = (OperatorsPackage)EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI);
-		ExpressionsPackage theExpressionsPackage = (ExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI);
-		PatternsPackage thePatternsPackage = (PatternsPackage)EPackage.Registry.INSTANCE.getEPackage(PatternsPackage.eNS_URI);
-		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
-
-		// Add subpackages
-		getESubpackages().add(theOperatorsPackage);
-		getESubpackages().add(theExpressionsPackage);
-		getESubpackages().add(thePatternsPackage);
-		getESubpackages().add(theTypesPackage);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(moeaExplorationExpressionEClass, MOEAExplorationExpression.class, "MOEAExplorationExpression", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMOEAExplorationExpression_Expression(), theExpressionsPackage.getExpression(), null, "expression", null, 0, 1, MOEAExplorationExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //ModelPackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ArithmeticOp.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ArithmeticOp.java
deleted file mode 100644
index d27f3a7d..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ArithmeticOp.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Arithmetic Op</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getArithmeticOp()
- * @model
- * @generated
- */
-public interface ArithmeticOp<T, LHE extends ArithmeticExpression<T>, RHE extends ArithmeticExpression<T>> extends DualOperator<LHE, ArithmeticOperatorEnum, RHE>, ArithmeticExpression<T> {
-} // ArithmeticOp
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ArithmeticOperatorEnum.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ArithmeticOperatorEnum.java
deleted file mode 100644
index 73d31dec..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ArithmeticOperatorEnum.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Arithmetic Operator Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getArithmeticOperatorEnum()
- * @model
- * @generated
- */
-public enum ArithmeticOperatorEnum implements Enumerator {
-	/**
-	 * The '<em><b>ADD</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ADD_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ADD(0, "ADD", "ADD"),
-
-	/**
-	 * The '<em><b>SUB</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SUB_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SUB(1, "SUB", "SUB"),
-
-	/**
-	 * The '<em><b>MUL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MUL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MUL(2, "MUL", "MUL"),
-
-	/**
-	 * The '<em><b>DIV</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DIV_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DIV(3, "DIV", "DIV");
-
-	/**
-	 * The '<em><b>ADD</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ADD</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ADD
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ADD_VALUE = 0;
-
-	/**
-	 * The '<em><b>SUB</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SUB</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SUB
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SUB_VALUE = 1;
-
-	/**
-	 * The '<em><b>MUL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>MUL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MUL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MUL_VALUE = 2;
-
-	/**
-	 * The '<em><b>DIV</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>DIV</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DIV
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DIV_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>Arithmetic Operator Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ArithmeticOperatorEnum[] VALUES_ARRAY =
-		new ArithmeticOperatorEnum[] {
-			ADD,
-			SUB,
-			MUL,
-			DIV,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Arithmetic Operator Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<ArithmeticOperatorEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Arithmetic Operator Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ArithmeticOperatorEnum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ArithmeticOperatorEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Arithmetic Operator Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ArithmeticOperatorEnum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ArithmeticOperatorEnum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Arithmetic Operator Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ArithmeticOperatorEnum get(int value) {
-		switch (value) {
-			case ADD_VALUE: return ADD;
-			case SUB_VALUE: return SUB;
-			case MUL_VALUE: return MUL;
-			case DIV_VALUE: return DIV;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ArithmeticOperatorEnum(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //ArithmeticOperatorEnum
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/BooleanOperatorEnum.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/BooleanOperatorEnum.java
deleted file mode 100644
index 59c20c00..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/BooleanOperatorEnum.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Boolean Operator Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getBooleanOperatorEnum()
- * @model
- * @generated
- */
-public enum BooleanOperatorEnum implements Enumerator {
-	/**
-	 * The '<em><b>NOT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NOT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NOT(0, "NOT", "NOT"),
-
-	/**
-	 * The '<em><b>AND</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #AND_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	AND(1, "AND", "AND"),
-
-	/**
-	 * The '<em><b>OR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OR_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	OR(2, "OR", "OR"),
-
-	/**
-	 * The '<em><b>XOR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #XOR_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	XOR(3, "XOR", "XOR");
-
-	/**
-	 * The '<em><b>NOT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NOT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NOT
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOT_VALUE = 0;
-
-	/**
-	 * The '<em><b>AND</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>AND</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #AND
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int AND_VALUE = 1;
-
-	/**
-	 * The '<em><b>OR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>OR</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OR
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OR_VALUE = 2;
-
-	/**
-	 * The '<em><b>XOR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>XOR</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #XOR
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XOR_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>Boolean Operator Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final BooleanOperatorEnum[] VALUES_ARRAY =
-		new BooleanOperatorEnum[] {
-			NOT,
-			AND,
-			OR,
-			XOR,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Boolean Operator Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<BooleanOperatorEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Boolean Operator Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BooleanOperatorEnum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			BooleanOperatorEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Boolean Operator Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BooleanOperatorEnum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			BooleanOperatorEnum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Boolean Operator Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BooleanOperatorEnum get(int value) {
-		switch (value) {
-			case NOT_VALUE: return NOT;
-			case AND_VALUE: return AND;
-			case OR_VALUE: return OR;
-			case XOR_VALUE: return XOR;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private BooleanOperatorEnum(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //BooleanOperatorEnum
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ComparisonOp.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ComparisonOp.java
deleted file mode 100644
index 37b97532..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ComparisonOp.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Comparison Op</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getComparisonOp()
- * @model
- * @generated
- */
-public interface ComparisonOp<T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> extends DualOperator<ArithmeticExpression<T>, ComparisonOperatorEnum, ArithmeticExpression<T>>, BooleanExpression {
-} // ComparisonOp
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ComparisonOperatorEnum.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ComparisonOperatorEnum.java
deleted file mode 100644
index 6b76d6ed..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/ComparisonOperatorEnum.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Comparison Operator Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getComparisonOperatorEnum()
- * @model
- * @generated
- */
-public enum ComparisonOperatorEnum implements Enumerator {
-	/**
-	 * The '<em><b>LESS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LESS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LESS(0, "LESS", "LESS"),
-
-	/**
-	 * The '<em><b>LESS OR EQUAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LESS_OR_EQUAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LESS_OR_EQUAL(1, "LESS_OR_EQUAL", "LESS_OR_EQUAL"),
-
-	/**
-	 * The '<em><b>EQUAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EQUAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	EQUAL(2, "EQUAL", "EQUAL"),
-
-	/**
-	 * The '<em><b>GREATER OR EQUAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #GREATER_OR_EQUAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	GREATER_OR_EQUAL(3, "GREATER_OR_EQUAL", "GREATER_OR_EQUAL"),
-
-	/**
-	 * The '<em><b>GREATER</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #GREATER_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	GREATER(4, "GREATER", "GREATER");
-
-	/**
-	 * The '<em><b>LESS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>LESS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LESS
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LESS_VALUE = 0;
-
-	/**
-	 * The '<em><b>LESS OR EQUAL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>LESS OR EQUAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LESS_OR_EQUAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LESS_OR_EQUAL_VALUE = 1;
-
-	/**
-	 * The '<em><b>EQUAL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>EQUAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EQUAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EQUAL_VALUE = 2;
-
-	/**
-	 * The '<em><b>GREATER OR EQUAL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>GREATER OR EQUAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #GREATER_OR_EQUAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int GREATER_OR_EQUAL_VALUE = 3;
-
-	/**
-	 * The '<em><b>GREATER</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>GREATER</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #GREATER
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int GREATER_VALUE = 4;
-
-	/**
-	 * An array of all the '<em><b>Comparison Operator Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ComparisonOperatorEnum[] VALUES_ARRAY =
-		new ComparisonOperatorEnum[] {
-			LESS,
-			LESS_OR_EQUAL,
-			EQUAL,
-			GREATER_OR_EQUAL,
-			GREATER,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Comparison Operator Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<ComparisonOperatorEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Comparison Operator Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ComparisonOperatorEnum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ComparisonOperatorEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Comparison Operator Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ComparisonOperatorEnum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ComparisonOperatorEnum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Comparison Operator Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ComparisonOperatorEnum get(int value) {
-		switch (value) {
-			case LESS_VALUE: return LESS;
-			case LESS_OR_EQUAL_VALUE: return LESS_OR_EQUAL;
-			case EQUAL_VALUE: return EQUAL;
-			case GREATER_OR_EQUAL_VALUE: return GREATER_OR_EQUAL;
-			case GREATER_VALUE: return GREATER;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ComparisonOperatorEnum(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //ComparisonOperatorEnum
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/DualOperator.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/DualOperator.java
deleted file mode 100644
index 56560ee0..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/DualOperator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dual Operator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.DualOperator#getLeft <em>Left</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getDualOperator()
- * @model
- * @generated
- */
-public interface DualOperator<LHT, OP, RHT> extends Operator<OP, RHT> {
-	/**
-	 * Returns the value of the '<em><b>Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Left</em>' containment reference.
-	 * @see #setLeft(Object)
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getDualOperator_Left()
-	 * @model kind="reference" containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	LHT getLeft();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.operators.DualOperator#getLeft <em>Left</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Left</em>' containment reference.
-	 * @see #getLeft()
-	 * @generated
-	 */
-	void setLeft(LHT value);
-
-} // DualOperator
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/LocationOp.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/LocationOp.java
deleted file mode 100644
index 9ac2a2b4..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/LocationOp.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Location Op</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getLocationOp()
- * @model
- * @generated
- */
-public interface LocationOp<LHT extends IModelElement, RHT extends IModelElement> extends DualOperator<ElementExpression<LHT>, LocationOperatorEnum, ElementExpression<RHT>>, BooleanExpression {
-} // LocationOp
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/LocationOperatorEnum.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/LocationOperatorEnum.java
deleted file mode 100644
index f6c2dab2..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/LocationOperatorEnum.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Location Operator Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getLocationOperatorEnum()
- * @model
- * @generated
- */
-public enum LocationOperatorEnum implements Enumerator {
-	/**
-	 * The '<em><b>Allocation</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ALLOCATION_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ALLOCATION(0, "Allocation", "Allocation"),
-
-	/**
-	 * The '<em><b>Dislocation</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DISLOCATION_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DISLOCATION(1, "Dislocation", "Dislocation");
-
-	/**
-	 * The '<em><b>Allocation</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Allocation</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ALLOCATION
-	 * @model name="Allocation"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ALLOCATION_VALUE = 0;
-
-	/**
-	 * The '<em><b>Dislocation</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Dislocation</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DISLOCATION
-	 * @model name="Dislocation"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DISLOCATION_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Location Operator Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final LocationOperatorEnum[] VALUES_ARRAY =
-		new LocationOperatorEnum[] {
-			ALLOCATION,
-			DISLOCATION,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Location Operator Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<LocationOperatorEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Location Operator Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static LocationOperatorEnum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LocationOperatorEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Location Operator Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static LocationOperatorEnum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LocationOperatorEnum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Location Operator Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static LocationOperatorEnum get(int value) {
-		switch (value) {
-			case ALLOCATION_VALUE: return ALLOCATION;
-			case DISLOCATION_VALUE: return DISLOCATION;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private LocationOperatorEnum(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //LocationOperatorEnum
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/Operator.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/Operator.java
deleted file mode 100644
index ab6fdc8e..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/Operator.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Operator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.Operator#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.Operator#getRight <em>Right</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getOperator()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Operator<OP, RHT> extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * TODO: write documentation (in the model!)
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Operator</em>' attribute.
-	 * @see #setOperator(Object)
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getOperator_Operator()
-	 * @model required="true"
-	 * @generated
-	 */
-	OP getOperator();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator#getOperator <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Operator</em>' attribute.
-	 * @see #getOperator()
-	 * @generated
-	 */
-	void setOperator(OP value);
-
-	/**
-	 * Returns the value of the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Right</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Right</em>' containment reference.
-	 * @see #setRight(Object)
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getOperator_Right()
-	 * @model kind="reference" containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	RHT getRight();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator#getRight <em>Right</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Right</em>' containment reference.
-	 * @see #getRight()
-	 * @generated
-	 */
-	void setRight(RHT value);
-
-} // Operator
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OperatorsFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OperatorsFactory.java
deleted file mode 100644
index c778b5bc..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OperatorsFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import org.eclipse.emf.ecore.EFactory;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage
- * @generated
- */
-public interface OperatorsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	OperatorsFactory eINSTANCE = org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Dual Operator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Dual Operator</em>'.
-	 * @generated
-	 */
-	<LHT, OP, RHT> DualOperator<LHT, OP, RHT> createDualOperator();
-
-	/**
-	 * Returns a new object of class '<em>Arithmetic Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Arithmetic Op</em>'.
-	 * @generated
-	 */
-	<T, LHE extends ArithmeticExpression<T>, RHE extends ArithmeticExpression<T>> ArithmeticOp<T, LHE, RHE> createArithmeticOp();
-
-	/**
-	 * Returns a new object of class '<em>Comparison Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Comparison Op</em>'.
-	 * @generated
-	 */
-	<T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> ComparisonOp<T, LHT, RHT> createComparisonOp();
-
-	/**
-	 * Returns a new object of class '<em>Location Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Location Op</em>'.
-	 * @generated
-	 */
-	<LHT extends IModelElement, RHT extends IModelElement> LocationOp<LHT, RHT> createLocationOp();
-
-	/**
-	 * Returns a new object of class '<em>Optimization Direction</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Optimization Direction</em>'.
-	 * @generated
-	 */
-	OptimizationDirection createOptimizationDirection();
-
-	/**
-	 * Returns a new object of class '<em>Quantifier Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Quantifier Op</em>'.
-	 * @generated
-	 */
-	QuantifierOp createQuantifierOp();
-
-	/**
-	 * Returns a new object of class '<em>Summation Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Summation Op</em>'.
-	 * @generated
-	 */
-	<T> SummationOp<T> createSummationOp();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	OperatorsPackage getOperatorsPackage();
-
-} //OperatorsFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OperatorsPackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OperatorsPackage.java
deleted file mode 100644
index bf9424ff..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OperatorsPackage.java
+++ /dev/null
@@ -1,816 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsFactory
- * @model kind="package"
- * @generated
- */
-public interface OperatorsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "operators";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/operators";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-operators";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	OperatorsPackage eINSTANCE = org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator <em>Operator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.Operator
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getOperator()
-	 * @generated
-	 */
-	int OPERATOR = 0;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OPERATOR__OPERATOR = 0;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OPERATOR__RIGHT = 1;
-
-	/**
-	 * The number of structural features of the '<em>Operator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OPERATOR_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.DualOperatorImpl <em>Dual Operator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.DualOperatorImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getDualOperator()
-	 * @generated
-	 */
-	int DUAL_OPERATOR = 1;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DUAL_OPERATOR__OPERATOR = OPERATOR__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DUAL_OPERATOR__RIGHT = OPERATOR__RIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DUAL_OPERATOR__LEFT = OPERATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Dual Operator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DUAL_OPERATOR_FEATURE_COUNT = OPERATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.ArithmeticOpImpl <em>Arithmetic Op</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.ArithmeticOpImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getArithmeticOp()
-	 * @generated
-	 */
-	int ARITHMETIC_OP = 2;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARITHMETIC_OP__OPERATOR = DUAL_OPERATOR__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARITHMETIC_OP__RIGHT = DUAL_OPERATOR__RIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARITHMETIC_OP__LEFT = DUAL_OPERATOR__LEFT;
-
-	/**
-	 * The number of structural features of the '<em>Arithmetic Op</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARITHMETIC_OP_FEATURE_COUNT = DUAL_OPERATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.ComparisonOpImpl <em>Comparison Op</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.ComparisonOpImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getComparisonOp()
-	 * @generated
-	 */
-	int COMPARISON_OP = 3;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARISON_OP__OPERATOR = DUAL_OPERATOR__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARISON_OP__RIGHT = DUAL_OPERATOR__RIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARISON_OP__LEFT = DUAL_OPERATOR__LEFT;
-
-	/**
-	 * The number of structural features of the '<em>Comparison Op</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARISON_OP_FEATURE_COUNT = DUAL_OPERATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.LocationOpImpl <em>Location Op</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.LocationOpImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getLocationOp()
-	 * @generated
-	 */
-	int LOCATION_OP = 4;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_OP__OPERATOR = DUAL_OPERATOR__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_OP__RIGHT = DUAL_OPERATOR__RIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_OP__LEFT = DUAL_OPERATOR__LEFT;
-
-	/**
-	 * The number of structural features of the '<em>Location Op</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_OP_FEATURE_COUNT = DUAL_OPERATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.OptimizationDirectionImpl <em>Optimization Direction</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OptimizationDirectionImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getOptimizationDirection()
-	 * @generated
-	 */
-	int OPTIMIZATION_DIRECTION = 5;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OPTIMIZATION_DIRECTION__OPERATOR = OPERATOR__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OPTIMIZATION_DIRECTION__RIGHT = OPERATOR__RIGHT;
-
-	/**
-	 * The number of structural features of the '<em>Optimization Direction</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OPTIMIZATION_DIRECTION_FEATURE_COUNT = OPERATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.QuantifierOpImpl <em>Quantifier Op</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.QuantifierOpImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getQuantifierOp()
-	 * @generated
-	 */
-	int QUANTIFIER_OP = 6;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUANTIFIER_OP__OPERATOR = OPERATOR__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUANTIFIER_OP__RIGHT = OPERATOR__RIGHT;
-
-	/**
-	 * The number of structural features of the '<em>Quantifier Op</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUANTIFIER_OP_FEATURE_COUNT = OPERATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.SummationOpImpl <em>Summation Op</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.SummationOpImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getSummationOp()
-	 * @generated
-	 */
-	int SUMMATION_OP = 7;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUMMATION_OP__OPERATOR = OPERATOR__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUMMATION_OP__RIGHT = OPERATOR__RIGHT;
-
-	/**
-	 * The number of structural features of the '<em>Summation Op</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUMMATION_OP_FEATURE_COUNT = OPERATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOperatorEnum <em>Arithmetic Operator Enum</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOperatorEnum
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getArithmeticOperatorEnum()
-	 * @generated
-	 */
-	int ARITHMETIC_OPERATOR_ENUM = 8;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.BooleanOperatorEnum <em>Boolean Operator Enum</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.BooleanOperatorEnum
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getBooleanOperatorEnum()
-	 * @generated
-	 */
-	int BOOLEAN_OPERATOR_ENUM = 9;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.ComparisonOperatorEnum <em>Comparison Operator Enum</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ComparisonOperatorEnum
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getComparisonOperatorEnum()
-	 * @generated
-	 */
-	int COMPARISON_OPERATOR_ENUM = 10;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.LocationOperatorEnum <em>Location Operator Enum</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.LocationOperatorEnum
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getLocationOperatorEnum()
-	 * @generated
-	 */
-	int LOCATION_OPERATOR_ENUM = 11;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirectionEnum <em>Optimization Direction Enum</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirectionEnum
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getOptimizationDirectionEnum()
-	 * @generated
-	 */
-	int OPTIMIZATION_DIRECTION_ENUM = 12;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.operators.QuantifierEnum <em>Quantifier Enum</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.QuantifierEnum
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getQuantifierEnum()
-	 * @generated
-	 */
-	int QUANTIFIER_ENUM = 13;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator <em>Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Operator</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.Operator
-	 * @generated
-	 */
-	EClass getOperator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator#getOperator <em>Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Operator</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.Operator#getOperator()
-	 * @see #getOperator()
-	 * @generated
-	 */
-	EAttribute getOperator_Operator();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator#getRight <em>Right</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Right</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.Operator#getRight()
-	 * @see #getOperator()
-	 * @generated
-	 */
-	EReference getOperator_Right();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.operators.DualOperator <em>Dual Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Dual Operator</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.DualOperator
-	 * @generated
-	 */
-	EClass getDualOperator();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.fortiss.af3.exploration.dsl.model.operators.DualOperator#getLeft <em>Left</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Left</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.DualOperator#getLeft()
-	 * @see #getDualOperator()
-	 * @generated
-	 */
-	EReference getDualOperator_Left();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOp <em>Arithmetic Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Arithmetic Op</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOp
-	 * @generated
-	 */
-	EClass getArithmeticOp();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp <em>Comparison Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Comparison Op</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp
-	 * @generated
-	 */
-	EClass getComparisonOp();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.operators.LocationOp <em>Location Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Location Op</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.LocationOp
-	 * @generated
-	 */
-	EClass getLocationOp();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection <em>Optimization Direction</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Optimization Direction</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection
-	 * @generated
-	 */
-	EClass getOptimizationDirection();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.operators.QuantifierOp <em>Quantifier Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Quantifier Op</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.QuantifierOp
-	 * @generated
-	 */
-	EClass getQuantifierOp();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.operators.SummationOp <em>Summation Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Summation Op</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.SummationOp
-	 * @generated
-	 */
-	EClass getSummationOp();
-
-	/**
-	 * Returns the meta object for enum '{@link org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOperatorEnum <em>Arithmetic Operator Enum</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Arithmetic Operator Enum</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOperatorEnum
-	 * @generated
-	 */
-	EEnum getArithmeticOperatorEnum();
-
-	/**
-	 * Returns the meta object for enum '{@link org.fortiss.af3.exploration.dsl.model.operators.BooleanOperatorEnum <em>Boolean Operator Enum</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Boolean Operator Enum</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.BooleanOperatorEnum
-	 * @generated
-	 */
-	EEnum getBooleanOperatorEnum();
-
-	/**
-	 * Returns the meta object for enum '{@link org.fortiss.af3.exploration.dsl.model.operators.ComparisonOperatorEnum <em>Comparison Operator Enum</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Comparison Operator Enum</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ComparisonOperatorEnum
-	 * @generated
-	 */
-	EEnum getComparisonOperatorEnum();
-
-	/**
-	 * Returns the meta object for enum '{@link org.fortiss.af3.exploration.dsl.model.operators.LocationOperatorEnum <em>Location Operator Enum</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Location Operator Enum</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.LocationOperatorEnum
-	 * @generated
-	 */
-	EEnum getLocationOperatorEnum();
-
-	/**
-	 * Returns the meta object for enum '{@link org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirectionEnum <em>Optimization Direction Enum</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Optimization Direction Enum</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirectionEnum
-	 * @generated
-	 */
-	EEnum getOptimizationDirectionEnum();
-
-	/**
-	 * Returns the meta object for enum '{@link org.fortiss.af3.exploration.dsl.model.operators.QuantifierEnum <em>Quantifier Enum</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Quantifier Enum</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.QuantifierEnum
-	 * @generated
-	 */
-	EEnum getQuantifierEnum();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	OperatorsFactory getOperatorsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator <em>Operator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.Operator
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getOperator()
-		 * @generated
-		 */
-		EClass OPERATOR = eINSTANCE.getOperator();
-
-		/**
-		 * The meta object literal for the '<em><b>Operator</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute OPERATOR__OPERATOR = eINSTANCE.getOperator_Operator();
-
-		/**
-		 * The meta object literal for the '<em><b>Right</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference OPERATOR__RIGHT = eINSTANCE.getOperator_Right();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.DualOperatorImpl <em>Dual Operator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.DualOperatorImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getDualOperator()
-		 * @generated
-		 */
-		EClass DUAL_OPERATOR = eINSTANCE.getDualOperator();
-
-		/**
-		 * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DUAL_OPERATOR__LEFT = eINSTANCE.getDualOperator_Left();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.ArithmeticOpImpl <em>Arithmetic Op</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.ArithmeticOpImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getArithmeticOp()
-		 * @generated
-		 */
-		EClass ARITHMETIC_OP = eINSTANCE.getArithmeticOp();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.ComparisonOpImpl <em>Comparison Op</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.ComparisonOpImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getComparisonOp()
-		 * @generated
-		 */
-		EClass COMPARISON_OP = eINSTANCE.getComparisonOp();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.LocationOpImpl <em>Location Op</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.LocationOpImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getLocationOp()
-		 * @generated
-		 */
-		EClass LOCATION_OP = eINSTANCE.getLocationOp();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.OptimizationDirectionImpl <em>Optimization Direction</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OptimizationDirectionImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getOptimizationDirection()
-		 * @generated
-		 */
-		EClass OPTIMIZATION_DIRECTION = eINSTANCE.getOptimizationDirection();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.QuantifierOpImpl <em>Quantifier Op</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.QuantifierOpImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getQuantifierOp()
-		 * @generated
-		 */
-		EClass QUANTIFIER_OP = eINSTANCE.getQuantifierOp();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.impl.SummationOpImpl <em>Summation Op</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.SummationOpImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getSummationOp()
-		 * @generated
-		 */
-		EClass SUMMATION_OP = eINSTANCE.getSummationOp();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOperatorEnum <em>Arithmetic Operator Enum</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOperatorEnum
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getArithmeticOperatorEnum()
-		 * @generated
-		 */
-		EEnum ARITHMETIC_OPERATOR_ENUM = eINSTANCE.getArithmeticOperatorEnum();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.BooleanOperatorEnum <em>Boolean Operator Enum</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.BooleanOperatorEnum
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getBooleanOperatorEnum()
-		 * @generated
-		 */
-		EEnum BOOLEAN_OPERATOR_ENUM = eINSTANCE.getBooleanOperatorEnum();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.ComparisonOperatorEnum <em>Comparison Operator Enum</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.ComparisonOperatorEnum
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getComparisonOperatorEnum()
-		 * @generated
-		 */
-		EEnum COMPARISON_OPERATOR_ENUM = eINSTANCE.getComparisonOperatorEnum();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.LocationOperatorEnum <em>Location Operator Enum</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.LocationOperatorEnum
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getLocationOperatorEnum()
-		 * @generated
-		 */
-		EEnum LOCATION_OPERATOR_ENUM = eINSTANCE.getLocationOperatorEnum();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirectionEnum <em>Optimization Direction Enum</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirectionEnum
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getOptimizationDirectionEnum()
-		 * @generated
-		 */
-		EEnum OPTIMIZATION_DIRECTION_ENUM = eINSTANCE.getOptimizationDirectionEnum();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.operators.QuantifierEnum <em>Quantifier Enum</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.QuantifierEnum
-		 * @see org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl#getQuantifierEnum()
-		 * @generated
-		 */
-		EEnum QUANTIFIER_ENUM = eINSTANCE.getQuantifierEnum();
-
-	}
-
-} //OperatorsPackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OptimizationDirection.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OptimizationDirection.java
deleted file mode 100644
index 0ee9b53b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OptimizationDirection.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Optimization Direction</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getOptimizationDirection()
- * @model
- * @generated
- */
-public interface OptimizationDirection extends Operator<OptimizationDirectionEnum, ArithmeticExpression<?>> {
-} // OptimizationDirection
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OptimizationDirectionEnum.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OptimizationDirectionEnum.java
deleted file mode 100644
index 5d3c9a72..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/OptimizationDirectionEnum.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Optimization Direction Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getOptimizationDirectionEnum()
- * @model
- * @generated
- */
-public enum OptimizationDirectionEnum implements Enumerator {
-	/**
-	 * The '<em><b>MIN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MIN_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MIN(0, "MIN", "MIN"),
-
-	/**
-	 * The '<em><b>MAX</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MAX_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MAX(1, "MAX", "MAX");
-
-	/**
-	 * The '<em><b>MIN</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>MIN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MIN
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MIN_VALUE = 0;
-
-	/**
-	 * The '<em><b>MAX</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>MAX</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MAX
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MAX_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Optimization Direction Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final OptimizationDirectionEnum[] VALUES_ARRAY =
-		new OptimizationDirectionEnum[] {
-			MIN,
-			MAX,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Optimization Direction Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<OptimizationDirectionEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Optimization Direction Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static OptimizationDirectionEnum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			OptimizationDirectionEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Optimization Direction Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static OptimizationDirectionEnum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			OptimizationDirectionEnum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Optimization Direction Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static OptimizationDirectionEnum get(int value) {
-		switch (value) {
-			case MIN_VALUE: return MIN;
-			case MAX_VALUE: return MAX;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private OptimizationDirectionEnum(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //OptimizationDirectionEnum
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/QuantifierEnum.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/QuantifierEnum.java
deleted file mode 100644
index bad22abc..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/QuantifierEnum.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Quantifier Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getQuantifierEnum()
- * @model
- * @generated
- */
-public enum QuantifierEnum implements Enumerator {
-	/**
-	 * The '<em><b>FOR ALL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FOR_ALL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	FOR_ALL(0, "FOR_ALL", "FOR_ALL"),
-
-	/**
-	 * The '<em><b>EXIST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EXIST_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	EXIST(1, "EXIST", "EXIST"),
-
-	/**
-	 * The '<em><b>ANY</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ANY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ANY(1, "ANY", "ANY");
-
-	/**
-	 * The '<em><b>FOR ALL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>FOR ALL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FOR_ALL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FOR_ALL_VALUE = 0;
-
-	/**
-	 * The '<em><b>EXIST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>EXIST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EXIST
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EXIST_VALUE = 1;
-
-	/**
-	 * The '<em><b>ANY</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ANY</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ANY
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ANY_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Quantifier Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final QuantifierEnum[] VALUES_ARRAY =
-		new QuantifierEnum[] {
-			FOR_ALL,
-			EXIST,
-			ANY,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Quantifier Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<QuantifierEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Quantifier Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static QuantifierEnum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			QuantifierEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Quantifier Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static QuantifierEnum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			QuantifierEnum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Quantifier Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static QuantifierEnum get(int value) {
-		switch (value) {
-			case FOR_ALL_VALUE: return FOR_ALL;
-			case EXIST_VALUE: return EXIST;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private QuantifierEnum(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //QuantifierEnum
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/QuantifierOp.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/QuantifierOp.java
deleted file mode 100644
index 82cf1a4c..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/QuantifierOp.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import org.fortiss.af3.exploration.dsl.model.types.SetType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Quantifier Op</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getQuantifierOp()
- * @model
- * @generated
- */
-public interface QuantifierOp extends Operator<QuantifierEnum, SetType<?>> {
-} // QuantifierOp
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/SummationOp.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/SummationOp.java
deleted file mode 100644
index 70b9da73..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/SummationOp.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Summation Op</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#getSummationOp()
- * @model
- * @generated
- */
-public interface SummationOp<T> extends Operator<ArithmeticOperatorEnum, ArithmeticExpression<T>>, ArithmeticExpression<T> {
-} // SummationOp
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/ArithmeticOpImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/ArithmeticOpImpl.java
deleted file mode 100644
index eadeba82..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/ArithmeticOpImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators.impl;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOp;
-import org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOperatorEnum;
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Arithmetic Op</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ArithmeticOpImpl<T, LHE extends ArithmeticExpression<T>, RHE extends ArithmeticExpression<T>> extends DualOperatorImpl<LHE, ArithmeticOperatorEnum, RHE> implements ArithmeticOp<T, LHE, RHE> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ArithmeticOpImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return OperatorsPackage.Literals.ARITHMETIC_OP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public void setOperator(ArithmeticOperatorEnum newOperator) {
-		super.setOperator(newOperator);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public NotificationChain basicSetRight(RHE newRight, NotificationChain msgs) {
-		return super.basicSetRight(newRight, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public NotificationChain basicSetLeft(LHE newLeft, NotificationChain msgs) {
-		return super.basicSetLeft(newLeft, msgs);
-	}
-
-} //ArithmeticOpImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/ComparisonOpImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/ComparisonOpImpl.java
deleted file mode 100644
index e7bc2ed0..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/ComparisonOpImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators.impl;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp;
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOperatorEnum;
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Comparison Op</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ComparisonOpImpl<T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> extends DualOperatorImpl<ArithmeticExpression<T>, ComparisonOperatorEnum, ArithmeticExpression<T>> implements ComparisonOp<T, LHT, RHT> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComparisonOpImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return OperatorsPackage.Literals.COMPARISON_OP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public void setOperator(ComparisonOperatorEnum newOperator) {
-		super.setOperator(newOperator);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public NotificationChain basicSetRight(ArithmeticExpression<T> newRight, NotificationChain msgs) {
-		return super.basicSetRight(newRight, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public NotificationChain basicSetLeft(ArithmeticExpression<T> newLeft, NotificationChain msgs) {
-		return super.basicSetLeft(newLeft, msgs);
-	}
-
-} //ComparisonOpImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/DualOperatorImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/DualOperatorImpl.java
deleted file mode 100644
index bae26d16..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/DualOperatorImpl.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.dsl.model.operators.DualOperator;
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dual Operator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.impl.DualOperatorImpl#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.impl.DualOperatorImpl#getRight <em>Right</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.impl.DualOperatorImpl#getLeft <em>Left</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DualOperatorImpl<LHT, OP, RHT> extends EObjectImpl implements DualOperator<LHT, OP, RHT> {
-	/**
-	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOperator()
-	 * @generated
-	 * @ordered
-	 */
-	protected OP operator;
-
-	/**
-	 * The cached value of the '{@link #getRight() <em>Right</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRight()
-	 * @generated
-	 * @ordered
-	 */
-	protected RHT right;
-
-	/**
-	 * The cached value of the '{@link #getLeft() <em>Left</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLeft()
-	 * @generated
-	 * @ordered
-	 */
-	protected LHT left;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DualOperatorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return OperatorsPackage.Literals.DUAL_OPERATOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OP getOperator() {
-		return operator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOperator(OP newOperator) {
-		OP oldOperator = operator;
-		operator = newOperator;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OperatorsPackage.DUAL_OPERATOR__OPERATOR, oldOperator, operator));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public RHT getRight() {
-		if (right != null && ((EObject)right).eIsProxy()) {
-			InternalEObject oldRight = (InternalEObject)right;
-			right = (RHT)eResolveProxy(oldRight);
-			if (right != oldRight) {
-				InternalEObject newRight = (InternalEObject)right;
-				NotificationChain msgs = oldRight.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.DUAL_OPERATOR__RIGHT, null, null);
-				if (newRight.eInternalContainer() == null) {
-					msgs = newRight.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.DUAL_OPERATOR__RIGHT, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, OperatorsPackage.DUAL_OPERATOR__RIGHT, oldRight, right));
-			}
-		}
-		return right;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RHT basicGetRight() {
-		return right;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRight(RHT newRight, NotificationChain msgs) {
-		RHT oldRight = right;
-		right = newRight;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OperatorsPackage.DUAL_OPERATOR__RIGHT, oldRight, newRight);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRight(RHT newRight) {
-		if (newRight != right) {
-			NotificationChain msgs = null;
-			if (right != null)
-				msgs = ((InternalEObject)right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.DUAL_OPERATOR__RIGHT, null, msgs);
-			if (newRight != null)
-				msgs = ((InternalEObject)newRight).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.DUAL_OPERATOR__RIGHT, null, msgs);
-			msgs = basicSetRight(newRight, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OperatorsPackage.DUAL_OPERATOR__RIGHT, newRight, newRight));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public LHT getLeft() {
-		if (left != null && ((EObject)left).eIsProxy()) {
-			InternalEObject oldLeft = (InternalEObject)left;
-			left = (LHT)eResolveProxy(oldLeft);
-			if (left != oldLeft) {
-				InternalEObject newLeft = (InternalEObject)left;
-				NotificationChain msgs = oldLeft.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.DUAL_OPERATOR__LEFT, null, null);
-				if (newLeft.eInternalContainer() == null) {
-					msgs = newLeft.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.DUAL_OPERATOR__LEFT, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, OperatorsPackage.DUAL_OPERATOR__LEFT, oldLeft, left));
-			}
-		}
-		return left;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LHT basicGetLeft() {
-		return left;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLeft(LHT newLeft, NotificationChain msgs) {
-		LHT oldLeft = left;
-		left = newLeft;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OperatorsPackage.DUAL_OPERATOR__LEFT, oldLeft, newLeft);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLeft(LHT newLeft) {
-		if (newLeft != left) {
-			NotificationChain msgs = null;
-			if (left != null)
-				msgs = ((InternalEObject)left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.DUAL_OPERATOR__LEFT, null, msgs);
-			if (newLeft != null)
-				msgs = ((InternalEObject)newLeft).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.DUAL_OPERATOR__LEFT, null, msgs);
-			msgs = basicSetLeft(newLeft, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OperatorsPackage.DUAL_OPERATOR__LEFT, newLeft, newLeft));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case OperatorsPackage.DUAL_OPERATOR__RIGHT:
-				return basicSetRight(null, msgs);
-			case OperatorsPackage.DUAL_OPERATOR__LEFT:
-				return basicSetLeft(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case OperatorsPackage.DUAL_OPERATOR__OPERATOR:
-				return getOperator();
-			case OperatorsPackage.DUAL_OPERATOR__RIGHT:
-				if (resolve) return getRight();
-				return basicGetRight();
-			case OperatorsPackage.DUAL_OPERATOR__LEFT:
-				if (resolve) return getLeft();
-				return basicGetLeft();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case OperatorsPackage.DUAL_OPERATOR__OPERATOR:
-				setOperator((OP)newValue);
-				return;
-			case OperatorsPackage.DUAL_OPERATOR__RIGHT:
-				setRight((RHT)newValue);
-				return;
-			case OperatorsPackage.DUAL_OPERATOR__LEFT:
-				setLeft((LHT)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case OperatorsPackage.DUAL_OPERATOR__OPERATOR:
-				setOperator((OP)null);
-				return;
-			case OperatorsPackage.DUAL_OPERATOR__RIGHT:
-				setRight((RHT)null);
-				return;
-			case OperatorsPackage.DUAL_OPERATOR__LEFT:
-				setLeft((LHT)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case OperatorsPackage.DUAL_OPERATOR__OPERATOR:
-				return operator != null;
-			case OperatorsPackage.DUAL_OPERATOR__RIGHT:
-				return right != null;
-			case OperatorsPackage.DUAL_OPERATOR__LEFT:
-				return left != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (operator: ");
-		result.append(operator);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DualOperatorImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/LocationOpImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/LocationOpImpl.java
deleted file mode 100644
index 063b06a9..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/LocationOpImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators.impl;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.LocationOp;
-import org.fortiss.af3.exploration.dsl.model.operators.LocationOperatorEnum;
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Location Op</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class LocationOpImpl<LHT extends IModelElement, RHT extends IModelElement> extends DualOperatorImpl<ElementExpression<LHT>, LocationOperatorEnum, ElementExpression<RHT>> implements LocationOp<LHT, RHT> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocationOpImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return OperatorsPackage.Literals.LOCATION_OP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public void setOperator(LocationOperatorEnum newOperator) {
-		super.setOperator(newOperator);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public NotificationChain basicSetRight(ElementExpression<RHT> newRight, NotificationChain msgs) {
-		return super.basicSetRight(newRight, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public NotificationChain basicSetLeft(ElementExpression<LHT> newLeft, NotificationChain msgs) {
-		return super.basicSetLeft(newLeft, msgs);
-	}
-
-} //LocationOpImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OperatorsFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OperatorsFactoryImpl.java
deleted file mode 100644
index d32b181b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OperatorsFactoryImpl.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class OperatorsFactoryImpl extends EFactoryImpl implements OperatorsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static OperatorsFactory init() {
-		try {
-			OperatorsFactory theOperatorsFactory = (OperatorsFactory)EPackage.Registry.INSTANCE.getEFactory(OperatorsPackage.eNS_URI);
-			if (theOperatorsFactory != null) {
-				return theOperatorsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new OperatorsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OperatorsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case OperatorsPackage.DUAL_OPERATOR: return createDualOperator();
-			case OperatorsPackage.ARITHMETIC_OP: return createArithmeticOp();
-			case OperatorsPackage.COMPARISON_OP: return createComparisonOp();
-			case OperatorsPackage.LOCATION_OP: return createLocationOp();
-			case OperatorsPackage.OPTIMIZATION_DIRECTION: return createOptimizationDirection();
-			case OperatorsPackage.QUANTIFIER_OP: return createQuantifierOp();
-			case OperatorsPackage.SUMMATION_OP: return createSummationOp();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case OperatorsPackage.ARITHMETIC_OPERATOR_ENUM:
-				return createArithmeticOperatorEnumFromString(eDataType, initialValue);
-			case OperatorsPackage.BOOLEAN_OPERATOR_ENUM:
-				return createBooleanOperatorEnumFromString(eDataType, initialValue);
-			case OperatorsPackage.COMPARISON_OPERATOR_ENUM:
-				return createComparisonOperatorEnumFromString(eDataType, initialValue);
-			case OperatorsPackage.LOCATION_OPERATOR_ENUM:
-				return createLocationOperatorEnumFromString(eDataType, initialValue);
-			case OperatorsPackage.OPTIMIZATION_DIRECTION_ENUM:
-				return createOptimizationDirectionEnumFromString(eDataType, initialValue);
-			case OperatorsPackage.QUANTIFIER_ENUM:
-				return createQuantifierEnumFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case OperatorsPackage.ARITHMETIC_OPERATOR_ENUM:
-				return convertArithmeticOperatorEnumToString(eDataType, instanceValue);
-			case OperatorsPackage.BOOLEAN_OPERATOR_ENUM:
-				return convertBooleanOperatorEnumToString(eDataType, instanceValue);
-			case OperatorsPackage.COMPARISON_OPERATOR_ENUM:
-				return convertComparisonOperatorEnumToString(eDataType, instanceValue);
-			case OperatorsPackage.LOCATION_OPERATOR_ENUM:
-				return convertLocationOperatorEnumToString(eDataType, instanceValue);
-			case OperatorsPackage.OPTIMIZATION_DIRECTION_ENUM:
-				return convertOptimizationDirectionEnumToString(eDataType, instanceValue);
-			case OperatorsPackage.QUANTIFIER_ENUM:
-				return convertQuantifierEnumToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <LHT, OP, RHT> DualOperator<LHT, OP, RHT> createDualOperator() {
-		DualOperatorImpl<LHT, OP, RHT> dualOperator = new DualOperatorImpl<LHT, OP, RHT>();
-		return dualOperator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T, LHE extends ArithmeticExpression<T>, RHE extends ArithmeticExpression<T>> ArithmeticOp<T, LHE, RHE> createArithmeticOp() {
-		ArithmeticOpImpl<T, LHE, RHE> arithmeticOp = new ArithmeticOpImpl<T, LHE, RHE>();
-		return arithmeticOp;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> ComparisonOp<T, LHT, RHT> createComparisonOp() {
-		ComparisonOpImpl<T, LHT, RHT> comparisonOp = new ComparisonOpImpl<T, LHT, RHT>();
-		return comparisonOp;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <LHT extends IModelElement, RHT extends IModelElement> LocationOp<LHT, RHT> createLocationOp() {
-		LocationOpImpl<LHT, RHT> locationOp = new LocationOpImpl<LHT, RHT>();
-		return locationOp;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OptimizationDirection createOptimizationDirection() {
-		OptimizationDirectionImpl optimizationDirection = new OptimizationDirectionImpl();
-		return optimizationDirection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QuantifierOp createQuantifierOp() {
-		QuantifierOpImpl quantifierOp = new QuantifierOpImpl();
-		return quantifierOp;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> SummationOp<T> createSummationOp() {
-		SummationOpImpl<T> summationOp = new SummationOpImpl<T>();
-		return summationOp;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ArithmeticOperatorEnum createArithmeticOperatorEnumFromString(EDataType eDataType, String initialValue) {
-		ArithmeticOperatorEnum result = ArithmeticOperatorEnum.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertArithmeticOperatorEnumToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BooleanOperatorEnum createBooleanOperatorEnumFromString(EDataType eDataType, String initialValue) {
-		BooleanOperatorEnum result = BooleanOperatorEnum.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertBooleanOperatorEnumToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComparisonOperatorEnum createComparisonOperatorEnumFromString(EDataType eDataType, String initialValue) {
-		ComparisonOperatorEnum result = ComparisonOperatorEnum.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertComparisonOperatorEnumToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocationOperatorEnum createLocationOperatorEnumFromString(EDataType eDataType, String initialValue) {
-		LocationOperatorEnum result = LocationOperatorEnum.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertLocationOperatorEnumToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OptimizationDirectionEnum createOptimizationDirectionEnumFromString(EDataType eDataType, String initialValue) {
-		OptimizationDirectionEnum result = OptimizationDirectionEnum.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertOptimizationDirectionEnumToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QuantifierEnum createQuantifierEnumFromString(EDataType eDataType, String initialValue) {
-		QuantifierEnum result = QuantifierEnum.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertQuantifierEnumToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OperatorsPackage getOperatorsPackage() {
-		return (OperatorsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static OperatorsPackage getPackage() {
-		return OperatorsPackage.eINSTANCE;
-	}
-
-} //OperatorsFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OperatorsPackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OperatorsPackageImpl.java
deleted file mode 100644
index b5f6576b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OperatorsPackageImpl.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.ETypeParameter;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.impl.ModelPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOp;
-import org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOperatorEnum;
-import org.fortiss.af3.exploration.dsl.model.operators.BooleanOperatorEnum;
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp;
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOperatorEnum;
-import org.fortiss.af3.exploration.dsl.model.operators.DualOperator;
-import org.fortiss.af3.exploration.dsl.model.operators.LocationOp;
-import org.fortiss.af3.exploration.dsl.model.operators.LocationOperatorEnum;
-import org.fortiss.af3.exploration.dsl.model.operators.Operator;
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsFactory;
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-import org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection;
-import org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirectionEnum;
-import org.fortiss.af3.exploration.dsl.model.operators.QuantifierEnum;
-import org.fortiss.af3.exploration.dsl.model.operators.QuantifierOp;
-import org.fortiss.af3.exploration.dsl.model.operators.SummationOp;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-import org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl;
-
-import org.fortiss.tooling.base.model.base.BasePackage;
-
-import org.fortiss.tooling.base.model.element.ElementPackage;
-
-import org.fortiss.tooling.base.model.layout.LayoutPackage;
-
-import org.fortiss.tooling.base.model.visualization.VisualizationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class OperatorsPackageImpl extends EPackageImpl implements OperatorsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass operatorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass dualOperatorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass arithmeticOpEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass comparisonOpEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass locationOpEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass optimizationDirectionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass quantifierOpEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass summationOpEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum arithmeticOperatorEnumEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum booleanOperatorEnumEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum comparisonOperatorEnumEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum locationOperatorEnumEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum optimizationDirectionEnumEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum quantifierEnumEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private OperatorsPackageImpl() {
-		super(eNS_URI, OperatorsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link OperatorsPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static OperatorsPackage init() {
-		if (isInited) return (OperatorsPackage)EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		OperatorsPackageImpl theOperatorsPackage = (OperatorsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof OperatorsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new OperatorsPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ElementPackage.eINSTANCE.eClass();
-		LayoutPackage.eINSTANCE.eClass();
-		BasePackage.eINSTANCE.eClass();
-		VisualizationPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ModelPackageImpl theModelPackage = (ModelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI) : ModelPackage.eINSTANCE);
-		ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI) instanceof ExpressionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI) : ExpressionsPackage.eINSTANCE);
-		PatternsPackageImpl thePatternsPackage = (PatternsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PatternsPackage.eNS_URI) instanceof PatternsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PatternsPackage.eNS_URI) : PatternsPackage.eINSTANCE);
-		TypesPackageImpl theTypesPackage = (TypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI) instanceof TypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI) : TypesPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theOperatorsPackage.createPackageContents();
-		theModelPackage.createPackageContents();
-		theExpressionsPackage.createPackageContents();
-		thePatternsPackage.createPackageContents();
-		theTypesPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theOperatorsPackage.initializePackageContents();
-		theModelPackage.initializePackageContents();
-		theExpressionsPackage.initializePackageContents();
-		thePatternsPackage.initializePackageContents();
-		theTypesPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theOperatorsPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(OperatorsPackage.eNS_URI, theOperatorsPackage);
-		return theOperatorsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOperator() {
-		return operatorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOperator_Operator() {
-		return (EAttribute)operatorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOperator_Right() {
-		return (EReference)operatorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDualOperator() {
-		return dualOperatorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDualOperator_Left() {
-		return (EReference)dualOperatorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getArithmeticOp() {
-		return arithmeticOpEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getComparisonOp() {
-		return comparisonOpEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocationOp() {
-		return locationOpEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOptimizationDirection() {
-		return optimizationDirectionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getQuantifierOp() {
-		return quantifierOpEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSummationOp() {
-		return summationOpEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getArithmeticOperatorEnum() {
-		return arithmeticOperatorEnumEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getBooleanOperatorEnum() {
-		return booleanOperatorEnumEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getComparisonOperatorEnum() {
-		return comparisonOperatorEnumEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getLocationOperatorEnum() {
-		return locationOperatorEnumEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getOptimizationDirectionEnum() {
-		return optimizationDirectionEnumEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getQuantifierEnum() {
-		return quantifierEnumEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OperatorsFactory getOperatorsFactory() {
-		return (OperatorsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		operatorEClass = createEClass(OPERATOR);
-		createEAttribute(operatorEClass, OPERATOR__OPERATOR);
-		createEReference(operatorEClass, OPERATOR__RIGHT);
-
-		dualOperatorEClass = createEClass(DUAL_OPERATOR);
-		createEReference(dualOperatorEClass, DUAL_OPERATOR__LEFT);
-
-		arithmeticOpEClass = createEClass(ARITHMETIC_OP);
-
-		comparisonOpEClass = createEClass(COMPARISON_OP);
-
-		locationOpEClass = createEClass(LOCATION_OP);
-
-		optimizationDirectionEClass = createEClass(OPTIMIZATION_DIRECTION);
-
-		quantifierOpEClass = createEClass(QUANTIFIER_OP);
-
-		summationOpEClass = createEClass(SUMMATION_OP);
-
-		// Create enums
-		arithmeticOperatorEnumEEnum = createEEnum(ARITHMETIC_OPERATOR_ENUM);
-		booleanOperatorEnumEEnum = createEEnum(BOOLEAN_OPERATOR_ENUM);
-		comparisonOperatorEnumEEnum = createEEnum(COMPARISON_OPERATOR_ENUM);
-		locationOperatorEnumEEnum = createEEnum(LOCATION_OPERATOR_ENUM);
-		optimizationDirectionEnumEEnum = createEEnum(OPTIMIZATION_DIRECTION_ENUM);
-		quantifierEnumEEnum = createEEnum(QUANTIFIER_ENUM);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ExpressionsPackage theExpressionsPackage = (ExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI);
-		ElementPackage theElementPackage = (ElementPackage)EPackage.Registry.INSTANCE.getEPackage(ElementPackage.eNS_URI);
-		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
-
-		// Create type parameters
-		ETypeParameter operatorEClass_OP = addETypeParameter(operatorEClass, "OP");
-		ETypeParameter operatorEClass_RHT = addETypeParameter(operatorEClass, "RHT");
-		ETypeParameter dualOperatorEClass_LHT = addETypeParameter(dualOperatorEClass, "LHT");
-		ETypeParameter dualOperatorEClass_OP = addETypeParameter(dualOperatorEClass, "OP");
-		ETypeParameter dualOperatorEClass_RHT = addETypeParameter(dualOperatorEClass, "RHT");
-		ETypeParameter arithmeticOpEClass_T = addETypeParameter(arithmeticOpEClass, "T");
-		ETypeParameter arithmeticOpEClass_LHE = addETypeParameter(arithmeticOpEClass, "LHE");
-		ETypeParameter arithmeticOpEClass_RHE = addETypeParameter(arithmeticOpEClass, "RHE");
-		ETypeParameter comparisonOpEClass_T = addETypeParameter(comparisonOpEClass, "T");
-		ETypeParameter comparisonOpEClass_LHT = addETypeParameter(comparisonOpEClass, "LHT");
-		ETypeParameter comparisonOpEClass_RHT = addETypeParameter(comparisonOpEClass, "RHT");
-		ETypeParameter locationOpEClass_LHT = addETypeParameter(locationOpEClass, "LHT");
-		ETypeParameter locationOpEClass_RHT = addETypeParameter(locationOpEClass, "RHT");
-		ETypeParameter summationOpEClass_T = addETypeParameter(summationOpEClass, "T");
-
-		// Set bounds for type parameters
-		EGenericType g1 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		EGenericType g2 = createEGenericType(arithmeticOpEClass_T);
-		g1.getETypeArguments().add(g2);
-		arithmeticOpEClass_LHE.getEBounds().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g2 = createEGenericType(arithmeticOpEClass_T);
-		g1.getETypeArguments().add(g2);
-		arithmeticOpEClass_RHE.getEBounds().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g2 = createEGenericType(comparisonOpEClass_T);
-		g1.getETypeArguments().add(g2);
-		comparisonOpEClass_LHT.getEBounds().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g2 = createEGenericType(comparisonOpEClass_T);
-		g1.getETypeArguments().add(g2);
-		comparisonOpEClass_RHT.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		locationOpEClass_LHT.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		locationOpEClass_RHT.getEBounds().add(g1);
-
-		// Add supertypes to classes
-		g1 = createEGenericType(this.getOperator());
-		g2 = createEGenericType(dualOperatorEClass_OP);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(dualOperatorEClass_RHT);
-		g1.getETypeArguments().add(g2);
-		dualOperatorEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getDualOperator());
-		g2 = createEGenericType(arithmeticOpEClass_LHE);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(this.getArithmeticOperatorEnum());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(arithmeticOpEClass_RHE);
-		g1.getETypeArguments().add(g2);
-		arithmeticOpEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g2 = createEGenericType(arithmeticOpEClass_T);
-		g1.getETypeArguments().add(g2);
-		arithmeticOpEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getDualOperator());
-		g2 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g1.getETypeArguments().add(g2);
-		EGenericType g3 = createEGenericType(comparisonOpEClass_T);
-		g2.getETypeArguments().add(g3);
-		g2 = createEGenericType(this.getComparisonOperatorEnum());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType(comparisonOpEClass_T);
-		g2.getETypeArguments().add(g3);
-		comparisonOpEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getBooleanExpression());
-		comparisonOpEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getDualOperator());
-		g2 = createEGenericType(theExpressionsPackage.getElementExpression());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType(locationOpEClass_LHT);
-		g2.getETypeArguments().add(g3);
-		g2 = createEGenericType(this.getLocationOperatorEnum());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(theExpressionsPackage.getElementExpression());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType(locationOpEClass_RHT);
-		g2.getETypeArguments().add(g3);
-		locationOpEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getBooleanExpression());
-		locationOpEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getOperator());
-		g2 = createEGenericType(this.getOptimizationDirectionEnum());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType();
-		g2.getETypeArguments().add(g3);
-		optimizationDirectionEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getOperator());
-		g2 = createEGenericType(this.getQuantifierEnum());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(theTypesPackage.getSetType());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType();
-		g2.getETypeArguments().add(g3);
-		quantifierOpEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getOperator());
-		g2 = createEGenericType(this.getArithmeticOperatorEnum());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType(summationOpEClass_T);
-		g2.getETypeArguments().add(g3);
-		summationOpEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g2 = createEGenericType(summationOpEClass_T);
-		g1.getETypeArguments().add(g2);
-		summationOpEClass.getEGenericSuperTypes().add(g1);
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(operatorEClass, Operator.class, "Operator", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		g1 = createEGenericType(operatorEClass_OP);
-		initEAttribute(getOperator_Operator(), g1, "operator", null, 1, 1, Operator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		g1 = createEGenericType(operatorEClass_RHT);
-		initEReference(getOperator_Right(), g1, null, "right", null, 1, 1, Operator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(dualOperatorEClass, DualOperator.class, "DualOperator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		g1 = createEGenericType(dualOperatorEClass_LHT);
-		initEReference(getDualOperator_Left(), g1, null, "left", null, 1, 1, DualOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(arithmeticOpEClass, ArithmeticOp.class, "ArithmeticOp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(comparisonOpEClass, ComparisonOp.class, "ComparisonOp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(locationOpEClass, LocationOp.class, "LocationOp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(optimizationDirectionEClass, OptimizationDirection.class, "OptimizationDirection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(quantifierOpEClass, QuantifierOp.class, "QuantifierOp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(summationOpEClass, SummationOp.class, "SummationOp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Initialize enums and add enum literals
-		initEEnum(arithmeticOperatorEnumEEnum, ArithmeticOperatorEnum.class, "ArithmeticOperatorEnum");
-		addEEnumLiteral(arithmeticOperatorEnumEEnum, ArithmeticOperatorEnum.ADD);
-		addEEnumLiteral(arithmeticOperatorEnumEEnum, ArithmeticOperatorEnum.SUB);
-		addEEnumLiteral(arithmeticOperatorEnumEEnum, ArithmeticOperatorEnum.MUL);
-		addEEnumLiteral(arithmeticOperatorEnumEEnum, ArithmeticOperatorEnum.DIV);
-
-		initEEnum(booleanOperatorEnumEEnum, BooleanOperatorEnum.class, "BooleanOperatorEnum");
-		addEEnumLiteral(booleanOperatorEnumEEnum, BooleanOperatorEnum.NOT);
-		addEEnumLiteral(booleanOperatorEnumEEnum, BooleanOperatorEnum.AND);
-		addEEnumLiteral(booleanOperatorEnumEEnum, BooleanOperatorEnum.OR);
-		addEEnumLiteral(booleanOperatorEnumEEnum, BooleanOperatorEnum.XOR);
-
-		initEEnum(comparisonOperatorEnumEEnum, ComparisonOperatorEnum.class, "ComparisonOperatorEnum");
-		addEEnumLiteral(comparisonOperatorEnumEEnum, ComparisonOperatorEnum.LESS);
-		addEEnumLiteral(comparisonOperatorEnumEEnum, ComparisonOperatorEnum.LESS_OR_EQUAL);
-		addEEnumLiteral(comparisonOperatorEnumEEnum, ComparisonOperatorEnum.EQUAL);
-		addEEnumLiteral(comparisonOperatorEnumEEnum, ComparisonOperatorEnum.GREATER_OR_EQUAL);
-		addEEnumLiteral(comparisonOperatorEnumEEnum, ComparisonOperatorEnum.GREATER);
-
-		initEEnum(locationOperatorEnumEEnum, LocationOperatorEnum.class, "LocationOperatorEnum");
-		addEEnumLiteral(locationOperatorEnumEEnum, LocationOperatorEnum.ALLOCATION);
-		addEEnumLiteral(locationOperatorEnumEEnum, LocationOperatorEnum.DISLOCATION);
-
-		initEEnum(optimizationDirectionEnumEEnum, OptimizationDirectionEnum.class, "OptimizationDirectionEnum");
-		addEEnumLiteral(optimizationDirectionEnumEEnum, OptimizationDirectionEnum.MIN);
-		addEEnumLiteral(optimizationDirectionEnumEEnum, OptimizationDirectionEnum.MAX);
-
-		initEEnum(quantifierEnumEEnum, QuantifierEnum.class, "QuantifierEnum");
-		addEEnumLiteral(quantifierEnumEEnum, QuantifierEnum.FOR_ALL);
-		addEEnumLiteral(quantifierEnumEEnum, QuantifierEnum.EXIST);
-		addEEnumLiteral(quantifierEnumEEnum, QuantifierEnum.ANY);
-	}
-
-} //OperatorsPackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OptimizationDirectionImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OptimizationDirectionImpl.java
deleted file mode 100644
index 4a257b8e..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/OptimizationDirectionImpl.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-import org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection;
-import org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirectionEnum;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Optimization Direction</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.impl.OptimizationDirectionImpl#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.impl.OptimizationDirectionImpl#getRight <em>Right</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OptimizationDirectionImpl extends EObjectImpl implements OptimizationDirection {
-	/**
-	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOperator()
-	 * @generated
-	 * @ordered
-	 */
-	protected OptimizationDirectionEnum operator;
-
-	/**
-	 * The cached value of the '{@link #getRight() <em>Right</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRight()
-	 * @generated
-	 * @ordered
-	 */
-	protected ArithmeticExpression<?> right;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OptimizationDirectionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return OperatorsPackage.Literals.OPTIMIZATION_DIRECTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OptimizationDirectionEnum getOperator() {
-		return operator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOperator(OptimizationDirectionEnum newOperator) {
-		OptimizationDirectionEnum oldOperator = operator;
-		operator = newOperator;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OperatorsPackage.OPTIMIZATION_DIRECTION__OPERATOR, oldOperator, operator));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ArithmeticExpression<?> getRight() {
-		if (right != null && ((EObject)right).eIsProxy()) {
-			InternalEObject oldRight = (InternalEObject)right;
-			right = (ArithmeticExpression<?>)eResolveProxy(oldRight);
-			if (right != oldRight) {
-				InternalEObject newRight = (InternalEObject)right;
-				NotificationChain msgs = oldRight.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT, null, null);
-				if (newRight.eInternalContainer() == null) {
-					msgs = newRight.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT, oldRight, right));
-			}
-		}
-		return right;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ArithmeticExpression<?> basicGetRight() {
-		return right;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRight(ArithmeticExpression<?> newRight, NotificationChain msgs) {
-		ArithmeticExpression<?> oldRight = right;
-		right = newRight;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT, oldRight, newRight);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRight(ArithmeticExpression<?> newRight) {
-		if (newRight != right) {
-			NotificationChain msgs = null;
-			if (right != null)
-				msgs = ((InternalEObject)right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT, null, msgs);
-			if (newRight != null)
-				msgs = ((InternalEObject)newRight).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT, null, msgs);
-			msgs = basicSetRight(newRight, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT, newRight, newRight));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT:
-				return basicSetRight(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case OperatorsPackage.OPTIMIZATION_DIRECTION__OPERATOR:
-				return getOperator();
-			case OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT:
-				if (resolve) return getRight();
-				return basicGetRight();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case OperatorsPackage.OPTIMIZATION_DIRECTION__OPERATOR:
-				setOperator((OptimizationDirectionEnum)newValue);
-				return;
-			case OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT:
-				setRight((ArithmeticExpression<?>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case OperatorsPackage.OPTIMIZATION_DIRECTION__OPERATOR:
-				setOperator((OptimizationDirectionEnum)null);
-				return;
-			case OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT:
-				setRight((ArithmeticExpression<?>)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case OperatorsPackage.OPTIMIZATION_DIRECTION__OPERATOR:
-				return operator != null;
-			case OperatorsPackage.OPTIMIZATION_DIRECTION__RIGHT:
-				return right != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (operator: ");
-		result.append(operator);
-		result.append(')');
-		return result.toString();
-	}
-
-} //OptimizationDirectionImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/QuantifierOpImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/QuantifierOpImpl.java
deleted file mode 100644
index 5256a94b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/QuantifierOpImpl.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-import org.fortiss.af3.exploration.dsl.model.operators.QuantifierEnum;
-import org.fortiss.af3.exploration.dsl.model.operators.QuantifierOp;
-
-import org.fortiss.af3.exploration.dsl.model.types.SetType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Quantifier Op</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.impl.QuantifierOpImpl#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.impl.QuantifierOpImpl#getRight <em>Right</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class QuantifierOpImpl extends EObjectImpl implements QuantifierOp {
-	/**
-	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOperator()
-	 * @generated
-	 * @ordered
-	 */
-	protected QuantifierEnum operator;
-
-	/**
-	 * The cached value of the '{@link #getRight() <em>Right</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRight()
-	 * @generated
-	 * @ordered
-	 */
-	protected SetType<?> right;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected QuantifierOpImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return OperatorsPackage.Literals.QUANTIFIER_OP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QuantifierEnum getOperator() {
-		return operator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOperator(QuantifierEnum newOperator) {
-		QuantifierEnum oldOperator = operator;
-		operator = newOperator;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OperatorsPackage.QUANTIFIER_OP__OPERATOR, oldOperator, operator));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SetType<?> getRight() {
-		if (right != null && ((EObject)right).eIsProxy()) {
-			InternalEObject oldRight = (InternalEObject)right;
-			right = (SetType<?>)eResolveProxy(oldRight);
-			if (right != oldRight) {
-				InternalEObject newRight = (InternalEObject)right;
-				NotificationChain msgs = oldRight.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.QUANTIFIER_OP__RIGHT, null, null);
-				if (newRight.eInternalContainer() == null) {
-					msgs = newRight.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.QUANTIFIER_OP__RIGHT, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, OperatorsPackage.QUANTIFIER_OP__RIGHT, oldRight, right));
-			}
-		}
-		return right;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SetType<?> basicGetRight() {
-		return right;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRight(SetType<?> newRight, NotificationChain msgs) {
-		SetType<?> oldRight = right;
-		right = newRight;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OperatorsPackage.QUANTIFIER_OP__RIGHT, oldRight, newRight);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRight(SetType<?> newRight) {
-		if (newRight != right) {
-			NotificationChain msgs = null;
-			if (right != null)
-				msgs = ((InternalEObject)right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.QUANTIFIER_OP__RIGHT, null, msgs);
-			if (newRight != null)
-				msgs = ((InternalEObject)newRight).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.QUANTIFIER_OP__RIGHT, null, msgs);
-			msgs = basicSetRight(newRight, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OperatorsPackage.QUANTIFIER_OP__RIGHT, newRight, newRight));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case OperatorsPackage.QUANTIFIER_OP__RIGHT:
-				return basicSetRight(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case OperatorsPackage.QUANTIFIER_OP__OPERATOR:
-				return getOperator();
-			case OperatorsPackage.QUANTIFIER_OP__RIGHT:
-				if (resolve) return getRight();
-				return basicGetRight();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case OperatorsPackage.QUANTIFIER_OP__OPERATOR:
-				setOperator((QuantifierEnum)newValue);
-				return;
-			case OperatorsPackage.QUANTIFIER_OP__RIGHT:
-				setRight((SetType<?>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case OperatorsPackage.QUANTIFIER_OP__OPERATOR:
-				setOperator((QuantifierEnum)null);
-				return;
-			case OperatorsPackage.QUANTIFIER_OP__RIGHT:
-				setRight((SetType<?>)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case OperatorsPackage.QUANTIFIER_OP__OPERATOR:
-				return operator != null;
-			case OperatorsPackage.QUANTIFIER_OP__RIGHT:
-				return right != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (operator: ");
-		result.append(operator);
-		result.append(')');
-		return result.toString();
-	}
-
-} //QuantifierOpImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/SummationOpImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/SummationOpImpl.java
deleted file mode 100644
index 65d86326..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/impl/SummationOpImpl.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOperatorEnum;
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-import org.fortiss.af3.exploration.dsl.model.operators.SummationOp;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Summation Op</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.impl.SummationOpImpl#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.operators.impl.SummationOpImpl#getRight <em>Right</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SummationOpImpl<T> extends EObjectImpl implements SummationOp<T> {
-	/**
-	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOperator()
-	 * @generated
-	 * @ordered
-	 */
-	protected ArithmeticOperatorEnum operator;
-
-	/**
-	 * The cached value of the '{@link #getRight() <em>Right</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRight()
-	 * @generated
-	 * @ordered
-	 */
-	protected ArithmeticExpression<T> right;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SummationOpImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return OperatorsPackage.Literals.SUMMATION_OP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ArithmeticOperatorEnum getOperator() {
-		return operator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOperator(ArithmeticOperatorEnum newOperator) {
-		ArithmeticOperatorEnum oldOperator = operator;
-		operator = newOperator;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OperatorsPackage.SUMMATION_OP__OPERATOR, oldOperator, operator));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public ArithmeticExpression<T> getRight() {
-		if (right != null && ((EObject)right).eIsProxy()) {
-			InternalEObject oldRight = (InternalEObject)right;
-			right = (ArithmeticExpression<T>)eResolveProxy(oldRight);
-			if (right != oldRight) {
-				InternalEObject newRight = (InternalEObject)right;
-				NotificationChain msgs = oldRight.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.SUMMATION_OP__RIGHT, null, null);
-				if (newRight.eInternalContainer() == null) {
-					msgs = newRight.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.SUMMATION_OP__RIGHT, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, OperatorsPackage.SUMMATION_OP__RIGHT, oldRight, right));
-			}
-		}
-		return right;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ArithmeticExpression<T> basicGetRight() {
-		return right;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRight(ArithmeticExpression<T> newRight, NotificationChain msgs) {
-		ArithmeticExpression<T> oldRight = right;
-		right = newRight;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OperatorsPackage.SUMMATION_OP__RIGHT, oldRight, newRight);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRight(ArithmeticExpression<T> newRight) {
-		if (newRight != right) {
-			NotificationChain msgs = null;
-			if (right != null)
-				msgs = ((InternalEObject)right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.SUMMATION_OP__RIGHT, null, msgs);
-			if (newRight != null)
-				msgs = ((InternalEObject)newRight).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OperatorsPackage.SUMMATION_OP__RIGHT, null, msgs);
-			msgs = basicSetRight(newRight, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OperatorsPackage.SUMMATION_OP__RIGHT, newRight, newRight));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case OperatorsPackage.SUMMATION_OP__RIGHT:
-				return basicSetRight(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case OperatorsPackage.SUMMATION_OP__OPERATOR:
-				return getOperator();
-			case OperatorsPackage.SUMMATION_OP__RIGHT:
-				if (resolve) return getRight();
-				return basicGetRight();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case OperatorsPackage.SUMMATION_OP__OPERATOR:
-				setOperator((ArithmeticOperatorEnum)newValue);
-				return;
-			case OperatorsPackage.SUMMATION_OP__RIGHT:
-				setRight((ArithmeticExpression<T>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case OperatorsPackage.SUMMATION_OP__OPERATOR:
-				setOperator((ArithmeticOperatorEnum)null);
-				return;
-			case OperatorsPackage.SUMMATION_OP__RIGHT:
-				setRight((ArithmeticExpression<T>)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case OperatorsPackage.SUMMATION_OP__OPERATOR:
-				return operator != null;
-			case OperatorsPackage.SUMMATION_OP__RIGHT:
-				return right != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (operator: ");
-		result.append(operator);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SummationOpImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/util/OperatorsAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/util/OperatorsAdapterFactory.java
deleted file mode 100644
index 5d0f55f0..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/util/OperatorsAdapterFactory.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage
- * @generated
- */
-public class OperatorsAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static OperatorsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OperatorsAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = OperatorsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OperatorsSwitch<Adapter> modelSwitch =
-		new OperatorsSwitch<Adapter>() {
-			@Override
-			public <OP, RHT> Adapter caseOperator(Operator<OP, RHT> object) {
-				return createOperatorAdapter();
-			}
-			@Override
-			public <LHT, OP, RHT> Adapter caseDualOperator(DualOperator<LHT, OP, RHT> object) {
-				return createDualOperatorAdapter();
-			}
-			@Override
-			public <T, LHE extends ArithmeticExpression<T>, RHE extends ArithmeticExpression<T>> Adapter caseArithmeticOp(ArithmeticOp<T, LHE, RHE> object) {
-				return createArithmeticOpAdapter();
-			}
-			@Override
-			public <T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> Adapter caseComparisonOp(ComparisonOp<T, LHT, RHT> object) {
-				return createComparisonOpAdapter();
-			}
-			@Override
-			public <LHT extends IModelElement, RHT extends IModelElement> Adapter caseLocationOp(LocationOp<LHT, RHT> object) {
-				return createLocationOpAdapter();
-			}
-			@Override
-			public Adapter caseOptimizationDirection(OptimizationDirection object) {
-				return createOptimizationDirectionAdapter();
-			}
-			@Override
-			public Adapter caseQuantifierOp(QuantifierOp object) {
-				return createQuantifierOpAdapter();
-			}
-			@Override
-			public <T> Adapter caseSummationOp(SummationOp<T> object) {
-				return createSummationOpAdapter();
-			}
-			@Override
-			public Adapter caseExpression(Expression object) {
-				return createExpressionAdapter();
-			}
-			@Override
-			public <T> Adapter caseArithmeticExpression(ArithmeticExpression<T> object) {
-				return createArithmeticExpressionAdapter();
-			}
-			@Override
-			public Adapter caseBooleanExpression(BooleanExpression object) {
-				return createBooleanExpressionAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator <em>Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.Operator
-	 * @generated
-	 */
-	public Adapter createOperatorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.DualOperator <em>Dual Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.DualOperator
-	 * @generated
-	 */
-	public Adapter createDualOperatorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOp <em>Arithmetic Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOp
-	 * @generated
-	 */
-	public Adapter createArithmeticOpAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp <em>Comparison Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp
-	 * @generated
-	 */
-	public Adapter createComparisonOpAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.LocationOp <em>Location Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.LocationOp
-	 * @generated
-	 */
-	public Adapter createLocationOpAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection <em>Optimization Direction</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.OptimizationDirection
-	 * @generated
-	 */
-	public Adapter createOptimizationDirectionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.QuantifierOp <em>Quantifier Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.QuantifierOp
-	 * @generated
-	 */
-	public Adapter createQuantifierOpAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.SummationOp <em>Summation Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.SummationOp
-	 * @generated
-	 */
-	public Adapter createSummationOpAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.Expression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.Expression
-	 * @generated
-	 */
-	public Adapter createExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression <em>Arithmetic Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression
-	 * @generated
-	 */
-	public Adapter createArithmeticExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression <em>Boolean Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression
-	 * @generated
-	 */
-	public Adapter createBooleanExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //OperatorsAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/util/OperatorsSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/util/OperatorsSwitch.java
deleted file mode 100644
index f425ac9b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/operators/util/OperatorsSwitch.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.operators.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage
- * @generated
- */
-public class OperatorsSwitch<T1> extends Switch<T1> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static OperatorsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OperatorsSwitch() {
-		if (modelPackage == null) {
-			modelPackage = OperatorsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T1 doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case OperatorsPackage.OPERATOR: {
-				Operator<?, ?> operator = (Operator<?, ?>)theEObject;
-				T1 result = caseOperator(operator);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case OperatorsPackage.DUAL_OPERATOR: {
-				DualOperator<?, ?, ?> dualOperator = (DualOperator<?, ?, ?>)theEObject;
-				T1 result = caseDualOperator(dualOperator);
-				if (result == null) result = caseOperator(dualOperator);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case OperatorsPackage.ARITHMETIC_OP: {
-				ArithmeticOp<?, ?, ?> arithmeticOp = (ArithmeticOp<?, ?, ?>)theEObject;
-				T1 result = caseArithmeticOp(arithmeticOp);
-				if (result == null) result = caseDualOperator(arithmeticOp);
-				if (result == null) result = caseArithmeticExpression(arithmeticOp);
-				if (result == null) result = caseOperator(arithmeticOp);
-				if (result == null) result = caseExpression(arithmeticOp);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case OperatorsPackage.COMPARISON_OP: {
-				ComparisonOp<?, ?, ?> comparisonOp = (ComparisonOp<?, ?, ?>)theEObject;
-				T1 result = caseComparisonOp(comparisonOp);
-				if (result == null) result = caseDualOperator(comparisonOp);
-				if (result == null) result = caseBooleanExpression(comparisonOp);
-				if (result == null) result = caseOperator(comparisonOp);
-				if (result == null) result = caseExpression(comparisonOp);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case OperatorsPackage.LOCATION_OP: {
-				LocationOp<?, ?> locationOp = (LocationOp<?, ?>)theEObject;
-				T1 result = caseLocationOp(locationOp);
-				if (result == null) result = caseDualOperator(locationOp);
-				if (result == null) result = caseBooleanExpression(locationOp);
-				if (result == null) result = caseOperator(locationOp);
-				if (result == null) result = caseExpression(locationOp);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case OperatorsPackage.OPTIMIZATION_DIRECTION: {
-				OptimizationDirection optimizationDirection = (OptimizationDirection)theEObject;
-				T1 result = caseOptimizationDirection(optimizationDirection);
-				if (result == null) result = caseOperator(optimizationDirection);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case OperatorsPackage.QUANTIFIER_OP: {
-				QuantifierOp quantifierOp = (QuantifierOp)theEObject;
-				T1 result = caseQuantifierOp(quantifierOp);
-				if (result == null) result = caseOperator(quantifierOp);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case OperatorsPackage.SUMMATION_OP: {
-				SummationOp<?> summationOp = (SummationOp<?>)theEObject;
-				T1 result = caseSummationOp(summationOp);
-				if (result == null) result = caseOperator(summationOp);
-				if (result == null) result = caseArithmeticExpression(summationOp);
-				if (result == null) result = caseExpression(summationOp);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Operator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Operator</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <OP, RHT> T1 caseOperator(Operator<OP, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dual Operator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Dual Operator</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <LHT, OP, RHT> T1 caseDualOperator(DualOperator<LHT, OP, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Arithmetic Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Arithmetic Op</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T, LHE extends ArithmeticExpression<T>, RHE extends ArithmeticExpression<T>> T1 caseArithmeticOp(ArithmeticOp<T, LHE, RHE> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Comparison Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Comparison Op</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> T1 caseComparisonOp(ComparisonOp<T, LHT, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Location Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Location Op</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <LHT extends IModelElement, RHT extends IModelElement> T1 caseLocationOp(LocationOp<LHT, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Optimization Direction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Optimization Direction</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseOptimizationDirection(OptimizationDirection object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Quantifier Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Quantifier Op</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseQuantifierOp(QuantifierOp object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Summation Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Summation Op</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseSummationOp(SummationOp<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseExpression(Expression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseArithmeticExpression(ArithmeticExpression<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Boolean Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Boolean Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseBooleanExpression(BooleanExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T1 defaultCase(EObject object) {
-		return null;
-	}
-
-} //OperatorsSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/ElementProperty.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/ElementProperty.java
deleted file mode 100644
index edecf53a..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/ElementProperty.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns;
-
-import java.util.function.Function;
-
-import org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element Property</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty#getModelElement <em>Model Element</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty#getPropertyGetter <em>Property Getter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage#getElementProperty()
- * @model
- * @generated
- */
-public interface ElementProperty<ME extends IModelElement, T> extends ArithmeticVariable<T> {
-	/**
-	 * Returns the value of the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Model Element</em>' reference.
-	 * @see #setModelElement(IModelElement)
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage#getElementProperty_ModelElement()
-	 * @model required="true"
-	 * @generated
-	 */
-	ME getModelElement();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty#getModelElement <em>Model Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Model Element</em>' reference.
-	 * @see #getModelElement()
-	 * @generated
-	 */
-	void setModelElement(ME value);
-
-	/**
-	 * Returns the value of the '<em><b>Property Getter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Property Getter</em>' attribute.
-	 * @see #setPropertyGetter(Function)
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage#getElementProperty_PropertyGetter()
-	 * @model dataType="org.fortiss.af3.exploration.dsl.model.patterns.Function<ME, T>" required="true"
-	 * @generated
-	 */
-	Function<ME, T> getPropertyGetter();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty#getPropertyGetter <em>Property Getter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Property Getter</em>' attribute.
-	 * @see #getPropertyGetter()
-	 * @generated
-	 */
-	void setPropertyGetter(Function<ME, T> value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 * @generated
-	 */
-	T getProperty();
-
-} // ElementProperty
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/LocationPattern.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/LocationPattern.java
deleted file mode 100644
index d5c9c0a6..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/LocationPattern.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.LocationOp;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Location Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage#getLocationPattern()
- * @model
- * @generated
- */
-public interface LocationPattern<LHT extends IModelElement, RHT extends IModelElement> extends ConstraintExpression<LocationOp<LHT, RHT>> {
-} // LocationPattern
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/LocationProperty.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/LocationProperty.java
deleted file mode 100644
index 9b994092..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/LocationProperty.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns;
-
-import org.fortiss.af3.exploration.dsl.model.operators.LocationOp;
-
-import org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Location Property</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.patterns.LocationProperty#getLocOp <em>Loc Op</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage#getLocationProperty()
- * @model
- * @generated
- */
-public interface LocationProperty<LA extends IModelElement, RA extends IModelElement, T> extends ArithmeticVariable<T> {
-	/**
-	 * Returns the value of the '<em><b>Loc Op</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Loc Op</em>' containment reference.
-	 * @see #setLocOp(LocationOp)
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage#getLocationProperty_LocOp()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	LocationOp<LA, RA> getLocOp();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.patterns.LocationProperty#getLocOp <em>Loc Op</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Loc Op</em>' containment reference.
-	 * @see #getLocOp()
-	 * @generated
-	 */
-	void setLocOp(LocationOp<LA, RA> value);
-
-} // LocationProperty
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/PatternsFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/PatternsFactory.java
deleted file mode 100644
index 476dcd7d..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/PatternsFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns;
-
-import org.eclipse.emf.ecore.EFactory;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage
- * @generated
- */
-public interface PatternsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	PatternsFactory eINSTANCE = org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Location Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Location Pattern</em>'.
-	 * @generated
-	 */
-	<LHT extends IModelElement, RHT extends IModelElement> LocationPattern<LHT, RHT> createLocationPattern();
-
-	/**
-	 * Returns a new object of class '<em>Element Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Element Property</em>'.
-	 * @generated
-	 */
-	<ME extends IModelElement, T> ElementProperty<ME, T> createElementProperty();
-
-	/**
-	 * Returns a new object of class '<em>Location Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Location Property</em>'.
-	 * @generated
-	 */
-	<LA extends IModelElement, RA extends IModelElement, T> LocationProperty<LA, RA, T> createLocationProperty();
-
-	/**
-	 * Returns a new object of class '<em>Value Comparison</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Value Comparison</em>'.
-	 * @generated
-	 */
-	<T, AE extends ArithmeticExpression<T>> ValueComparison<T, AE> createValueComparison();
-
-	/**
-	 * Returns a new object of class '<em>Single Prop Value Comparison</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Single Prop Value Comparison</em>'.
-	 * @generated
-	 */
-	<T, ME extends IModelElement> SinglePropValueComparison<T, ME> createSinglePropValueComparison();
-
-	/**
-	 * Returns a new object of class '<em>Two Property Value Comparison</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Two Property Value Comparison</em>'.
-	 * @generated
-	 */
-	<T, LME extends IModelElement, RME extends IModelElement> TwoPropertyValueComparison<T, LME, RME> createTwoPropertyValueComparison();
-
-	/**
-	 * Returns a new object of class '<em>Two Prop Calc Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Two Prop Calc Expression</em>'.
-	 * @generated
-	 */
-	<T, LME extends IModelElement, RME extends IModelElement> TwoPropCalcExpression<T, LME, RME> createTwoPropCalcExpression();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	PatternsPackage getPatternsPackage();
-
-} //PatternsFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/PatternsPackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/PatternsPackage.java
deleted file mode 100644
index 62a55b97..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/PatternsPackage.java
+++ /dev/null
@@ -1,631 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsFactory
- * @model kind="package"
- * @generated
- */
-public interface PatternsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "patterns";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/patterns";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-patterns";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	PatternsPackage eINSTANCE = org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.LocationPatternImpl <em>Location Pattern</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.LocationPatternImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getLocationPattern()
-	 * @generated
-	 */
-	int LOCATION_PATTERN = 0;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_PATTERN__PREFIX = ExpressionsPackage.CONSTRAINT_EXPRESSION__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Predicate</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_PATTERN__PREDICATE = ExpressionsPackage.CONSTRAINT_EXPRESSION__PREDICATE;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_PATTERN__EXPRESSION = ExpressionsPackage.CONSTRAINT_EXPRESSION__EXPRESSION;
-
-	/**
-	 * The number of structural features of the '<em>Location Pattern</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_PATTERN_FEATURE_COUNT = ExpressionsPackage.CONSTRAINT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.ElementPropertyImpl <em>Element Property</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.ElementPropertyImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getElementProperty()
-	 * @generated
-	 */
-	int ELEMENT_PROPERTY = 1;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_PROPERTY__VALUE = TypesPackage.ARITHMETIC_VARIABLE__VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_PROPERTY__MODEL_ELEMENT = TypesPackage.ARITHMETIC_VARIABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Property Getter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_PROPERTY__PROPERTY_GETTER = TypesPackage.ARITHMETIC_VARIABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Element Property</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_PROPERTY_FEATURE_COUNT = TypesPackage.ARITHMETIC_VARIABLE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.LocationPropertyImpl <em>Location Property</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.LocationPropertyImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getLocationProperty()
-	 * @generated
-	 */
-	int LOCATION_PROPERTY = 2;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_PROPERTY__VALUE = TypesPackage.ARITHMETIC_VARIABLE__VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Loc Op</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_PROPERTY__LOC_OP = TypesPackage.ARITHMETIC_VARIABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Location Property</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_PROPERTY_FEATURE_COUNT = TypesPackage.ARITHMETIC_VARIABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.ValueComparisonImpl <em>Value Comparison</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.ValueComparisonImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getValueComparison()
-	 * @generated
-	 */
-	int VALUE_COMPARISON = 3;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE_COMPARISON__OPERATOR = OperatorsPackage.COMPARISON_OP__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE_COMPARISON__RIGHT = OperatorsPackage.COMPARISON_OP__RIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE_COMPARISON__LEFT = OperatorsPackage.COMPARISON_OP__LEFT;
-
-	/**
-	 * The number of structural features of the '<em>Value Comparison</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE_COMPARISON_FEATURE_COUNT = OperatorsPackage.COMPARISON_OP_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.SinglePropValueComparisonImpl <em>Single Prop Value Comparison</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.SinglePropValueComparisonImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getSinglePropValueComparison()
-	 * @generated
-	 */
-	int SINGLE_PROP_VALUE_COMPARISON = 4;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SINGLE_PROP_VALUE_COMPARISON__OPERATOR = VALUE_COMPARISON__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SINGLE_PROP_VALUE_COMPARISON__RIGHT = VALUE_COMPARISON__RIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SINGLE_PROP_VALUE_COMPARISON__LEFT = VALUE_COMPARISON__LEFT;
-
-	/**
-	 * The number of structural features of the '<em>Single Prop Value Comparison</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SINGLE_PROP_VALUE_COMPARISON_FEATURE_COUNT = VALUE_COMPARISON_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.TwoPropertyValueComparisonImpl <em>Two Property Value Comparison</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.TwoPropertyValueComparisonImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getTwoPropertyValueComparison()
-	 * @generated
-	 */
-	int TWO_PROPERTY_VALUE_COMPARISON = 5;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TWO_PROPERTY_VALUE_COMPARISON__OPERATOR = VALUE_COMPARISON__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TWO_PROPERTY_VALUE_COMPARISON__RIGHT = VALUE_COMPARISON__RIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TWO_PROPERTY_VALUE_COMPARISON__LEFT = VALUE_COMPARISON__LEFT;
-
-	/**
-	 * The number of structural features of the '<em>Two Property Value Comparison</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TWO_PROPERTY_VALUE_COMPARISON_FEATURE_COUNT = VALUE_COMPARISON_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.TwoPropCalcExpressionImpl <em>Two Prop Calc Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.TwoPropCalcExpressionImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getTwoPropCalcExpression()
-	 * @generated
-	 */
-	int TWO_PROP_CALC_EXPRESSION = 6;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TWO_PROP_CALC_EXPRESSION__OPERATOR = OperatorsPackage.ARITHMETIC_OP__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TWO_PROP_CALC_EXPRESSION__RIGHT = OperatorsPackage.ARITHMETIC_OP__RIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TWO_PROP_CALC_EXPRESSION__LEFT = OperatorsPackage.ARITHMETIC_OP__LEFT;
-
-	/**
-	 * The number of structural features of the '<em>Two Prop Calc Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TWO_PROP_CALC_EXPRESSION_FEATURE_COUNT = OperatorsPackage.ARITHMETIC_OP_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '<em>Function</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.util.function.Function
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getFunction()
-	 * @generated
-	 */
-	int FUNCTION = 7;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.patterns.LocationPattern <em>Location Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Location Pattern</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.LocationPattern
-	 * @generated
-	 */
-	EClass getLocationPattern();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty <em>Element Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Element Property</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty
-	 * @generated
-	 */
-	EClass getElementProperty();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty#getModelElement <em>Model Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Model Element</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty#getModelElement()
-	 * @see #getElementProperty()
-	 * @generated
-	 */
-	EReference getElementProperty_ModelElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty#getPropertyGetter <em>Property Getter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Property Getter</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty#getPropertyGetter()
-	 * @see #getElementProperty()
-	 * @generated
-	 */
-	EAttribute getElementProperty_PropertyGetter();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.patterns.LocationProperty <em>Location Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Location Property</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.LocationProperty
-	 * @generated
-	 */
-	EClass getLocationProperty();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.fortiss.af3.exploration.dsl.model.patterns.LocationProperty#getLocOp <em>Loc Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Loc Op</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.LocationProperty#getLocOp()
-	 * @see #getLocationProperty()
-	 * @generated
-	 */
-	EReference getLocationProperty_LocOp();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.patterns.ValueComparison <em>Value Comparison</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Value Comparison</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.ValueComparison
-	 * @generated
-	 */
-	EClass getValueComparison();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.patterns.SinglePropValueComparison <em>Single Prop Value Comparison</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Single Prop Value Comparison</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.SinglePropValueComparison
-	 * @generated
-	 */
-	EClass getSinglePropValueComparison();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.patterns.TwoPropertyValueComparison <em>Two Property Value Comparison</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Two Property Value Comparison</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.TwoPropertyValueComparison
-	 * @generated
-	 */
-	EClass getTwoPropertyValueComparison();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.patterns.TwoPropCalcExpression <em>Two Prop Calc Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Two Prop Calc Expression</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.TwoPropCalcExpression
-	 * @generated
-	 */
-	EClass getTwoPropCalcExpression();
-
-	/**
-	 * Returns the meta object for data type '{@link java.util.function.Function <em>Function</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Function</em>'.
-	 * @see java.util.function.Function
-	 * @model instanceClass="java.util.function.Function" typeParameters="T R"
-	 * @generated
-	 */
-	EDataType getFunction();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	PatternsFactory getPatternsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.LocationPatternImpl <em>Location Pattern</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.LocationPatternImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getLocationPattern()
-		 * @generated
-		 */
-		EClass LOCATION_PATTERN = eINSTANCE.getLocationPattern();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.ElementPropertyImpl <em>Element Property</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.ElementPropertyImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getElementProperty()
-		 * @generated
-		 */
-		EClass ELEMENT_PROPERTY = eINSTANCE.getElementProperty();
-
-		/**
-		 * The meta object literal for the '<em><b>Model Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ELEMENT_PROPERTY__MODEL_ELEMENT = eINSTANCE.getElementProperty_ModelElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Property Getter</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ELEMENT_PROPERTY__PROPERTY_GETTER = eINSTANCE.getElementProperty_PropertyGetter();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.LocationPropertyImpl <em>Location Property</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.LocationPropertyImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getLocationProperty()
-		 * @generated
-		 */
-		EClass LOCATION_PROPERTY = eINSTANCE.getLocationProperty();
-
-		/**
-		 * The meta object literal for the '<em><b>Loc Op</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOCATION_PROPERTY__LOC_OP = eINSTANCE.getLocationProperty_LocOp();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.ValueComparisonImpl <em>Value Comparison</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.ValueComparisonImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getValueComparison()
-		 * @generated
-		 */
-		EClass VALUE_COMPARISON = eINSTANCE.getValueComparison();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.SinglePropValueComparisonImpl <em>Single Prop Value Comparison</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.SinglePropValueComparisonImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getSinglePropValueComparison()
-		 * @generated
-		 */
-		EClass SINGLE_PROP_VALUE_COMPARISON = eINSTANCE.getSinglePropValueComparison();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.TwoPropertyValueComparisonImpl <em>Two Property Value Comparison</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.TwoPropertyValueComparisonImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getTwoPropertyValueComparison()
-		 * @generated
-		 */
-		EClass TWO_PROPERTY_VALUE_COMPARISON = eINSTANCE.getTwoPropertyValueComparison();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.TwoPropCalcExpressionImpl <em>Two Prop Calc Expression</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.TwoPropCalcExpressionImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getTwoPropCalcExpression()
-		 * @generated
-		 */
-		EClass TWO_PROP_CALC_EXPRESSION = eINSTANCE.getTwoPropCalcExpression();
-
-		/**
-		 * The meta object literal for the '<em>Function</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.util.function.Function
-		 * @see org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl#getFunction()
-		 * @generated
-		 */
-		EDataType FUNCTION = eINSTANCE.getFunction();
-
-	}
-
-} //PatternsPackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/SinglePropValueComparison.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/SinglePropValueComparison.java
deleted file mode 100644
index abe9e3e0..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/SinglePropValueComparison.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Single Prop Value Comparison</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage#getSinglePropValueComparison()
- * @model
- * @generated
- */
-public interface SinglePropValueComparison<T, ME extends IModelElement> extends ValueComparison<T, ElementProperty<ME, T>> {
-} // SinglePropValueComparison
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/TwoPropCalcExpression.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/TwoPropCalcExpression.java
deleted file mode 100644
index 34bf80b5..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/TwoPropCalcExpression.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOp;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Two Prop Calc Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage#getTwoPropCalcExpression()
- * @model
- * @generated
- */
-public interface TwoPropCalcExpression<T, LME extends IModelElement, RME extends IModelElement> extends ArithmeticOp<T, ElementProperty<LME, T>, ElementProperty<RME, T>> {
-} // TwoPropCalcExpression
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/TwoPropertyValueComparison.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/TwoPropertyValueComparison.java
deleted file mode 100644
index 3ab4d5e4..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/TwoPropertyValueComparison.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Two Property Value Comparison</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage#getTwoPropertyValueComparison()
- * @model
- * @generated
- */
-public interface TwoPropertyValueComparison<T, LME extends IModelElement, RME extends IModelElement> extends ValueComparison<T, TwoPropCalcExpression<T, LME, RME>> {
-} // TwoPropertyValueComparison
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/ValueComparison.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/ValueComparison.java
deleted file mode 100644
index eaf75012..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/ValueComparison.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp;
-
-import org.fortiss.af3.exploration.dsl.model.types.NumberLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Value Comparison</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage#getValueComparison()
- * @model
- * @generated
- */
-public interface ValueComparison<T, AE extends ArithmeticExpression<T>> extends ComparisonOp<T, AE, NumberLiteral<T>> {
-} // ValueComparison
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/ElementPropertyImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/ElementPropertyImpl.java
deleted file mode 100644
index 1769cf2d..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/ElementPropertyImpl.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns.impl;
-
-import java.util.function.Function;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty;
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.types.impl.ArithmeticVariableImpl;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element Property</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.ElementPropertyImpl#getModelElement <em>Model Element</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.ElementPropertyImpl#getPropertyGetter <em>Property Getter</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ElementPropertyImpl<ME extends IModelElement, T> extends ArithmeticVariableImpl<T> implements ElementProperty<ME, T> {
-	/**
-	 * The cached value of the '{@link #getModelElement() <em>Model Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getModelElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected ME modelElement;
-
-	/**
-	 * The cached value of the '{@link #getPropertyGetter() <em>Property Getter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPropertyGetter()
-	 * @generated
-	 * @ordered
-	 */
-	protected Function<ME, T> propertyGetter;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ElementPropertyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PatternsPackage.Literals.ELEMENT_PROPERTY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public ME getModelElement() {
-		if (modelElement != null && modelElement.eIsProxy()) {
-			InternalEObject oldModelElement = (InternalEObject)modelElement;
-			modelElement = (ME)eResolveProxy(oldModelElement);
-			if (modelElement != oldModelElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PatternsPackage.ELEMENT_PROPERTY__MODEL_ELEMENT, oldModelElement, modelElement));
-			}
-		}
-		return modelElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ME basicGetModelElement() {
-		return modelElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setModelElement(ME newModelElement) {
-		ME oldModelElement = modelElement;
-		modelElement = newModelElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PatternsPackage.ELEMENT_PROPERTY__MODEL_ELEMENT, oldModelElement, modelElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Function<ME, T> getPropertyGetter() {
-		return propertyGetter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPropertyGetter(Function<ME, T> newPropertyGetter) {
-		Function<ME, T> oldPropertyGetter = propertyGetter;
-		propertyGetter = newPropertyGetter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PatternsPackage.ELEMENT_PROPERTY__PROPERTY_GETTER, oldPropertyGetter, propertyGetter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public T getProperty() {
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PatternsPackage.ELEMENT_PROPERTY__MODEL_ELEMENT:
-				if (resolve) return getModelElement();
-				return basicGetModelElement();
-			case PatternsPackage.ELEMENT_PROPERTY__PROPERTY_GETTER:
-				return getPropertyGetter();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PatternsPackage.ELEMENT_PROPERTY__MODEL_ELEMENT:
-				setModelElement((ME)newValue);
-				return;
-			case PatternsPackage.ELEMENT_PROPERTY__PROPERTY_GETTER:
-				setPropertyGetter((Function<ME, T>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PatternsPackage.ELEMENT_PROPERTY__MODEL_ELEMENT:
-				setModelElement((ME)null);
-				return;
-			case PatternsPackage.ELEMENT_PROPERTY__PROPERTY_GETTER:
-				setPropertyGetter((Function<ME, T>)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PatternsPackage.ELEMENT_PROPERTY__MODEL_ELEMENT:
-				return modelElement != null;
-			case PatternsPackage.ELEMENT_PROPERTY__PROPERTY_GETTER:
-				return propertyGetter != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (propertyGetter: ");
-		result.append(propertyGetter);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ElementPropertyImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/LocationPatternImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/LocationPatternImpl.java
deleted file mode 100644
index ef1216eb..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/LocationPatternImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns.impl;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.impl.ConstraintExpressionImpl;
-
-import org.fortiss.af3.exploration.dsl.model.operators.LocationOp;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.LocationPattern;
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Location Pattern</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class LocationPatternImpl<LHT extends IModelElement, RHT extends IModelElement> extends ConstraintExpressionImpl<LocationOp<LHT, RHT>> implements LocationPattern<LHT, RHT> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocationPatternImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PatternsPackage.Literals.LOCATION_PATTERN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public NotificationChain basicSetExpression(LocationOp<LHT, RHT> newExpression, NotificationChain msgs) {
-		return super.basicSetExpression(newExpression, msgs);
-	}
-
-} //LocationPatternImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/LocationPropertyImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/LocationPropertyImpl.java
deleted file mode 100644
index d21d648e..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/LocationPropertyImpl.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.fortiss.af3.exploration.dsl.model.operators.LocationOp;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.LocationProperty;
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.types.impl.ArithmeticVariableImpl;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Location Property</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.patterns.impl.LocationPropertyImpl#getLocOp <em>Loc Op</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LocationPropertyImpl<LA extends IModelElement, RA extends IModelElement, T> extends ArithmeticVariableImpl<T> implements LocationProperty<LA, RA, T> {
-	/**
-	 * The cached value of the '{@link #getLocOp() <em>Loc Op</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocOp()
-	 * @generated
-	 * @ordered
-	 */
-	protected LocationOp<LA, RA> locOp;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocationPropertyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PatternsPackage.Literals.LOCATION_PROPERTY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public LocationOp<LA, RA> getLocOp() {
-		if (locOp != null && locOp.eIsProxy()) {
-			InternalEObject oldLocOp = (InternalEObject)locOp;
-			locOp = (LocationOp<LA, RA>)eResolveProxy(oldLocOp);
-			if (locOp != oldLocOp) {
-				InternalEObject newLocOp = (InternalEObject)locOp;
-				NotificationChain msgs = oldLocOp.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PatternsPackage.LOCATION_PROPERTY__LOC_OP, null, null);
-				if (newLocOp.eInternalContainer() == null) {
-					msgs = newLocOp.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PatternsPackage.LOCATION_PROPERTY__LOC_OP, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PatternsPackage.LOCATION_PROPERTY__LOC_OP, oldLocOp, locOp));
-			}
-		}
-		return locOp;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocationOp<LA, RA> basicGetLocOp() {
-		return locOp;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLocOp(LocationOp<LA, RA> newLocOp, NotificationChain msgs) {
-		LocationOp<LA, RA> oldLocOp = locOp;
-		locOp = newLocOp;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PatternsPackage.LOCATION_PROPERTY__LOC_OP, oldLocOp, newLocOp);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocOp(LocationOp<LA, RA> newLocOp) {
-		if (newLocOp != locOp) {
-			NotificationChain msgs = null;
-			if (locOp != null)
-				msgs = ((InternalEObject)locOp).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PatternsPackage.LOCATION_PROPERTY__LOC_OP, null, msgs);
-			if (newLocOp != null)
-				msgs = ((InternalEObject)newLocOp).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PatternsPackage.LOCATION_PROPERTY__LOC_OP, null, msgs);
-			msgs = basicSetLocOp(newLocOp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PatternsPackage.LOCATION_PROPERTY__LOC_OP, newLocOp, newLocOp));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case PatternsPackage.LOCATION_PROPERTY__LOC_OP:
-				return basicSetLocOp(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PatternsPackage.LOCATION_PROPERTY__LOC_OP:
-				if (resolve) return getLocOp();
-				return basicGetLocOp();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PatternsPackage.LOCATION_PROPERTY__LOC_OP:
-				setLocOp((LocationOp<LA, RA>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PatternsPackage.LOCATION_PROPERTY__LOC_OP:
-				setLocOp((LocationOp<LA, RA>)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PatternsPackage.LOCATION_PROPERTY__LOC_OP:
-				return locOp != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //LocationPropertyImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/PatternsFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/PatternsFactoryImpl.java
deleted file mode 100644
index 24116242..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/PatternsFactoryImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns.impl;
-
-import java.util.function.Function;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PatternsFactoryImpl extends EFactoryImpl implements PatternsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PatternsFactory init() {
-		try {
-			PatternsFactory thePatternsFactory = (PatternsFactory)EPackage.Registry.INSTANCE.getEFactory(PatternsPackage.eNS_URI);
-			if (thePatternsFactory != null) {
-				return thePatternsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new PatternsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PatternsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case PatternsPackage.LOCATION_PATTERN: return createLocationPattern();
-			case PatternsPackage.ELEMENT_PROPERTY: return createElementProperty();
-			case PatternsPackage.LOCATION_PROPERTY: return createLocationProperty();
-			case PatternsPackage.VALUE_COMPARISON: return createValueComparison();
-			case PatternsPackage.SINGLE_PROP_VALUE_COMPARISON: return createSinglePropValueComparison();
-			case PatternsPackage.TWO_PROPERTY_VALUE_COMPARISON: return createTwoPropertyValueComparison();
-			case PatternsPackage.TWO_PROP_CALC_EXPRESSION: return createTwoPropCalcExpression();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case PatternsPackage.FUNCTION:
-				return createFunctionFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case PatternsPackage.FUNCTION:
-				return convertFunctionToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <LHT extends IModelElement, RHT extends IModelElement> LocationPattern<LHT, RHT> createLocationPattern() {
-		LocationPatternImpl<LHT, RHT> locationPattern = new LocationPatternImpl<LHT, RHT>();
-		return locationPattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <ME extends IModelElement, T> ElementProperty<ME, T> createElementProperty() {
-		ElementPropertyImpl<ME, T> elementProperty = new ElementPropertyImpl<ME, T>();
-		return elementProperty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <LA extends IModelElement, RA extends IModelElement, T> LocationProperty<LA, RA, T> createLocationProperty() {
-		LocationPropertyImpl<LA, RA, T> locationProperty = new LocationPropertyImpl<LA, RA, T>();
-		return locationProperty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T, AE extends ArithmeticExpression<T>> ValueComparison<T, AE> createValueComparison() {
-		ValueComparisonImpl<T, AE> valueComparison = new ValueComparisonImpl<T, AE>();
-		return valueComparison;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T, ME extends IModelElement> SinglePropValueComparison<T, ME> createSinglePropValueComparison() {
-		SinglePropValueComparisonImpl<T, ME> singlePropValueComparison = new SinglePropValueComparisonImpl<T, ME>();
-		return singlePropValueComparison;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T, LME extends IModelElement, RME extends IModelElement> TwoPropertyValueComparison<T, LME, RME> createTwoPropertyValueComparison() {
-		TwoPropertyValueComparisonImpl<T, LME, RME> twoPropertyValueComparison = new TwoPropertyValueComparisonImpl<T, LME, RME>();
-		return twoPropertyValueComparison;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T, LME extends IModelElement, RME extends IModelElement> TwoPropCalcExpression<T, LME, RME> createTwoPropCalcExpression() {
-		TwoPropCalcExpressionImpl<T, LME, RME> twoPropCalcExpression = new TwoPropCalcExpressionImpl<T, LME, RME>();
-		return twoPropCalcExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Function<?, ?> createFunctionFromString(EDataType eDataType, String initialValue) {
-		return (Function<?, ?>)super.createFromString(initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertFunctionToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PatternsPackage getPatternsPackage() {
-		return (PatternsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static PatternsPackage getPackage() {
-		return PatternsPackage.eINSTANCE;
-	}
-
-} //PatternsFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/PatternsPackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/PatternsPackageImpl.java
deleted file mode 100644
index ce85f7a0..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/PatternsPackageImpl.java
+++ /dev/null
@@ -1,523 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns.impl;
-
-import java.util.function.Function;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.ETypeParameter;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.impl.ModelPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty;
-import org.fortiss.af3.exploration.dsl.model.patterns.LocationPattern;
-import org.fortiss.af3.exploration.dsl.model.patterns.LocationProperty;
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsFactory;
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-import org.fortiss.af3.exploration.dsl.model.patterns.SinglePropValueComparison;
-import org.fortiss.af3.exploration.dsl.model.patterns.TwoPropCalcExpression;
-import org.fortiss.af3.exploration.dsl.model.patterns.TwoPropertyValueComparison;
-import org.fortiss.af3.exploration.dsl.model.patterns.ValueComparison;
-
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-import org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl;
-
-import org.fortiss.tooling.base.model.base.BasePackage;
-
-import org.fortiss.tooling.base.model.element.ElementPackage;
-
-import org.fortiss.tooling.base.model.layout.LayoutPackage;
-
-import org.fortiss.tooling.base.model.visualization.VisualizationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PatternsPackageImpl extends EPackageImpl implements PatternsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass locationPatternEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass elementPropertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass locationPropertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass valueComparisonEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass singlePropValueComparisonEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass twoPropertyValueComparisonEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass twoPropCalcExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType functionEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private PatternsPackageImpl() {
-		super(eNS_URI, PatternsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link PatternsPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static PatternsPackage init() {
-		if (isInited) return (PatternsPackage)EPackage.Registry.INSTANCE.getEPackage(PatternsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		PatternsPackageImpl thePatternsPackage = (PatternsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PatternsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PatternsPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ElementPackage.eINSTANCE.eClass();
-		LayoutPackage.eINSTANCE.eClass();
-		BasePackage.eINSTANCE.eClass();
-		VisualizationPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ModelPackageImpl theModelPackage = (ModelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI) : ModelPackage.eINSTANCE);
-		OperatorsPackageImpl theOperatorsPackage = (OperatorsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI) instanceof OperatorsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI) : OperatorsPackage.eINSTANCE);
-		ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI) instanceof ExpressionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI) : ExpressionsPackage.eINSTANCE);
-		TypesPackageImpl theTypesPackage = (TypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI) instanceof TypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI) : TypesPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		thePatternsPackage.createPackageContents();
-		theModelPackage.createPackageContents();
-		theOperatorsPackage.createPackageContents();
-		theExpressionsPackage.createPackageContents();
-		theTypesPackage.createPackageContents();
-
-		// Initialize created meta-data
-		thePatternsPackage.initializePackageContents();
-		theModelPackage.initializePackageContents();
-		theOperatorsPackage.initializePackageContents();
-		theExpressionsPackage.initializePackageContents();
-		theTypesPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		thePatternsPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(PatternsPackage.eNS_URI, thePatternsPackage);
-		return thePatternsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocationPattern() {
-		return locationPatternEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getElementProperty() {
-		return elementPropertyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getElementProperty_ModelElement() {
-		return (EReference)elementPropertyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getElementProperty_PropertyGetter() {
-		return (EAttribute)elementPropertyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocationProperty() {
-		return locationPropertyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLocationProperty_LocOp() {
-		return (EReference)locationPropertyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getValueComparison() {
-		return valueComparisonEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSinglePropValueComparison() {
-		return singlePropValueComparisonEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTwoPropertyValueComparison() {
-		return twoPropertyValueComparisonEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTwoPropCalcExpression() {
-		return twoPropCalcExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getFunction() {
-		return functionEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PatternsFactory getPatternsFactory() {
-		return (PatternsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		locationPatternEClass = createEClass(LOCATION_PATTERN);
-
-		elementPropertyEClass = createEClass(ELEMENT_PROPERTY);
-		createEReference(elementPropertyEClass, ELEMENT_PROPERTY__MODEL_ELEMENT);
-		createEAttribute(elementPropertyEClass, ELEMENT_PROPERTY__PROPERTY_GETTER);
-
-		locationPropertyEClass = createEClass(LOCATION_PROPERTY);
-		createEReference(locationPropertyEClass, LOCATION_PROPERTY__LOC_OP);
-
-		valueComparisonEClass = createEClass(VALUE_COMPARISON);
-
-		singlePropValueComparisonEClass = createEClass(SINGLE_PROP_VALUE_COMPARISON);
-
-		twoPropertyValueComparisonEClass = createEClass(TWO_PROPERTY_VALUE_COMPARISON);
-
-		twoPropCalcExpressionEClass = createEClass(TWO_PROP_CALC_EXPRESSION);
-
-		// Create data types
-		functionEDataType = createEDataType(FUNCTION);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ElementPackage theElementPackage = (ElementPackage)EPackage.Registry.INSTANCE.getEPackage(ElementPackage.eNS_URI);
-		ExpressionsPackage theExpressionsPackage = (ExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI);
-		OperatorsPackage theOperatorsPackage = (OperatorsPackage)EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI);
-		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
-
-		// Create type parameters
-		ETypeParameter locationPatternEClass_LHT = addETypeParameter(locationPatternEClass, "LHT");
-		ETypeParameter locationPatternEClass_RHT = addETypeParameter(locationPatternEClass, "RHT");
-		ETypeParameter elementPropertyEClass_ME = addETypeParameter(elementPropertyEClass, "ME");
-		ETypeParameter elementPropertyEClass_T = addETypeParameter(elementPropertyEClass, "T");
-		ETypeParameter locationPropertyEClass_LA = addETypeParameter(locationPropertyEClass, "LA");
-		ETypeParameter locationPropertyEClass_RA = addETypeParameter(locationPropertyEClass, "RA");
-		ETypeParameter locationPropertyEClass_T = addETypeParameter(locationPropertyEClass, "T");
-		ETypeParameter valueComparisonEClass_T = addETypeParameter(valueComparisonEClass, "T");
-		ETypeParameter valueComparisonEClass_AE = addETypeParameter(valueComparisonEClass, "AE");
-		ETypeParameter singlePropValueComparisonEClass_T = addETypeParameter(singlePropValueComparisonEClass, "T");
-		ETypeParameter singlePropValueComparisonEClass_ME = addETypeParameter(singlePropValueComparisonEClass, "ME");
-		ETypeParameter twoPropertyValueComparisonEClass_T = addETypeParameter(twoPropertyValueComparisonEClass, "T");
-		ETypeParameter twoPropertyValueComparisonEClass_LME = addETypeParameter(twoPropertyValueComparisonEClass, "LME");
-		ETypeParameter twoPropertyValueComparisonEClass_RME = addETypeParameter(twoPropertyValueComparisonEClass, "RME");
-		ETypeParameter twoPropCalcExpressionEClass_T = addETypeParameter(twoPropCalcExpressionEClass, "T");
-		ETypeParameter twoPropCalcExpressionEClass_LME = addETypeParameter(twoPropCalcExpressionEClass, "LME");
-		ETypeParameter twoPropCalcExpressionEClass_RME = addETypeParameter(twoPropCalcExpressionEClass, "RME");
-		addETypeParameter(functionEDataType, "T");
-		addETypeParameter(functionEDataType, "R");
-
-		// Set bounds for type parameters
-		EGenericType g1 = createEGenericType(theElementPackage.getIModelElement());
-		locationPatternEClass_LHT.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		locationPatternEClass_RHT.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		elementPropertyEClass_ME.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		locationPropertyEClass_LA.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		locationPropertyEClass_RA.getEBounds().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		EGenericType g2 = createEGenericType(valueComparisonEClass_T);
-		g1.getETypeArguments().add(g2);
-		valueComparisonEClass_AE.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		singlePropValueComparisonEClass_ME.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		twoPropertyValueComparisonEClass_LME.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		twoPropertyValueComparisonEClass_RME.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		twoPropCalcExpressionEClass_LME.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		twoPropCalcExpressionEClass_RME.getEBounds().add(g1);
-
-		// Add supertypes to classes
-		g1 = createEGenericType(theExpressionsPackage.getConstraintExpression());
-		g2 = createEGenericType(theOperatorsPackage.getLocationOp());
-		g1.getETypeArguments().add(g2);
-		EGenericType g3 = createEGenericType(locationPatternEClass_LHT);
-		g2.getETypeArguments().add(g3);
-		g3 = createEGenericType(locationPatternEClass_RHT);
-		g2.getETypeArguments().add(g3);
-		locationPatternEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theTypesPackage.getArithmeticVariable());
-		g2 = createEGenericType(elementPropertyEClass_T);
-		g1.getETypeArguments().add(g2);
-		elementPropertyEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theTypesPackage.getArithmeticVariable());
-		g2 = createEGenericType(locationPropertyEClass_T);
-		g1.getETypeArguments().add(g2);
-		locationPropertyEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theOperatorsPackage.getComparisonOp());
-		g2 = createEGenericType(valueComparisonEClass_T);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(valueComparisonEClass_AE);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(theTypesPackage.getNumberLiteral());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType(valueComparisonEClass_T);
-		g2.getETypeArguments().add(g3);
-		valueComparisonEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getValueComparison());
-		g2 = createEGenericType(singlePropValueComparisonEClass_T);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(this.getElementProperty());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType(singlePropValueComparisonEClass_ME);
-		g2.getETypeArguments().add(g3);
-		g3 = createEGenericType(singlePropValueComparisonEClass_T);
-		g2.getETypeArguments().add(g3);
-		singlePropValueComparisonEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getValueComparison());
-		g2 = createEGenericType(twoPropertyValueComparisonEClass_T);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(this.getTwoPropCalcExpression());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType(twoPropertyValueComparisonEClass_T);
-		g2.getETypeArguments().add(g3);
-		g3 = createEGenericType(twoPropertyValueComparisonEClass_LME);
-		g2.getETypeArguments().add(g3);
-		g3 = createEGenericType(twoPropertyValueComparisonEClass_RME);
-		g2.getETypeArguments().add(g3);
-		twoPropertyValueComparisonEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theOperatorsPackage.getArithmeticOp());
-		g2 = createEGenericType(twoPropCalcExpressionEClass_T);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(this.getElementProperty());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType(twoPropCalcExpressionEClass_LME);
-		g2.getETypeArguments().add(g3);
-		g3 = createEGenericType(twoPropCalcExpressionEClass_T);
-		g2.getETypeArguments().add(g3);
-		g2 = createEGenericType(this.getElementProperty());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType(twoPropCalcExpressionEClass_RME);
-		g2.getETypeArguments().add(g3);
-		g3 = createEGenericType(twoPropCalcExpressionEClass_T);
-		g2.getETypeArguments().add(g3);
-		twoPropCalcExpressionEClass.getEGenericSuperTypes().add(g1);
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(locationPatternEClass, LocationPattern.class, "LocationPattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(elementPropertyEClass, ElementProperty.class, "ElementProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		g1 = createEGenericType(elementPropertyEClass_ME);
-		initEReference(getElementProperty_ModelElement(), g1, null, "modelElement", null, 1, 1, ElementProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		g1 = createEGenericType(this.getFunction());
-		g2 = createEGenericType(elementPropertyEClass_ME);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(elementPropertyEClass_T);
-		g1.getETypeArguments().add(g2);
-		initEAttribute(getElementProperty_PropertyGetter(), g1, "propertyGetter", null, 1, 1, ElementProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		EOperation op = addEOperation(elementPropertyEClass, null, "getProperty", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(elementPropertyEClass_T);
-		initEOperation(op, g1);
-
-		initEClass(locationPropertyEClass, LocationProperty.class, "LocationProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		g1 = createEGenericType(theOperatorsPackage.getLocationOp());
-		g2 = createEGenericType(locationPropertyEClass_LA);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(locationPropertyEClass_RA);
-		g1.getETypeArguments().add(g2);
-		initEReference(getLocationProperty_LocOp(), g1, null, "locOp", null, 1, 1, LocationProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(valueComparisonEClass, ValueComparison.class, "ValueComparison", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(singlePropValueComparisonEClass, SinglePropValueComparison.class, "SinglePropValueComparison", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(twoPropertyValueComparisonEClass, TwoPropertyValueComparison.class, "TwoPropertyValueComparison", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(twoPropCalcExpressionEClass, TwoPropCalcExpression.class, "TwoPropCalcExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Initialize data types
-		initEDataType(functionEDataType, Function.class, "Function", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-	}
-
-} //PatternsPackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/SinglePropValueComparisonImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/SinglePropValueComparisonImpl.java
deleted file mode 100644
index b211a79d..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/SinglePropValueComparisonImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty;
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-import org.fortiss.af3.exploration.dsl.model.patterns.SinglePropValueComparison;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Single Prop Value Comparison</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class SinglePropValueComparisonImpl<T, ME extends IModelElement> extends ValueComparisonImpl<T, ElementProperty<ME, T>> implements SinglePropValueComparison<T, ME> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SinglePropValueComparisonImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PatternsPackage.Literals.SINGLE_PROP_VALUE_COMPARISON;
-	}
-
-} //SinglePropValueComparisonImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/TwoPropCalcExpressionImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/TwoPropCalcExpressionImpl.java
deleted file mode 100644
index 58dbd8bf..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/TwoPropCalcExpressionImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.operators.impl.ArithmeticOpImpl;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty;
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-import org.fortiss.af3.exploration.dsl.model.patterns.TwoPropCalcExpression;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Two Prop Calc Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class TwoPropCalcExpressionImpl<T, LME extends IModelElement, RME extends IModelElement> extends ArithmeticOpImpl<T, ElementProperty<LME, T>, ElementProperty<RME, T>> implements TwoPropCalcExpression<T, LME, RME> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TwoPropCalcExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PatternsPackage.Literals.TWO_PROP_CALC_EXPRESSION;
-	}
-
-} //TwoPropCalcExpressionImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/TwoPropertyValueComparisonImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/TwoPropertyValueComparisonImpl.java
deleted file mode 100644
index f6d1090b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/TwoPropertyValueComparisonImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-import org.fortiss.af3.exploration.dsl.model.patterns.TwoPropCalcExpression;
-import org.fortiss.af3.exploration.dsl.model.patterns.TwoPropertyValueComparison;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Two Property Value Comparison</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class TwoPropertyValueComparisonImpl<T, LME extends IModelElement, RME extends IModelElement> extends ValueComparisonImpl<T, TwoPropCalcExpression<T, LME, RME>> implements TwoPropertyValueComparison<T, LME, RME> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TwoPropertyValueComparisonImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PatternsPackage.Literals.TWO_PROPERTY_VALUE_COMPARISON;
-	}
-
-} //TwoPropertyValueComparisonImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/ValueComparisonImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/ValueComparisonImpl.java
deleted file mode 100644
index 5d2e776f..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/impl/ValueComparisonImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.impl.ComparisonOpImpl;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-import org.fortiss.af3.exploration.dsl.model.patterns.ValueComparison;
-
-import org.fortiss.af3.exploration.dsl.model.types.NumberLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Value Comparison</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ValueComparisonImpl<T, AE extends ArithmeticExpression<T>> extends ComparisonOpImpl<T, AE, NumberLiteral<T>> implements ValueComparison<T, AE> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ValueComparisonImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PatternsPackage.Literals.VALUE_COMPARISON;
-	}
-
-} //ValueComparisonImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/util/PatternsAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/util/PatternsAdapterFactory.java
deleted file mode 100644
index 4a1f4ab8..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/util/PatternsAdapterFactory.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOp;
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp;
-import org.fortiss.af3.exploration.dsl.model.operators.DualOperator;
-import org.fortiss.af3.exploration.dsl.model.operators.Operator;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.*;
-
-import org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable;
-import org.fortiss.af3.exploration.dsl.model.types.Variable;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage
- * @generated
- */
-public class PatternsAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static PatternsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PatternsAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = PatternsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PatternsSwitch<Adapter> modelSwitch =
-		new PatternsSwitch<Adapter>() {
-			@Override
-			public <LHT extends IModelElement, RHT extends IModelElement> Adapter caseLocationPattern(LocationPattern<LHT, RHT> object) {
-				return createLocationPatternAdapter();
-			}
-			@Override
-			public <ME extends IModelElement, T> Adapter caseElementProperty(ElementProperty<ME, T> object) {
-				return createElementPropertyAdapter();
-			}
-			@Override
-			public <LA extends IModelElement, RA extends IModelElement, T> Adapter caseLocationProperty(LocationProperty<LA, RA, T> object) {
-				return createLocationPropertyAdapter();
-			}
-			@Override
-			public <T, AE extends ArithmeticExpression<T>> Adapter caseValueComparison(ValueComparison<T, AE> object) {
-				return createValueComparisonAdapter();
-			}
-			@Override
-			public <T, ME extends IModelElement> Adapter caseSinglePropValueComparison(SinglePropValueComparison<T, ME> object) {
-				return createSinglePropValueComparisonAdapter();
-			}
-			@Override
-			public <T, LME extends IModelElement, RME extends IModelElement> Adapter caseTwoPropertyValueComparison(TwoPropertyValueComparison<T, LME, RME> object) {
-				return createTwoPropertyValueComparisonAdapter();
-			}
-			@Override
-			public <T, LME extends IModelElement, RME extends IModelElement> Adapter caseTwoPropCalcExpression(TwoPropCalcExpression<T, LME, RME> object) {
-				return createTwoPropCalcExpressionAdapter();
-			}
-			@Override
-			public Adapter caseExpression(Expression object) {
-				return createExpressionAdapter();
-			}
-			@Override
-			public <T extends BooleanExpression> Adapter caseConstraintExpression(ConstraintExpression<T> object) {
-				return createConstraintExpressionAdapter();
-			}
-			@Override
-			public <T> Adapter caseVariable(Variable<T> object) {
-				return createVariableAdapter();
-			}
-			@Override
-			public <T> Adapter caseArithmeticExpression(ArithmeticExpression<T> object) {
-				return createArithmeticExpressionAdapter();
-			}
-			@Override
-			public <T> Adapter caseArithmeticVariable(ArithmeticVariable<T> object) {
-				return createArithmeticVariableAdapter();
-			}
-			@Override
-			public <OP, RHT> Adapter caseOperator(Operator<OP, RHT> object) {
-				return createOperatorAdapter();
-			}
-			@Override
-			public <LHT, OP, RHT> Adapter caseDualOperator(DualOperator<LHT, OP, RHT> object) {
-				return createDualOperatorAdapter();
-			}
-			@Override
-			public Adapter caseBooleanExpression(BooleanExpression object) {
-				return createBooleanExpressionAdapter();
-			}
-			@Override
-			public <T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> Adapter caseComparisonOp(ComparisonOp<T, LHT, RHT> object) {
-				return createComparisonOpAdapter();
-			}
-			@Override
-			public <T, LHE extends ArithmeticExpression<T>, RHE extends ArithmeticExpression<T>> Adapter caseArithmeticOp(ArithmeticOp<T, LHE, RHE> object) {
-				return createArithmeticOpAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.patterns.LocationPattern <em>Location Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.LocationPattern
-	 * @generated
-	 */
-	public Adapter createLocationPatternAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty <em>Element Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty
-	 * @generated
-	 */
-	public Adapter createElementPropertyAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.patterns.LocationProperty <em>Location Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.LocationProperty
-	 * @generated
-	 */
-	public Adapter createLocationPropertyAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.patterns.ValueComparison <em>Value Comparison</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.ValueComparison
-	 * @generated
-	 */
-	public Adapter createValueComparisonAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.patterns.SinglePropValueComparison <em>Single Prop Value Comparison</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.SinglePropValueComparison
-	 * @generated
-	 */
-	public Adapter createSinglePropValueComparisonAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.patterns.TwoPropertyValueComparison <em>Two Property Value Comparison</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.TwoPropertyValueComparison
-	 * @generated
-	 */
-	public Adapter createTwoPropertyValueComparisonAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.patterns.TwoPropCalcExpression <em>Two Prop Calc Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.patterns.TwoPropCalcExpression
-	 * @generated
-	 */
-	public Adapter createTwoPropCalcExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.Expression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.Expression
-	 * @generated
-	 */
-	public Adapter createExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression <em>Constraint Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression
-	 * @generated
-	 */
-	public Adapter createConstraintExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.types.Variable <em>Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.Variable
-	 * @generated
-	 */
-	public Adapter createVariableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression <em>Arithmetic Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression
-	 * @generated
-	 */
-	public Adapter createArithmeticExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable <em>Arithmetic Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable
-	 * @generated
-	 */
-	public Adapter createArithmeticVariableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator <em>Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.Operator
-	 * @generated
-	 */
-	public Adapter createOperatorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.DualOperator <em>Dual Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.DualOperator
-	 * @generated
-	 */
-	public Adapter createDualOperatorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression <em>Boolean Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression
-	 * @generated
-	 */
-	public Adapter createBooleanExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp <em>Comparison Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp
-	 * @generated
-	 */
-	public Adapter createComparisonOpAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOp <em>Arithmetic Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOp
-	 * @generated
-	 */
-	public Adapter createArithmeticOpAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //PatternsAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/util/PatternsSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/util/PatternsSwitch.java
deleted file mode 100644
index b150fb04..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/patterns/util/PatternsSwitch.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.patterns.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ConstraintExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ArithmeticOp;
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp;
-import org.fortiss.af3.exploration.dsl.model.operators.DualOperator;
-import org.fortiss.af3.exploration.dsl.model.operators.Operator;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.*;
-
-import org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable;
-import org.fortiss.af3.exploration.dsl.model.types.Variable;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage
- * @generated
- */
-public class PatternsSwitch<T1> extends Switch<T1> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static PatternsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PatternsSwitch() {
-		if (modelPackage == null) {
-			modelPackage = PatternsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T1 doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case PatternsPackage.LOCATION_PATTERN: {
-				LocationPattern<?, ?> locationPattern = (LocationPattern<?, ?>)theEObject;
-				T1 result = caseLocationPattern(locationPattern);
-				if (result == null) result = caseConstraintExpression(locationPattern);
-				if (result == null) result = caseExpression(locationPattern);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PatternsPackage.ELEMENT_PROPERTY: {
-				ElementProperty<?, ?> elementProperty = (ElementProperty<?, ?>)theEObject;
-				T1 result = caseElementProperty(elementProperty);
-				if (result == null) result = caseArithmeticVariable(elementProperty);
-				if (result == null) result = caseVariable(elementProperty);
-				if (result == null) result = caseArithmeticExpression(elementProperty);
-				if (result == null) result = caseExpression(elementProperty);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PatternsPackage.LOCATION_PROPERTY: {
-				LocationProperty<?, ?, ?> locationProperty = (LocationProperty<?, ?, ?>)theEObject;
-				T1 result = caseLocationProperty(locationProperty);
-				if (result == null) result = caseArithmeticVariable(locationProperty);
-				if (result == null) result = caseVariable(locationProperty);
-				if (result == null) result = caseArithmeticExpression(locationProperty);
-				if (result == null) result = caseExpression(locationProperty);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PatternsPackage.VALUE_COMPARISON: {
-				ValueComparison<?, ?> valueComparison = (ValueComparison<?, ?>)theEObject;
-				T1 result = caseValueComparison(valueComparison);
-				if (result == null) result = caseComparisonOp(valueComparison);
-				if (result == null) result = caseDualOperator(valueComparison);
-				if (result == null) result = caseBooleanExpression(valueComparison);
-				if (result == null) result = caseOperator(valueComparison);
-				if (result == null) result = caseExpression(valueComparison);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PatternsPackage.SINGLE_PROP_VALUE_COMPARISON: {
-				SinglePropValueComparison<?, ?> singlePropValueComparison = (SinglePropValueComparison<?, ?>)theEObject;
-				T1 result = caseSinglePropValueComparison(singlePropValueComparison);
-				if (result == null) result = caseValueComparison(singlePropValueComparison);
-				if (result == null) result = caseComparisonOp(singlePropValueComparison);
-				if (result == null) result = caseDualOperator(singlePropValueComparison);
-				if (result == null) result = caseBooleanExpression(singlePropValueComparison);
-				if (result == null) result = caseOperator(singlePropValueComparison);
-				if (result == null) result = caseExpression(singlePropValueComparison);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PatternsPackage.TWO_PROPERTY_VALUE_COMPARISON: {
-				TwoPropertyValueComparison<?, ?, ?> twoPropertyValueComparison = (TwoPropertyValueComparison<?, ?, ?>)theEObject;
-				T1 result = caseTwoPropertyValueComparison(twoPropertyValueComparison);
-				if (result == null) result = caseValueComparison(twoPropertyValueComparison);
-				if (result == null) result = caseComparisonOp(twoPropertyValueComparison);
-				if (result == null) result = caseDualOperator(twoPropertyValueComparison);
-				if (result == null) result = caseBooleanExpression(twoPropertyValueComparison);
-				if (result == null) result = caseOperator(twoPropertyValueComparison);
-				if (result == null) result = caseExpression(twoPropertyValueComparison);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PatternsPackage.TWO_PROP_CALC_EXPRESSION: {
-				TwoPropCalcExpression<?, ?, ?> twoPropCalcExpression = (TwoPropCalcExpression<?, ?, ?>)theEObject;
-				T1 result = caseTwoPropCalcExpression(twoPropCalcExpression);
-				if (result == null) result = caseArithmeticOp(twoPropCalcExpression);
-				if (result == null) result = caseDualOperator(twoPropCalcExpression);
-				if (result == null) result = caseArithmeticExpression(twoPropCalcExpression);
-				if (result == null) result = caseOperator(twoPropCalcExpression);
-				if (result == null) result = caseExpression(twoPropCalcExpression);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Location Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Location Pattern</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <LHT extends IModelElement, RHT extends IModelElement> T1 caseLocationPattern(LocationPattern<LHT, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Element Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Element Property</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <ME extends IModelElement, T> T1 caseElementProperty(ElementProperty<ME, T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Location Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Location Property</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <LA extends IModelElement, RA extends IModelElement, T> T1 caseLocationProperty(LocationProperty<LA, RA, T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Value Comparison</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Value Comparison</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T, AE extends ArithmeticExpression<T>> T1 caseValueComparison(ValueComparison<T, AE> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Single Prop Value Comparison</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Single Prop Value Comparison</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T, ME extends IModelElement> T1 caseSinglePropValueComparison(SinglePropValueComparison<T, ME> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Two Property Value Comparison</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Two Property Value Comparison</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T, LME extends IModelElement, RME extends IModelElement> T1 caseTwoPropertyValueComparison(TwoPropertyValueComparison<T, LME, RME> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Two Prop Calc Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Two Prop Calc Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T, LME extends IModelElement, RME extends IModelElement> T1 caseTwoPropCalcExpression(TwoPropCalcExpression<T, LME, RME> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseExpression(Expression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Constraint Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Constraint Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T extends BooleanExpression> T1 caseConstraintExpression(ConstraintExpression<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Variable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Variable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseVariable(Variable<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseArithmeticExpression(ArithmeticExpression<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Arithmetic Variable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Arithmetic Variable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseArithmeticVariable(ArithmeticVariable<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Operator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Operator</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <OP, RHT> T1 caseOperator(Operator<OP, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dual Operator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Dual Operator</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <LHT, OP, RHT> T1 caseDualOperator(DualOperator<LHT, OP, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Boolean Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Boolean Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseBooleanExpression(BooleanExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Comparison Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Comparison Op</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> T1 caseComparisonOp(ComparisonOp<T, LHT, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Arithmetic Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Arithmetic Op</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T, LHE extends ArithmeticExpression<T>, RHE extends ArithmeticExpression<T>> T1 caseArithmeticOp(ArithmeticOp<T, LHE, RHE> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T1 defaultCase(EObject object) {
-		return null;
-	}
-
-} //PatternsSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/ArithmeticVariable.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/ArithmeticVariable.java
deleted file mode 100644
index 8440f897..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/ArithmeticVariable.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Arithmetic Variable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage#getArithmeticVariable()
- * @model
- * @generated
- */
-public interface ArithmeticVariable<T> extends Variable<T>, ArithmeticExpression<T> {
-} // ArithmeticVariable
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/IntegerLiteral.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/IntegerLiteral.java
deleted file mode 100644
index 60be44e6..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/IntegerLiteral.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types;
-
-import java.math.BigInteger;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Integer Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage#getIntegerLiteral()
- * @model superTypes="org.fortiss.af3.exploration.dsl.model.types.NumberLiteral<org.eclipse.emf.ecore.EBigInteger>"
- * @generated
- */
-public interface IntegerLiteral extends NumberLiteral<BigInteger> {
-} // IntegerLiteral
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/ModelElementVariable.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/ModelElementVariable.java
deleted file mode 100644
index ed98ff67..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/ModelElementVariable.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Model Element Variable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage#getModelElementVariable()
- * @model
- * @generated
- */
-public interface ModelElementVariable<ME extends IModelElement> extends Variable<ME>, ElementExpression<ME> {
-} // ModelElementVariable
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/NumberLiteral.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/NumberLiteral.java
deleted file mode 100644
index 8980bdfc..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/NumberLiteral.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Number Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.types.NumberLiteral#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage#getNumberLiteral()
- * @model
- * @generated
- */
-public interface NumberLiteral<T> extends ArithmeticExpression<T> {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(Object)
-	 * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage#getNumberLiteral_Value()
-	 * @model required="true"
-	 * @generated
-	 */
-	T getValue();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.types.NumberLiteral#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(T value);
-
-} // NumberLiteral
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/RealLiteral.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/RealLiteral.java
deleted file mode 100644
index f70acd13..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/RealLiteral.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types;
-
-import java.math.BigDecimal;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Real Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage#getRealLiteral()
- * @model superTypes="org.fortiss.af3.exploration.dsl.model.types.NumberLiteral<org.eclipse.emf.ecore.EBigDecimal>"
- * @generated
- */
-public interface RealLiteral extends NumberLiteral<BigDecimal> {
-} // RealLiteral
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/SetType.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/SetType.java
deleted file mode 100644
index 23893a3b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/SetType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Set Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage#getSetType()
- * @model
- * @generated
- */
-public interface SetType<T> extends Variable<T> {
-} // SetType
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/TypesFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/TypesFactory.java
deleted file mode 100644
index 5eda12a7..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/TypesFactory.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types;
-
-import org.eclipse.emf.ecore.EFactory;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage
- * @generated
- */
-public interface TypesFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TypesFactory eINSTANCE = org.fortiss.af3.exploration.dsl.model.types.impl.TypesFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Number Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Number Literal</em>'.
-	 * @generated
-	 */
-	<T> NumberLiteral<T> createNumberLiteral();
-
-	/**
-	 * Returns a new object of class '<em>Real Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Real Literal</em>'.
-	 * @generated
-	 */
-	RealLiteral createRealLiteral();
-
-	/**
-	 * Returns a new object of class '<em>Integer Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Integer Literal</em>'.
-	 * @generated
-	 */
-	IntegerLiteral createIntegerLiteral();
-
-	/**
-	 * Returns a new object of class '<em>Variable</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Variable</em>'.
-	 * @generated
-	 */
-	<T> Variable<T> createVariable();
-
-	/**
-	 * Returns a new object of class '<em>Arithmetic Variable</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Arithmetic Variable</em>'.
-	 * @generated
-	 */
-	<T> ArithmeticVariable<T> createArithmeticVariable();
-
-	/**
-	 * Returns a new object of class '<em>Set Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Set Type</em>'.
-	 * @generated
-	 */
-	<T> SetType<T> createSetType();
-
-	/**
-	 * Returns a new object of class '<em>Model Element Variable</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Model Element Variable</em>'.
-	 * @generated
-	 */
-	<ME extends IModelElement> ModelElementVariable<ME> createModelElementVariable();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	TypesPackage getTypesPackage();
-
-} //TypesFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/TypesPackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/TypesPackage.java
deleted file mode 100644
index c9dfdc59..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/TypesPackage.java
+++ /dev/null
@@ -1,467 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.types.TypesFactory
- * @model kind="package"
- * @generated
- */
-public interface TypesPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "types";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/types";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-types";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TypesPackage eINSTANCE = org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.NumberLiteralImpl <em>Number Literal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.NumberLiteralImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getNumberLiteral()
-	 * @generated
-	 */
-	int NUMBER_LITERAL = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NUMBER_LITERAL__VALUE = ExpressionsPackage.ARITHMETIC_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Number Literal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NUMBER_LITERAL_FEATURE_COUNT = ExpressionsPackage.ARITHMETIC_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.RealLiteralImpl <em>Real Literal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.RealLiteralImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getRealLiteral()
-	 * @generated
-	 */
-	int REAL_LITERAL = 1;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_LITERAL__VALUE = NUMBER_LITERAL__VALUE;
-
-	/**
-	 * The number of structural features of the '<em>Real Literal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_LITERAL_FEATURE_COUNT = NUMBER_LITERAL_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.IntegerLiteralImpl <em>Integer Literal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.IntegerLiteralImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getIntegerLiteral()
-	 * @generated
-	 */
-	int INTEGER_LITERAL = 2;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTEGER_LITERAL__VALUE = NUMBER_LITERAL__VALUE;
-
-	/**
-	 * The number of structural features of the '<em>Integer Literal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTEGER_LITERAL_FEATURE_COUNT = NUMBER_LITERAL_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.VariableImpl <em>Variable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.VariableImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getVariable()
-	 * @generated
-	 */
-	int VARIABLE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__VALUE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Variable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.ArithmeticVariableImpl <em>Arithmetic Variable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.ArithmeticVariableImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getArithmeticVariable()
-	 * @generated
-	 */
-	int ARITHMETIC_VARIABLE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARITHMETIC_VARIABLE__VALUE = VARIABLE__VALUE;
-
-	/**
-	 * The number of structural features of the '<em>Arithmetic Variable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARITHMETIC_VARIABLE_FEATURE_COUNT = VARIABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.SetTypeImpl <em>Set Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.SetTypeImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getSetType()
-	 * @generated
-	 */
-	int SET_TYPE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SET_TYPE__VALUE = VARIABLE__VALUE;
-
-	/**
-	 * The number of structural features of the '<em>Set Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SET_TYPE_FEATURE_COUNT = VARIABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.ModelElementVariableImpl <em>Model Element Variable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.ModelElementVariableImpl
-	 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getModelElementVariable()
-	 * @generated
-	 */
-	int MODEL_ELEMENT_VARIABLE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_ELEMENT_VARIABLE__VALUE = VARIABLE__VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_ELEMENT_VARIABLE__MODEL_ELEMENT = VARIABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Model Element Variable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_ELEMENT_VARIABLE_FEATURE_COUNT = VARIABLE_FEATURE_COUNT + 1;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.types.NumberLiteral <em>Number Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Number Literal</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.NumberLiteral
-	 * @generated
-	 */
-	EClass getNumberLiteral();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.dsl.model.types.NumberLiteral#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.NumberLiteral#getValue()
-	 * @see #getNumberLiteral()
-	 * @generated
-	 */
-	EAttribute getNumberLiteral_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.types.RealLiteral <em>Real Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Real Literal</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.RealLiteral
-	 * @generated
-	 */
-	EClass getRealLiteral();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.types.IntegerLiteral <em>Integer Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Integer Literal</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.IntegerLiteral
-	 * @generated
-	 */
-	EClass getIntegerLiteral();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.types.Variable <em>Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Variable</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.Variable
-	 * @generated
-	 */
-	EClass getVariable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.dsl.model.types.Variable#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.Variable#getValue()
-	 * @see #getVariable()
-	 * @generated
-	 */
-	EAttribute getVariable_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable <em>Arithmetic Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Arithmetic Variable</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable
-	 * @generated
-	 */
-	EClass getArithmeticVariable();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.types.SetType <em>Set Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Set Type</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.SetType
-	 * @generated
-	 */
-	EClass getSetType();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.dsl.model.types.ModelElementVariable <em>Model Element Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Model Element Variable</em>'.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.ModelElementVariable
-	 * @generated
-	 */
-	EClass getModelElementVariable();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	TypesFactory getTypesFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.NumberLiteralImpl <em>Number Literal</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.NumberLiteralImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getNumberLiteral()
-		 * @generated
-		 */
-		EClass NUMBER_LITERAL = eINSTANCE.getNumberLiteral();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute NUMBER_LITERAL__VALUE = eINSTANCE.getNumberLiteral_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.RealLiteralImpl <em>Real Literal</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.RealLiteralImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getRealLiteral()
-		 * @generated
-		 */
-		EClass REAL_LITERAL = eINSTANCE.getRealLiteral();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.IntegerLiteralImpl <em>Integer Literal</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.IntegerLiteralImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getIntegerLiteral()
-		 * @generated
-		 */
-		EClass INTEGER_LITERAL = eINSTANCE.getIntegerLiteral();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.VariableImpl <em>Variable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.VariableImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getVariable()
-		 * @generated
-		 */
-		EClass VARIABLE = eINSTANCE.getVariable();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VARIABLE__VALUE = eINSTANCE.getVariable_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.ArithmeticVariableImpl <em>Arithmetic Variable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.ArithmeticVariableImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getArithmeticVariable()
-		 * @generated
-		 */
-		EClass ARITHMETIC_VARIABLE = eINSTANCE.getArithmeticVariable();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.SetTypeImpl <em>Set Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.SetTypeImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getSetType()
-		 * @generated
-		 */
-		EClass SET_TYPE = eINSTANCE.getSetType();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.dsl.model.types.impl.ModelElementVariableImpl <em>Model Element Variable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.ModelElementVariableImpl
-		 * @see org.fortiss.af3.exploration.dsl.model.types.impl.TypesPackageImpl#getModelElementVariable()
-		 * @generated
-		 */
-		EClass MODEL_ELEMENT_VARIABLE = eINSTANCE.getModelElementVariable();
-
-	}
-
-} //TypesPackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/Variable.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/Variable.java
deleted file mode 100644
index 20148d9d..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/Variable.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Variable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.types.Variable#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage#getVariable()
- * @model
- * @generated
- */
-public interface Variable<T> extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(Object)
-	 * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage#getVariable_Value()
-	 * @model
-	 * @generated
-	 */
-	T getValue();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.dsl.model.types.Variable#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(T value);
-
-} // Variable
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/ArithmeticVariableImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/ArithmeticVariableImpl.java
deleted file mode 100644
index 116686a4..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/ArithmeticVariableImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable;
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Arithmetic Variable</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ArithmeticVariableImpl<T> extends VariableImpl<T> implements ArithmeticVariable<T> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ArithmeticVariableImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TypesPackage.Literals.ARITHMETIC_VARIABLE;
-	}
-
-} //ArithmeticVariableImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/IntegerLiteralImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/IntegerLiteralImpl.java
deleted file mode 100644
index c7b810f2..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/IntegerLiteralImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.types.IntegerLiteral;
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Integer Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IntegerLiteralImpl extends NumberLiteralImpl<BigInteger> implements IntegerLiteral {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IntegerLiteralImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TypesPackage.Literals.INTEGER_LITERAL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public void setValue(BigInteger newValue) {
-		super.setValue(newValue);
-	}
-
-} //IntegerLiteralImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/ModelElementVariableImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/ModelElementVariableImpl.java
deleted file mode 100644
index e1126dff..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/ModelElementVariableImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.types.ModelElementVariable;
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Model Element Variable</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.types.impl.ModelElementVariableImpl#getModelElement <em>Model Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ModelElementVariableImpl<ME extends IModelElement> extends VariableImpl<ME> implements ModelElementVariable<ME> {
-	/**
-	 * The cached value of the '{@link #getModelElement() <em>Model Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getModelElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected ME modelElement;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ModelElementVariableImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TypesPackage.Literals.MODEL_ELEMENT_VARIABLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public void setValue(ME newValue) {
-		super.setValue(newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public ME getModelElement() {
-		if (modelElement != null && modelElement.eIsProxy()) {
-			InternalEObject oldModelElement = (InternalEObject)modelElement;
-			modelElement = (ME)eResolveProxy(oldModelElement);
-			if (modelElement != oldModelElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TypesPackage.MODEL_ELEMENT_VARIABLE__MODEL_ELEMENT, oldModelElement, modelElement));
-			}
-		}
-		return modelElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ME basicGetModelElement() {
-		return modelElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setModelElement(ME newModelElement) {
-		ME oldModelElement = modelElement;
-		modelElement = newModelElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TypesPackage.MODEL_ELEMENT_VARIABLE__MODEL_ELEMENT, oldModelElement, modelElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TypesPackage.MODEL_ELEMENT_VARIABLE__MODEL_ELEMENT:
-				if (resolve) return getModelElement();
-				return basicGetModelElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TypesPackage.MODEL_ELEMENT_VARIABLE__MODEL_ELEMENT:
-				setModelElement((ME)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TypesPackage.MODEL_ELEMENT_VARIABLE__MODEL_ELEMENT:
-				setModelElement((ME)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TypesPackage.MODEL_ELEMENT_VARIABLE__MODEL_ELEMENT:
-				return modelElement != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Expression.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ElementExpression.class) {
-			switch (derivedFeatureID) {
-				case TypesPackage.MODEL_ELEMENT_VARIABLE__MODEL_ELEMENT: return ExpressionsPackage.ELEMENT_EXPRESSION__MODEL_ELEMENT;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Expression.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ElementExpression.class) {
-			switch (baseFeatureID) {
-				case ExpressionsPackage.ELEMENT_EXPRESSION__MODEL_ELEMENT: return TypesPackage.MODEL_ELEMENT_VARIABLE__MODEL_ELEMENT;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-} //ModelElementVariableImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/NumberLiteralImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/NumberLiteralImpl.java
deleted file mode 100644
index 5e7cd79f..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/NumberLiteralImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.dsl.model.types.NumberLiteral;
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Number Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.types.impl.NumberLiteralImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NumberLiteralImpl<T> extends EObjectImpl implements NumberLiteral<T> {
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected T value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NumberLiteralImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TypesPackage.Literals.NUMBER_LITERAL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public T getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(T newValue) {
-		T oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TypesPackage.NUMBER_LITERAL__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TypesPackage.NUMBER_LITERAL__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TypesPackage.NUMBER_LITERAL__VALUE:
-				setValue((T)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TypesPackage.NUMBER_LITERAL__VALUE:
-				setValue((T)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TypesPackage.NUMBER_LITERAL__VALUE:
-				return value != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //NumberLiteralImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/RealLiteralImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/RealLiteralImpl.java
deleted file mode 100644
index c028e2ff..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/RealLiteralImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types.impl;
-
-import java.math.BigDecimal;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.types.RealLiteral;
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Real Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class RealLiteralImpl extends NumberLiteralImpl<BigDecimal> implements RealLiteral {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RealLiteralImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TypesPackage.Literals.REAL_LITERAL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * This is specialized for the more specific type known in this context.
-	 * @generated
-	 */
-	@Override
-	public void setValue(BigDecimal newValue) {
-		super.setValue(newValue);
-	}
-
-} //RealLiteralImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/SetTypeImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/SetTypeImpl.java
deleted file mode 100644
index 32a00b8b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/SetTypeImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.types.SetType;
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Set Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class SetTypeImpl<T> extends VariableImpl<T> implements SetType<T> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SetTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TypesPackage.Literals.SET_TYPE;
-	}
-
-} //SetTypeImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/TypesFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/TypesFactoryImpl.java
deleted file mode 100644
index 48bc6e53..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/TypesFactoryImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.dsl.model.types.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TypesFactoryImpl extends EFactoryImpl implements TypesFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TypesFactory init() {
-		try {
-			TypesFactory theTypesFactory = (TypesFactory)EPackage.Registry.INSTANCE.getEFactory(TypesPackage.eNS_URI);
-			if (theTypesFactory != null) {
-				return theTypesFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new TypesFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TypesFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case TypesPackage.NUMBER_LITERAL: return createNumberLiteral();
-			case TypesPackage.REAL_LITERAL: return createRealLiteral();
-			case TypesPackage.INTEGER_LITERAL: return createIntegerLiteral();
-			case TypesPackage.VARIABLE: return createVariable();
-			case TypesPackage.ARITHMETIC_VARIABLE: return createArithmeticVariable();
-			case TypesPackage.SET_TYPE: return createSetType();
-			case TypesPackage.MODEL_ELEMENT_VARIABLE: return createModelElementVariable();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> NumberLiteral<T> createNumberLiteral() {
-		NumberLiteralImpl<T> numberLiteral = new NumberLiteralImpl<T>();
-		return numberLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RealLiteral createRealLiteral() {
-		RealLiteralImpl realLiteral = new RealLiteralImpl();
-		return realLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IntegerLiteral createIntegerLiteral() {
-		IntegerLiteralImpl integerLiteral = new IntegerLiteralImpl();
-		return integerLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> Variable<T> createVariable() {
-		VariableImpl<T> variable = new VariableImpl<T>();
-		return variable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> ArithmeticVariable<T> createArithmeticVariable() {
-		ArithmeticVariableImpl<T> arithmeticVariable = new ArithmeticVariableImpl<T>();
-		return arithmeticVariable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> SetType<T> createSetType() {
-		SetTypeImpl<T> setType = new SetTypeImpl<T>();
-		return setType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <ME extends IModelElement> ModelElementVariable<ME> createModelElementVariable() {
-		ModelElementVariableImpl<ME> modelElementVariable = new ModelElementVariableImpl<ME>();
-		return modelElementVariable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TypesPackage getTypesPackage() {
-		return (TypesPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static TypesPackage getPackage() {
-		return TypesPackage.eINSTANCE;
-	}
-
-} //TypesFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/TypesPackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/TypesPackageImpl.java
deleted file mode 100644
index f82541f0..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/TypesPackageImpl.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.ETypeParameter;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.impl.ExpressionsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.impl.ModelPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.operators.impl.OperatorsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.impl.PatternsPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable;
-import org.fortiss.af3.exploration.dsl.model.types.IntegerLiteral;
-import org.fortiss.af3.exploration.dsl.model.types.ModelElementVariable;
-import org.fortiss.af3.exploration.dsl.model.types.NumberLiteral;
-import org.fortiss.af3.exploration.dsl.model.types.RealLiteral;
-import org.fortiss.af3.exploration.dsl.model.types.SetType;
-import org.fortiss.af3.exploration.dsl.model.types.TypesFactory;
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-import org.fortiss.af3.exploration.dsl.model.types.Variable;
-
-import org.fortiss.tooling.base.model.base.BasePackage;
-
-import org.fortiss.tooling.base.model.element.ElementPackage;
-
-import org.fortiss.tooling.base.model.layout.LayoutPackage;
-
-import org.fortiss.tooling.base.model.visualization.VisualizationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TypesPackageImpl extends EPackageImpl implements TypesPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass numberLiteralEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass realLiteralEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass integerLiteralEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass variableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass arithmeticVariableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass setTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass modelElementVariableEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private TypesPackageImpl() {
-		super(eNS_URI, TypesFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link TypesPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static TypesPackage init() {
-		if (isInited) return (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
-
-		// Obtain or create and register package
-		TypesPackageImpl theTypesPackage = (TypesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TypesPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ElementPackage.eINSTANCE.eClass();
-		LayoutPackage.eINSTANCE.eClass();
-		BasePackage.eINSTANCE.eClass();
-		VisualizationPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ModelPackageImpl theModelPackage = (ModelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI) : ModelPackage.eINSTANCE);
-		OperatorsPackageImpl theOperatorsPackage = (OperatorsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI) instanceof OperatorsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI) : OperatorsPackage.eINSTANCE);
-		ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI) instanceof ExpressionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI) : ExpressionsPackage.eINSTANCE);
-		PatternsPackageImpl thePatternsPackage = (PatternsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PatternsPackage.eNS_URI) instanceof PatternsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PatternsPackage.eNS_URI) : PatternsPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theTypesPackage.createPackageContents();
-		theModelPackage.createPackageContents();
-		theOperatorsPackage.createPackageContents();
-		theExpressionsPackage.createPackageContents();
-		thePatternsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theTypesPackage.initializePackageContents();
-		theModelPackage.initializePackageContents();
-		theOperatorsPackage.initializePackageContents();
-		theExpressionsPackage.initializePackageContents();
-		thePatternsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theTypesPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(TypesPackage.eNS_URI, theTypesPackage);
-		return theTypesPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNumberLiteral() {
-		return numberLiteralEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNumberLiteral_Value() {
-		return (EAttribute)numberLiteralEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRealLiteral() {
-		return realLiteralEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIntegerLiteral() {
-		return integerLiteralEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getVariable() {
-		return variableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getVariable_Value() {
-		return (EAttribute)variableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getArithmeticVariable() {
-		return arithmeticVariableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSetType() {
-		return setTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getModelElementVariable() {
-		return modelElementVariableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TypesFactory getTypesFactory() {
-		return (TypesFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		numberLiteralEClass = createEClass(NUMBER_LITERAL);
-		createEAttribute(numberLiteralEClass, NUMBER_LITERAL__VALUE);
-
-		realLiteralEClass = createEClass(REAL_LITERAL);
-
-		integerLiteralEClass = createEClass(INTEGER_LITERAL);
-
-		variableEClass = createEClass(VARIABLE);
-		createEAttribute(variableEClass, VARIABLE__VALUE);
-
-		arithmeticVariableEClass = createEClass(ARITHMETIC_VARIABLE);
-
-		setTypeEClass = createEClass(SET_TYPE);
-
-		modelElementVariableEClass = createEClass(MODEL_ELEMENT_VARIABLE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ExpressionsPackage theExpressionsPackage = (ExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI);
-		ElementPackage theElementPackage = (ElementPackage)EPackage.Registry.INSTANCE.getEPackage(ElementPackage.eNS_URI);
-
-		// Create type parameters
-		ETypeParameter numberLiteralEClass_T = addETypeParameter(numberLiteralEClass, "T");
-		ETypeParameter variableEClass_T = addETypeParameter(variableEClass, "T");
-		ETypeParameter arithmeticVariableEClass_T = addETypeParameter(arithmeticVariableEClass, "T");
-		ETypeParameter setTypeEClass_T = addETypeParameter(setTypeEClass, "T");
-		ETypeParameter modelElementVariableEClass_ME = addETypeParameter(modelElementVariableEClass, "ME");
-
-		// Set bounds for type parameters
-		EGenericType g1 = createEGenericType(theElementPackage.getIModelElement());
-		modelElementVariableEClass_ME.getEBounds().add(g1);
-
-		// Add supertypes to classes
-		g1 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		EGenericType g2 = createEGenericType(numberLiteralEClass_T);
-		g1.getETypeArguments().add(g2);
-		numberLiteralEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getNumberLiteral());
-		g2 = createEGenericType(ecorePackage.getEBigDecimal());
-		g1.getETypeArguments().add(g2);
-		realLiteralEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getNumberLiteral());
-		g2 = createEGenericType(ecorePackage.getEBigInteger());
-		g1.getETypeArguments().add(g2);
-		integerLiteralEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getVariable());
-		g2 = createEGenericType(arithmeticVariableEClass_T);
-		g1.getETypeArguments().add(g2);
-		arithmeticVariableEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g2 = createEGenericType(arithmeticVariableEClass_T);
-		g1.getETypeArguments().add(g2);
-		arithmeticVariableEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getVariable());
-		g2 = createEGenericType(setTypeEClass_T);
-		g1.getETypeArguments().add(g2);
-		setTypeEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getVariable());
-		g2 = createEGenericType(modelElementVariableEClass_ME);
-		g1.getETypeArguments().add(g2);
-		modelElementVariableEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getElementExpression());
-		g2 = createEGenericType(modelElementVariableEClass_ME);
-		g1.getETypeArguments().add(g2);
-		modelElementVariableEClass.getEGenericSuperTypes().add(g1);
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(numberLiteralEClass, NumberLiteral.class, "NumberLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		g1 = createEGenericType(numberLiteralEClass_T);
-		initEAttribute(getNumberLiteral_Value(), g1, "value", null, 1, 1, NumberLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(realLiteralEClass, RealLiteral.class, "RealLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(integerLiteralEClass, IntegerLiteral.class, "IntegerLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(variableEClass, Variable.class, "Variable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		g1 = createEGenericType(variableEClass_T);
-		initEAttribute(getVariable_Value(), g1, "value", null, 0, 1, Variable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(arithmeticVariableEClass, ArithmeticVariable.class, "ArithmeticVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(setTypeEClass, SetType.class, "SetType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(modelElementVariableEClass, ModelElementVariable.class, "ModelElementVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-	}
-
-} //TypesPackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/VariableImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/VariableImpl.java
deleted file mode 100644
index 69c1a195..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/impl/VariableImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-import org.fortiss.af3.exploration.dsl.model.types.Variable;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Variable</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.dsl.model.types.impl.VariableImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class VariableImpl<T> extends EObjectImpl implements Variable<T> {
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected T value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected VariableImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TypesPackage.Literals.VARIABLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public T getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(T newValue) {
-		T oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TypesPackage.VARIABLE__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TypesPackage.VARIABLE__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TypesPackage.VARIABLE__VALUE:
-				setValue((T)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TypesPackage.VARIABLE__VALUE:
-				setValue((T)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TypesPackage.VARIABLE__VALUE:
-				return value != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //VariableImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/util/TypesAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/util/TypesAdapterFactory.java
deleted file mode 100644
index f93b8994..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/util/TypesAdapterFactory.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.dsl.model.types.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage
- * @generated
- */
-public class TypesAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static TypesPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TypesAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = TypesPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TypesSwitch<Adapter> modelSwitch =
-		new TypesSwitch<Adapter>() {
-			@Override
-			public <T> Adapter caseNumberLiteral(NumberLiteral<T> object) {
-				return createNumberLiteralAdapter();
-			}
-			@Override
-			public Adapter caseRealLiteral(RealLiteral object) {
-				return createRealLiteralAdapter();
-			}
-			@Override
-			public Adapter caseIntegerLiteral(IntegerLiteral object) {
-				return createIntegerLiteralAdapter();
-			}
-			@Override
-			public <T> Adapter caseVariable(Variable<T> object) {
-				return createVariableAdapter();
-			}
-			@Override
-			public <T> Adapter caseArithmeticVariable(ArithmeticVariable<T> object) {
-				return createArithmeticVariableAdapter();
-			}
-			@Override
-			public <T> Adapter caseSetType(SetType<T> object) {
-				return createSetTypeAdapter();
-			}
-			@Override
-			public <ME extends IModelElement> Adapter caseModelElementVariable(ModelElementVariable<ME> object) {
-				return createModelElementVariableAdapter();
-			}
-			@Override
-			public Adapter caseExpression(Expression object) {
-				return createExpressionAdapter();
-			}
-			@Override
-			public <T> Adapter caseArithmeticExpression(ArithmeticExpression<T> object) {
-				return createArithmeticExpressionAdapter();
-			}
-			@Override
-			public <ME extends IModelElement> Adapter caseElementExpression(ElementExpression<ME> object) {
-				return createElementExpressionAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.types.NumberLiteral <em>Number Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.NumberLiteral
-	 * @generated
-	 */
-	public Adapter createNumberLiteralAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.types.RealLiteral <em>Real Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.RealLiteral
-	 * @generated
-	 */
-	public Adapter createRealLiteralAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.types.IntegerLiteral <em>Integer Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.IntegerLiteral
-	 * @generated
-	 */
-	public Adapter createIntegerLiteralAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.types.Variable <em>Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.Variable
-	 * @generated
-	 */
-	public Adapter createVariableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable <em>Arithmetic Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.ArithmeticVariable
-	 * @generated
-	 */
-	public Adapter createArithmeticVariableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.types.SetType <em>Set Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.SetType
-	 * @generated
-	 */
-	public Adapter createSetTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.types.ModelElementVariable <em>Model Element Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.types.ModelElementVariable
-	 * @generated
-	 */
-	public Adapter createModelElementVariableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.Expression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.Expression
-	 * @generated
-	 */
-	public Adapter createExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression <em>Arithmetic Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression
-	 * @generated
-	 */
-	public Adapter createArithmeticExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression <em>Element Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression
-	 * @generated
-	 */
-	public Adapter createElementExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //TypesAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/util/TypesSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/util/TypesSwitch.java
deleted file mode 100644
index 5c574126..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/types/util/TypesSwitch.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.types.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.dsl.model.types.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.types.TypesPackage
- * @generated
- */
-public class TypesSwitch<T1> extends Switch<T1> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static TypesPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TypesSwitch() {
-		if (modelPackage == null) {
-			modelPackage = TypesPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T1 doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case TypesPackage.NUMBER_LITERAL: {
-				NumberLiteral<?> numberLiteral = (NumberLiteral<?>)theEObject;
-				T1 result = caseNumberLiteral(numberLiteral);
-				if (result == null) result = caseArithmeticExpression(numberLiteral);
-				if (result == null) result = caseExpression(numberLiteral);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TypesPackage.REAL_LITERAL: {
-				RealLiteral realLiteral = (RealLiteral)theEObject;
-				T1 result = caseRealLiteral(realLiteral);
-				if (result == null) result = caseNumberLiteral(realLiteral);
-				if (result == null) result = caseArithmeticExpression(realLiteral);
-				if (result == null) result = caseExpression(realLiteral);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TypesPackage.INTEGER_LITERAL: {
-				IntegerLiteral integerLiteral = (IntegerLiteral)theEObject;
-				T1 result = caseIntegerLiteral(integerLiteral);
-				if (result == null) result = caseNumberLiteral(integerLiteral);
-				if (result == null) result = caseArithmeticExpression(integerLiteral);
-				if (result == null) result = caseExpression(integerLiteral);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TypesPackage.VARIABLE: {
-				Variable<?> variable = (Variable<?>)theEObject;
-				T1 result = caseVariable(variable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TypesPackage.ARITHMETIC_VARIABLE: {
-				ArithmeticVariable<?> arithmeticVariable = (ArithmeticVariable<?>)theEObject;
-				T1 result = caseArithmeticVariable(arithmeticVariable);
-				if (result == null) result = caseVariable(arithmeticVariable);
-				if (result == null) result = caseArithmeticExpression(arithmeticVariable);
-				if (result == null) result = caseExpression(arithmeticVariable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TypesPackage.SET_TYPE: {
-				SetType<?> setType = (SetType<?>)theEObject;
-				T1 result = caseSetType(setType);
-				if (result == null) result = caseVariable(setType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TypesPackage.MODEL_ELEMENT_VARIABLE: {
-				ModelElementVariable<?> modelElementVariable = (ModelElementVariable<?>)theEObject;
-				T1 result = caseModelElementVariable(modelElementVariable);
-				if (result == null) result = caseVariable(modelElementVariable);
-				if (result == null) result = caseElementExpression(modelElementVariable);
-				if (result == null) result = caseExpression(modelElementVariable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Number Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Number Literal</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseNumberLiteral(NumberLiteral<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Real Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Real Literal</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseRealLiteral(RealLiteral object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Integer Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Integer Literal</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseIntegerLiteral(IntegerLiteral object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Variable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Variable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseVariable(Variable<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Arithmetic Variable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Arithmetic Variable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseArithmeticVariable(ArithmeticVariable<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Set Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Set Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseSetType(SetType<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Model Element Variable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Model Element Variable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <ME extends IModelElement> T1 caseModelElementVariable(ModelElementVariable<ME> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseExpression(Expression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseArithmeticExpression(ArithmeticExpression<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Element Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Element Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <ME extends IModelElement> T1 caseElementExpression(ElementExpression<ME> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T1 defaultCase(EObject object) {
-		return null;
-	}
-
-} //TypesSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/util/ModelAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/util/ModelAdapterFactory.java
deleted file mode 100644
index 67cb75d6..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/util/ModelAdapterFactory.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.dsl.model.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.ModelPackage
- * @generated
- */
-public class ModelAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ModelPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ModelPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ModelSwitch<Adapter> modelSwitch =
-		new ModelSwitch<Adapter>() {
-			@Override
-			public Adapter caseMOEAExplorationExpression(MOEAExplorationExpression object) {
-				return createMOEAExplorationExpressionAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression <em>MOEA Exploration Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression
-	 * @generated
-	 */
-	public Adapter createMOEAExplorationExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ModelAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/util/ModelSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/util/ModelSwitch.java
deleted file mode 100644
index e65e9c40..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/dsl/model/util/ModelSwitch.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.dsl.model.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.dsl.model.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.dsl.model.ModelPackage
- * @generated
- */
-public class ModelSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ModelPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ModelPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ModelPackage.MOEA_EXPLORATION_EXPRESSION: {
-				MOEAExplorationExpression moeaExplorationExpression = (MOEAExplorationExpression)theEObject;
-				T result = caseMOEAExplorationExpression(moeaExplorationExpression);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>MOEA Exploration Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>MOEA Exploration Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMOEAExplorationExpression(MOEAExplorationExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //ModelSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/CommonFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/CommonFactory.java
deleted file mode 100644
index 24783b15..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/CommonFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.CommonPackage
- * @generated
- */
-public interface CommonFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	CommonFactory eINSTANCE = org.fortiss.af3.exploration.model.impl.CommonFactoryImpl.init();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	CommonPackage getCommonPackage();
-
-} //CommonFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/CommonPackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/CommonPackage.java
deleted file mode 100644
index 3a3a5f74..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/CommonPackage.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.CommonFactory
- * @model kind="package"
- * @generated
- */
-public interface CommonPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "model";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/common";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-common";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	CommonPackage eINSTANCE = org.fortiss.af3.exploration.model.impl.CommonPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.model.MOExplorationObjective <em>MO Exploration Objective</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.model.MOExplorationObjective
-	 * @see org.fortiss.af3.exploration.model.impl.CommonPackageImpl#getMOExplorationObjective()
-	 * @generated
-	 */
-	int MO_EXPLORATION_OBJECTIVE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MO_EXPLORATION_OBJECTIVE__ID = ExplorationPackage.EXPLORATION_OBJECTIVE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MO_EXPLORATION_OBJECTIVE__NAME = ExplorationPackage.EXPLORATION_OBJECTIVE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MO_EXPLORATION_OBJECTIVE__COMMENT = ExplorationPackage.EXPLORATION_OBJECTIVE__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Priority</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MO_EXPLORATION_OBJECTIVE__PRIORITY = ExplorationPackage.EXPLORATION_OBJECTIVE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>MO Exploration Objective</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MO_EXPLORATION_OBJECTIVE_FEATURE_COUNT = ExplorationPackage.EXPLORATION_OBJECTIVE_FEATURE_COUNT + 1;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.model.MOExplorationObjective <em>MO Exploration Objective</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>MO Exploration Objective</em>'.
-	 * @see org.fortiss.af3.exploration.model.MOExplorationObjective
-	 * @generated
-	 */
-	EClass getMOExplorationObjective();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.model.MOExplorationObjective#getPriority <em>Priority</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Priority</em>'.
-	 * @see org.fortiss.af3.exploration.model.MOExplorationObjective#getPriority()
-	 * @see #getMOExplorationObjective()
-	 * @generated
-	 */
-	EAttribute getMOExplorationObjective_Priority();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	CommonFactory getCommonFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.model.MOExplorationObjective <em>MO Exploration Objective</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.model.MOExplorationObjective
-		 * @see org.fortiss.af3.exploration.model.impl.CommonPackageImpl#getMOExplorationObjective()
-		 * @generated
-		 */
-		EClass MO_EXPLORATION_OBJECTIVE = eINSTANCE.getMOExplorationObjective();
-
-		/**
-		 * The meta object literal for the '<em><b>Priority</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MO_EXPLORATION_OBJECTIVE__PRIORITY = eINSTANCE.getMOExplorationObjective_Priority();
-
-	}
-
-} //CommonPackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/MOExplorationObjective.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/MOExplorationObjective.java
deleted file mode 100644
index 56e475c2..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/MOExplorationObjective.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>MO Exploration Objective</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * {@link ExplorationObjective} suitable for the definition of Multi-Objective DSE problems.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.model.MOExplorationObjective#getPriority <em>Priority</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.model.CommonPackage#getMOExplorationObjective()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface MOExplorationObjective<T> extends ExplorationObjective<T> {
-	/**
-	 * Returns the value of the '<em><b>Priority</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the weighting of a single {@MOExplorationObjective} instance that is relevant for the backend solver.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Priority</em>' attribute.
-	 * @see #setPriority(int)
-	 * @see org.fortiss.af3.exploration.model.CommonPackage#getMOExplorationObjective_Priority()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getPriority();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.model.MOExplorationObjective#getPriority <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Priority</em>' attribute.
-	 * @see #getPriority()
-	 * @generated
-	 */
-	void setPriority(int value);
-
-} // MOExplorationObjective
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/impl/CommonFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/impl/CommonFactoryImpl.java
deleted file mode 100644
index 3243d163..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/impl/CommonFactoryImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.model.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CommonFactoryImpl extends EFactoryImpl implements CommonFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CommonFactory init() {
-		try {
-			CommonFactory theCommonFactory = (CommonFactory)EPackage.Registry.INSTANCE.getEFactory(CommonPackage.eNS_URI);
-			if (theCommonFactory != null) {
-				return theCommonFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new CommonFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommonFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommonPackage getCommonPackage() {
-		return (CommonPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static CommonPackage getPackage() {
-		return CommonPackage.eINSTANCE;
-	}
-
-} //CommonFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/impl/CommonPackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/impl/CommonPackageImpl.java
deleted file mode 100644
index aafd4a5b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/impl/CommonPackageImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.ETypeParameter;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.model.CommonFactory;
-import org.fortiss.af3.exploration.model.CommonPackage;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-import org.fortiss.af3.exploration.model.MOExplorationObjective;
-
-import org.fortiss.af3.exploration.model.location.LocationPackage;
-
-import org.fortiss.af3.exploration.model.location.impl.LocationPackageImpl;
-
-import org.fortiss.af3.exploration.model.time.TimePackage;
-
-import org.fortiss.af3.exploration.model.time.impl.TimePackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CommonPackageImpl extends EPackageImpl implements CommonPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass moExplorationObjectiveEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.model.CommonPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private CommonPackageImpl() {
-		super(eNS_URI, CommonFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link CommonPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static CommonPackage init() {
-		if (isInited) return (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Obtain or create and register package
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CommonPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ModelPackage.eINSTANCE.eClass();
-		ExplorationPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		LocationPackageImpl theLocationPackage = (LocationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LocationPackage.eNS_URI) instanceof LocationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LocationPackage.eNS_URI) : LocationPackage.eINSTANCE);
-		TimePackageImpl theTimePackage = (TimePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TimePackage.eNS_URI) instanceof TimePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TimePackage.eNS_URI) : TimePackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theCommonPackage.createPackageContents();
-		theLocationPackage.createPackageContents();
-		theTimePackage.createPackageContents();
-
-		// Initialize created meta-data
-		theCommonPackage.initializePackageContents();
-		theLocationPackage.initializePackageContents();
-		theTimePackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theCommonPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(CommonPackage.eNS_URI, theCommonPackage);
-		return theCommonPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMOExplorationObjective() {
-		return moExplorationObjectiveEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMOExplorationObjective_Priority() {
-		return (EAttribute)moExplorationObjectiveEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommonFactory getCommonFactory() {
-		return (CommonFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		moExplorationObjectiveEClass = createEClass(MO_EXPLORATION_OBJECTIVE);
-		createEAttribute(moExplorationObjectiveEClass, MO_EXPLORATION_OBJECTIVE__PRIORITY);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		LocationPackage theLocationPackage = (LocationPackage)EPackage.Registry.INSTANCE.getEPackage(LocationPackage.eNS_URI);
-		TimePackage theTimePackage = (TimePackage)EPackage.Registry.INSTANCE.getEPackage(TimePackage.eNS_URI);
-		ExplorationPackage theExplorationPackage = (ExplorationPackage)EPackage.Registry.INSTANCE.getEPackage(ExplorationPackage.eNS_URI);
-
-		// Add subpackages
-		getESubpackages().add(theLocationPackage);
-		getESubpackages().add(theTimePackage);
-
-		// Create type parameters
-		ETypeParameter moExplorationObjectiveEClass_T = addETypeParameter(moExplorationObjectiveEClass, "T");
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		EGenericType g1 = createEGenericType(theExplorationPackage.getExplorationObjective());
-		EGenericType g2 = createEGenericType(moExplorationObjectiveEClass_T);
-		g1.getETypeArguments().add(g2);
-		moExplorationObjectiveEClass.getEGenericSuperTypes().add(g1);
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(moExplorationObjectiveEClass, MOExplorationObjective.class, "MOExplorationObjective", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMOExplorationObjective_Priority(), ecorePackage.getEInt(), "priority", null, 1, 1, MOExplorationObjective.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //CommonPackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/ComponentAllocationConstraint.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/ComponentAllocationConstraint.java
deleted file mode 100644
index dbb2cc50..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/ComponentAllocationConstraint.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-
-import org.fortiss.af3.platform.model.ExecutionUnit;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Component Allocation Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.model.location.LocationPackage#getComponentAllocationConstraint()
- * @model superTypes="org.fortiss.af3.exploration.model.location.LocationConstraint<org.fortiss.af3.component.model.Component, org.fortiss.af3.platform.model.ExecutionUnit> org.fortiss.af3.exploration.model.ExplorationConstraint<org.eclipse.emf.ecore.EBooleanObject>"
- * @generated
- */
-public interface ComponentAllocationConstraint extends LocationConstraint<Component, ExecutionUnit>, ExplorationConstraint<Boolean> {
-} // ComponentAllocationConstraint
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/ComponentDislocationConstraint.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/ComponentDislocationConstraint.java
deleted file mode 100644
index fd879236..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/ComponentDislocationConstraint.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-
-import org.fortiss.af3.platform.model.ExecutionUnit;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Component Dislocation Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.model.location.LocationPackage#getComponentDislocationConstraint()
- * @model superTypes="org.fortiss.af3.exploration.model.location.LocationConstraint<org.fortiss.af3.component.model.Component, org.fortiss.af3.platform.model.ExecutionUnit> org.fortiss.af3.exploration.model.ExplorationConstraint<org.eclipse.emf.ecore.EBooleanObject>"
- * @generated
- */
-public interface ComponentDislocationConstraint extends LocationConstraint<Component, ExecutionUnit>, ExplorationConstraint<Boolean> {
-} // ComponentDislocationConstraint
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationConstraint.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationConstraint.java
deleted file mode 100644
index d373b50e..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationConstraint.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY. {@link ExplorationConstraint} to define limitations on the location of requesters to resources, e.g., {@link Component}s to {@link IPlatformresource}s.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.model.location.LocationPackage#getLocationConstraint()
- * @model
- * @generated
- */
-public interface LocationConstraint<LHT extends IModelElement, RHT extends IModelElement> extends LocationDimension, MOEAExplorationExpression {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY. Returns the left hand {@link IModelElement} referenced in the pattern of {@code this} constraint.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return LocationConstraintStaticImpl.getLeftModelElement(this);'"
-	 * @generated
-	 */
-	LHT getLeftModelElement();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY. Returns the right hand {@link IModelElement} referenced in the pattern of {@code this} constraint.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return LocationConstraintStaticImpl.getRightModelElement(this);'"
-	 * @generated
-	 */
-	RHT getRightModelElement();
-
-} // LocationConstraint
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationDimension.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationDimension.java
deleted file mode 100644
index 36119ea0..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationDimension.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location;
-
-import org.fortiss.af3.exploration.model.IProblemDimension;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dimension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * {@link IProblemDimension} to mark {@link ExplorationTarget}s that describe the location of requesters to resources, e.g. {@link Component}s to {@link IPlatformResource}s.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.model.location.LocationPackage#getLocationDimension()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface LocationDimension extends IProblemDimension {
-} // LocationDimension
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationFactory.java
deleted file mode 100644
index 1c2dc2e0..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location;
-
-import org.eclipse.emf.ecore.EFactory;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.location.LocationPackage
- * @generated
- */
-public interface LocationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	LocationFactory eINSTANCE = org.fortiss.af3.exploration.model.location.impl.LocationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Constraint</em>'.
-	 * @generated
-	 */
-	<LHT extends IModelElement, RHT extends IModelElement> LocationConstraint<LHT, RHT> createLocationConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Component Allocation Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Component Allocation Constraint</em>'.
-	 * @generated
-	 */
-	ComponentAllocationConstraint createComponentAllocationConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Component Dislocation Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Component Dislocation Constraint</em>'.
-	 * @generated
-	 */
-	ComponentDislocationConstraint createComponentDislocationConstraint();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	LocationPackage getLocationPackage();
-
-} //LocationFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationPackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationPackage.java
deleted file mode 100644
index 66e1d30e..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/LocationPackage.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.location.LocationFactory
- * @model kind="package"
- * @generated
- */
-public interface LocationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "location";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/common/location";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-common-location";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	LocationPackage eINSTANCE = org.fortiss.af3.exploration.model.location.impl.LocationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.model.location.LocationDimension <em>Dimension</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.model.location.LocationDimension
-	 * @see org.fortiss.af3.exploration.model.location.impl.LocationPackageImpl#getLocationDimension()
-	 * @generated
-	 */
-	int LOCATION_DIMENSION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_DIMENSION__ID = ExplorationPackage.IPROBLEM_DIMENSION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_DIMENSION__NAME = ExplorationPackage.IPROBLEM_DIMENSION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_DIMENSION__COMMENT = ExplorationPackage.IPROBLEM_DIMENSION__COMMENT;
-
-	/**
-	 * The number of structural features of the '<em>Dimension</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_DIMENSION_FEATURE_COUNT = ExplorationPackage.IPROBLEM_DIMENSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.model.location.impl.LocationConstraintImpl <em>Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.model.location.impl.LocationConstraintImpl
-	 * @see org.fortiss.af3.exploration.model.location.impl.LocationPackageImpl#getLocationConstraint()
-	 * @generated
-	 */
-	int LOCATION_CONSTRAINT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_CONSTRAINT__ID = LOCATION_DIMENSION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_CONSTRAINT__NAME = LOCATION_DIMENSION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_CONSTRAINT__COMMENT = LOCATION_DIMENSION__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_CONSTRAINT__EXPRESSION = LOCATION_DIMENSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_CONSTRAINT_FEATURE_COUNT = LOCATION_DIMENSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.model.location.impl.ComponentAllocationConstraintImpl <em>Component Allocation Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.model.location.impl.ComponentAllocationConstraintImpl
-	 * @see org.fortiss.af3.exploration.model.location.impl.LocationPackageImpl#getComponentAllocationConstraint()
-	 * @generated
-	 */
-	int COMPONENT_ALLOCATION_CONSTRAINT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_ALLOCATION_CONSTRAINT__ID = LOCATION_CONSTRAINT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_ALLOCATION_CONSTRAINT__NAME = LOCATION_CONSTRAINT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_ALLOCATION_CONSTRAINT__COMMENT = LOCATION_CONSTRAINT__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_ALLOCATION_CONSTRAINT__EXPRESSION = LOCATION_CONSTRAINT__EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Is Soft</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_ALLOCATION_CONSTRAINT__IS_SOFT = LOCATION_CONSTRAINT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Implicit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_ALLOCATION_CONSTRAINT__IMPLICIT = LOCATION_CONSTRAINT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Component Allocation Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_ALLOCATION_CONSTRAINT_FEATURE_COUNT = LOCATION_CONSTRAINT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.model.location.impl.ComponentDislocationConstraintImpl <em>Component Dislocation Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.model.location.impl.ComponentDislocationConstraintImpl
-	 * @see org.fortiss.af3.exploration.model.location.impl.LocationPackageImpl#getComponentDislocationConstraint()
-	 * @generated
-	 */
-	int COMPONENT_DISLOCATION_CONSTRAINT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_DISLOCATION_CONSTRAINT__ID = LOCATION_CONSTRAINT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_DISLOCATION_CONSTRAINT__NAME = LOCATION_CONSTRAINT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_DISLOCATION_CONSTRAINT__COMMENT = LOCATION_CONSTRAINT__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_DISLOCATION_CONSTRAINT__EXPRESSION = LOCATION_CONSTRAINT__EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Is Soft</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_DISLOCATION_CONSTRAINT__IS_SOFT = LOCATION_CONSTRAINT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Implicit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_DISLOCATION_CONSTRAINT__IMPLICIT = LOCATION_CONSTRAINT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Component Dislocation Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_DISLOCATION_CONSTRAINT_FEATURE_COUNT = LOCATION_CONSTRAINT_FEATURE_COUNT + 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.model.location.LocationDimension <em>Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Dimension</em>'.
-	 * @see org.fortiss.af3.exploration.model.location.LocationDimension
-	 * @generated
-	 */
-	EClass getLocationDimension();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.model.location.LocationConstraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Constraint</em>'.
-	 * @see org.fortiss.af3.exploration.model.location.LocationConstraint
-	 * @generated
-	 */
-	EClass getLocationConstraint();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.model.location.ComponentAllocationConstraint <em>Component Allocation Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Component Allocation Constraint</em>'.
-	 * @see org.fortiss.af3.exploration.model.location.ComponentAllocationConstraint
-	 * @generated
-	 */
-	EClass getComponentAllocationConstraint();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.model.location.ComponentDislocationConstraint <em>Component Dislocation Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Component Dislocation Constraint</em>'.
-	 * @see org.fortiss.af3.exploration.model.location.ComponentDislocationConstraint
-	 * @generated
-	 */
-	EClass getComponentDislocationConstraint();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	LocationFactory getLocationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.model.location.LocationDimension <em>Dimension</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.model.location.LocationDimension
-		 * @see org.fortiss.af3.exploration.model.location.impl.LocationPackageImpl#getLocationDimension()
-		 * @generated
-		 */
-		EClass LOCATION_DIMENSION = eINSTANCE.getLocationDimension();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.model.location.impl.LocationConstraintImpl <em>Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.model.location.impl.LocationConstraintImpl
-		 * @see org.fortiss.af3.exploration.model.location.impl.LocationPackageImpl#getLocationConstraint()
-		 * @generated
-		 */
-		EClass LOCATION_CONSTRAINT = eINSTANCE.getLocationConstraint();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.model.location.impl.ComponentAllocationConstraintImpl <em>Component Allocation Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.model.location.impl.ComponentAllocationConstraintImpl
-		 * @see org.fortiss.af3.exploration.model.location.impl.LocationPackageImpl#getComponentAllocationConstraint()
-		 * @generated
-		 */
-		EClass COMPONENT_ALLOCATION_CONSTRAINT = eINSTANCE.getComponentAllocationConstraint();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.model.location.impl.ComponentDislocationConstraintImpl <em>Component Dislocation Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.model.location.impl.ComponentDislocationConstraintImpl
-		 * @see org.fortiss.af3.exploration.model.location.impl.LocationPackageImpl#getComponentDislocationConstraint()
-		 * @generated
-		 */
-		EClass COMPONENT_DISLOCATION_CONSTRAINT = eINSTANCE.getComponentDislocationConstraint();
-
-	}
-
-} //LocationPackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/ComponentAllocationConstraintImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/ComponentAllocationConstraintImpl.java
deleted file mode 100644
index 2f7adb98..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/ComponentAllocationConstraintImpl.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-import org.fortiss.af3.exploration.model.location.ComponentAllocationConstraint;
-import org.fortiss.af3.exploration.model.location.LocationPackage;
-
-import org.fortiss.af3.platform.model.ExecutionUnit;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Component Allocation Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.model.location.impl.ComponentAllocationConstraintImpl#isIsSoft <em>Is Soft</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.location.impl.ComponentAllocationConstraintImpl#isImplicit <em>Implicit</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ComponentAllocationConstraintImpl extends LocationConstraintImpl<Component, ExecutionUnit> implements ComponentAllocationConstraint {
-	/**
-	 * The default value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_SOFT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSoft = IS_SOFT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IMPLICIT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean implicit = IMPLICIT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComponentAllocationConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return LocationPackage.Literals.COMPONENT_ALLOCATION_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsSoft() {
-		return isSoft;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSoft(boolean newIsSoft) {
-		boolean oldIsSoft = isSoft;
-		isSoft = newIsSoft;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IS_SOFT, oldIsSoft, isSoft));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isImplicit() {
-		return implicit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicit(boolean newImplicit) {
-		boolean oldImplicit = implicit;
-		implicit = newImplicit;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IMPLICIT, oldImplicit, implicit));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IS_SOFT:
-				return isIsSoft();
-			case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IMPLICIT:
-				return isImplicit();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IS_SOFT:
-				setIsSoft((Boolean)newValue);
-				return;
-			case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IMPLICIT:
-				setImplicit((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IS_SOFT:
-				setIsSoft(IS_SOFT_EDEFAULT);
-				return;
-			case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IMPLICIT:
-				setImplicit(IMPLICIT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IS_SOFT:
-				return isSoft != IS_SOFT_EDEFAULT;
-			case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IMPLICIT:
-				return implicit != IMPLICIT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (derivedFeatureID) {
-				case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IS_SOFT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT;
-				case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IMPLICIT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (baseFeatureID) {
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT: return LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IS_SOFT;
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT: return LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isSoft: ");
-		result.append(isSoft);
-		result.append(", implicit: ");
-		result.append(implicit);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ComponentAllocationConstraintImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/ComponentDislocationConstraintImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/ComponentDislocationConstraintImpl.java
deleted file mode 100644
index 3275eae4..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/ComponentDislocationConstraintImpl.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-import org.fortiss.af3.exploration.model.location.ComponentDislocationConstraint;
-import org.fortiss.af3.exploration.model.location.LocationPackage;
-
-import org.fortiss.af3.platform.model.ExecutionUnit;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Component Dislocation Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.model.location.impl.ComponentDislocationConstraintImpl#isIsSoft <em>Is Soft</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.location.impl.ComponentDislocationConstraintImpl#isImplicit <em>Implicit</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ComponentDislocationConstraintImpl extends LocationConstraintImpl<Component, ExecutionUnit> implements ComponentDislocationConstraint {
-	/**
-	 * The default value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_SOFT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSoft = IS_SOFT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IMPLICIT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean implicit = IMPLICIT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComponentDislocationConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return LocationPackage.Literals.COMPONENT_DISLOCATION_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsSoft() {
-		return isSoft;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSoft(boolean newIsSoft) {
-		boolean oldIsSoft = isSoft;
-		isSoft = newIsSoft;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IS_SOFT, oldIsSoft, isSoft));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isImplicit() {
-		return implicit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicit(boolean newImplicit) {
-		boolean oldImplicit = implicit;
-		implicit = newImplicit;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IMPLICIT, oldImplicit, implicit));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IS_SOFT:
-				return isIsSoft();
-			case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IMPLICIT:
-				return isImplicit();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IS_SOFT:
-				setIsSoft((Boolean)newValue);
-				return;
-			case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IMPLICIT:
-				setImplicit((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IS_SOFT:
-				setIsSoft(IS_SOFT_EDEFAULT);
-				return;
-			case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IMPLICIT:
-				setImplicit(IMPLICIT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IS_SOFT:
-				return isSoft != IS_SOFT_EDEFAULT;
-			case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IMPLICIT:
-				return implicit != IMPLICIT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (derivedFeatureID) {
-				case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IS_SOFT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT;
-				case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IMPLICIT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (baseFeatureID) {
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT: return LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IS_SOFT;
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT: return LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isSoft: ");
-		result.append(isSoft);
-		result.append(", implicit: ");
-		result.append(implicit);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ComponentDislocationConstraintImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationConstraintImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationConstraintImpl.java
deleted file mode 100644
index ee4534a5..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationConstraintImpl.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.model.location.LocationConstraint;
-import org.fortiss.af3.exploration.model.location.LocationPackage;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.model.location.impl.LocationConstraintImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.location.impl.LocationConstraintImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.location.impl.LocationConstraintImpl#getComment <em>Comment</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.location.impl.LocationConstraintImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LocationConstraintImpl<LHT extends IModelElement, RHT extends IModelElement> extends EObjectImpl implements LocationConstraint<LHT, RHT> {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected int id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected Expression expression;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocationConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return LocationPackage.Literals.LOCATION_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(int newId) {
-		int oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LocationPackage.LOCATION_CONSTRAINT__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LocationPackage.LOCATION_CONSTRAINT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LocationPackage.LOCATION_CONSTRAINT__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression getExpression() {
-		if (expression != null && expression.eIsProxy()) {
-			InternalEObject oldExpression = (InternalEObject)expression;
-			expression = (Expression)eResolveProxy(oldExpression);
-			if (expression != oldExpression) {
-				InternalEObject newExpression = (InternalEObject)expression;
-				NotificationChain msgs = oldExpression.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LocationPackage.LOCATION_CONSTRAINT__EXPRESSION, null, null);
-				if (newExpression.eInternalContainer() == null) {
-					msgs = newExpression.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LocationPackage.LOCATION_CONSTRAINT__EXPRESSION, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, LocationPackage.LOCATION_CONSTRAINT__EXPRESSION, oldExpression, expression));
-			}
-		}
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression basicGetExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
-		Expression oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LocationPackage.LOCATION_CONSTRAINT__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(Expression newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LocationPackage.LOCATION_CONSTRAINT__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LocationPackage.LOCATION_CONSTRAINT__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LocationPackage.LOCATION_CONSTRAINT__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LHT getLeftModelElement() {
-		return LocationConstraintStaticImpl.getLeftModelElement(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RHT getRightModelElement() {
-		return LocationConstraintStaticImpl.getRightModelElement(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case LocationPackage.LOCATION_CONSTRAINT__EXPRESSION:
-				return basicSetExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case LocationPackage.LOCATION_CONSTRAINT__ID:
-				return getId();
-			case LocationPackage.LOCATION_CONSTRAINT__NAME:
-				return getName();
-			case LocationPackage.LOCATION_CONSTRAINT__COMMENT:
-				return getComment();
-			case LocationPackage.LOCATION_CONSTRAINT__EXPRESSION:
-				if (resolve) return getExpression();
-				return basicGetExpression();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case LocationPackage.LOCATION_CONSTRAINT__ID:
-				setId((Integer)newValue);
-				return;
-			case LocationPackage.LOCATION_CONSTRAINT__NAME:
-				setName((String)newValue);
-				return;
-			case LocationPackage.LOCATION_CONSTRAINT__COMMENT:
-				setComment((String)newValue);
-				return;
-			case LocationPackage.LOCATION_CONSTRAINT__EXPRESSION:
-				setExpression((Expression)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case LocationPackage.LOCATION_CONSTRAINT__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case LocationPackage.LOCATION_CONSTRAINT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case LocationPackage.LOCATION_CONSTRAINT__COMMENT:
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case LocationPackage.LOCATION_CONSTRAINT__EXPRESSION:
-				setExpression((Expression)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case LocationPackage.LOCATION_CONSTRAINT__ID:
-				return id != ID_EDEFAULT;
-			case LocationPackage.LOCATION_CONSTRAINT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case LocationPackage.LOCATION_CONSTRAINT__COMMENT:
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case LocationPackage.LOCATION_CONSTRAINT__EXPRESSION:
-				return expression != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (derivedFeatureID) {
-				case LocationPackage.LOCATION_CONSTRAINT__EXPRESSION: return ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (baseFeatureID) {
-				case ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION: return LocationPackage.LOCATION_CONSTRAINT__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", comment: ");
-		result.append(comment);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LocationConstraintImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationFactoryImpl.java
deleted file mode 100644
index e46d2ac4..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationFactoryImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.model.location.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class LocationFactoryImpl extends EFactoryImpl implements LocationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static LocationFactory init() {
-		try {
-			LocationFactory theLocationFactory = (LocationFactory)EPackage.Registry.INSTANCE.getEFactory(LocationPackage.eNS_URI);
-			if (theLocationFactory != null) {
-				return theLocationFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new LocationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case LocationPackage.LOCATION_CONSTRAINT: return createLocationConstraint();
-			case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT: return createComponentAllocationConstraint();
-			case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT: return createComponentDislocationConstraint();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <LHT extends IModelElement, RHT extends IModelElement> LocationConstraint<LHT, RHT> createLocationConstraint() {
-		LocationConstraintImpl<LHT, RHT> locationConstraint = new LocationConstraintImpl<LHT, RHT>();
-		return locationConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComponentAllocationConstraint createComponentAllocationConstraint() {
-		ComponentAllocationConstraintImpl componentAllocationConstraint = new ComponentAllocationConstraintImpl();
-		return componentAllocationConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComponentDislocationConstraint createComponentDislocationConstraint() {
-		ComponentDislocationConstraintImpl componentDislocationConstraint = new ComponentDislocationConstraintImpl();
-		return componentDislocationConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocationPackage getLocationPackage() {
-		return (LocationPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static LocationPackage getPackage() {
-		return LocationPackage.eINSTANCE;
-	}
-
-} //LocationFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationPackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationPackageImpl.java
deleted file mode 100644
index 15449864..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/impl/LocationPackageImpl.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.ETypeParameter;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.component.model.AF3ComponentPackage;
-
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.model.CommonPackage;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-
-import org.fortiss.af3.exploration.model.impl.CommonPackageImpl;
-
-import org.fortiss.af3.exploration.model.location.ComponentAllocationConstraint;
-import org.fortiss.af3.exploration.model.location.ComponentDislocationConstraint;
-import org.fortiss.af3.exploration.model.location.LocationConstraint;
-import org.fortiss.af3.exploration.model.location.LocationDimension;
-import org.fortiss.af3.exploration.model.location.LocationFactory;
-import org.fortiss.af3.exploration.model.location.LocationPackage;
-
-import org.fortiss.af3.exploration.model.time.TimePackage;
-
-import org.fortiss.af3.exploration.model.time.impl.TimePackageImpl;
-
-import org.fortiss.af3.platform.model.AF3PlatformPackage;
-
-import org.fortiss.tooling.base.model.element.ElementPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class LocationPackageImpl extends EPackageImpl implements LocationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass locationDimensionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass locationConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass componentAllocationConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass componentDislocationConstraintEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.model.location.LocationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private LocationPackageImpl() {
-		super(eNS_URI, LocationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link LocationPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static LocationPackage init() {
-		if (isInited) return (LocationPackage)EPackage.Registry.INSTANCE.getEPackage(LocationPackage.eNS_URI);
-
-		// Obtain or create and register package
-		LocationPackageImpl theLocationPackage = (LocationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LocationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LocationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ModelPackage.eINSTANCE.eClass();
-		ExplorationPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		TimePackageImpl theTimePackage = (TimePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TimePackage.eNS_URI) instanceof TimePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TimePackage.eNS_URI) : TimePackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theLocationPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theTimePackage.createPackageContents();
-
-		// Initialize created meta-data
-		theLocationPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theTimePackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theLocationPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(LocationPackage.eNS_URI, theLocationPackage);
-		return theLocationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocationDimension() {
-		return locationDimensionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocationConstraint() {
-		return locationConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getComponentAllocationConstraint() {
-		return componentAllocationConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getComponentDislocationConstraint() {
-		return componentDislocationConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocationFactory getLocationFactory() {
-		return (LocationFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		locationDimensionEClass = createEClass(LOCATION_DIMENSION);
-
-		locationConstraintEClass = createEClass(LOCATION_CONSTRAINT);
-
-		componentAllocationConstraintEClass = createEClass(COMPONENT_ALLOCATION_CONSTRAINT);
-
-		componentDislocationConstraintEClass = createEClass(COMPONENT_DISLOCATION_CONSTRAINT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ExplorationPackage theExplorationPackage = (ExplorationPackage)EPackage.Registry.INSTANCE.getEPackage(ExplorationPackage.eNS_URI);
-		ElementPackage theElementPackage = (ElementPackage)EPackage.Registry.INSTANCE.getEPackage(ElementPackage.eNS_URI);
-		ModelPackage theModelPackage = (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
-		AF3ComponentPackage theAF3ComponentPackage = (AF3ComponentPackage)EPackage.Registry.INSTANCE.getEPackage(AF3ComponentPackage.eNS_URI);
-		AF3PlatformPackage theAF3PlatformPackage = (AF3PlatformPackage)EPackage.Registry.INSTANCE.getEPackage(AF3PlatformPackage.eNS_URI);
-
-		// Create type parameters
-		ETypeParameter locationConstraintEClass_LHT = addETypeParameter(locationConstraintEClass, "LHT");
-		ETypeParameter locationConstraintEClass_RHT = addETypeParameter(locationConstraintEClass, "RHT");
-
-		// Set bounds for type parameters
-		EGenericType g1 = createEGenericType(theElementPackage.getIModelElement());
-		locationConstraintEClass_LHT.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		locationConstraintEClass_RHT.getEBounds().add(g1);
-
-		// Add supertypes to classes
-		locationDimensionEClass.getESuperTypes().add(theExplorationPackage.getIProblemDimension());
-		locationConstraintEClass.getESuperTypes().add(this.getLocationDimension());
-		locationConstraintEClass.getESuperTypes().add(theModelPackage.getMOEAExplorationExpression());
-		g1 = createEGenericType(this.getLocationConstraint());
-		EGenericType g2 = createEGenericType(theAF3ComponentPackage.getComponent());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(theAF3PlatformPackage.getExecutionUnit());
-		g1.getETypeArguments().add(g2);
-		componentAllocationConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExplorationPackage.getExplorationConstraint());
-		g2 = createEGenericType(ecorePackage.getEBooleanObject());
-		g1.getETypeArguments().add(g2);
-		componentAllocationConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getLocationConstraint());
-		g2 = createEGenericType(theAF3ComponentPackage.getComponent());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(theAF3PlatformPackage.getExecutionUnit());
-		g1.getETypeArguments().add(g2);
-		componentDislocationConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExplorationPackage.getExplorationConstraint());
-		g2 = createEGenericType(ecorePackage.getEBooleanObject());
-		g1.getETypeArguments().add(g2);
-		componentDislocationConstraintEClass.getEGenericSuperTypes().add(g1);
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(locationDimensionEClass, LocationDimension.class, "LocationDimension", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(locationConstraintEClass, LocationConstraint.class, "LocationConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		EOperation op = addEOperation(locationConstraintEClass, null, "getLeftModelElement", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(locationConstraintEClass_LHT);
-		initEOperation(op, g1);
-
-		op = addEOperation(locationConstraintEClass, null, "getRightModelElement", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(locationConstraintEClass_RHT);
-		initEOperation(op, g1);
-
-		initEClass(componentAllocationConstraintEClass, ComponentAllocationConstraint.class, "ComponentAllocationConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(componentDislocationConstraintEClass, ComponentDislocationConstraint.class, "ComponentDislocationConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-	}
-
-} //LocationPackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/util/LocationAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/util/LocationAdapterFactory.java
deleted file mode 100644
index 42225bff..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/util/LocationAdapterFactory.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-import org.fortiss.af3.exploration.model.IProblemDimension;
-
-import org.fortiss.af3.exploration.model.location.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-import org.fortiss.tooling.kernel.model.IIdLabeled;
-import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.model.INamedElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.location.LocationPackage
- * @generated
- */
-public class LocationAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static LocationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = LocationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocationSwitch<Adapter> modelSwitch =
-		new LocationSwitch<Adapter>() {
-			@Override
-			public Adapter caseLocationDimension(LocationDimension object) {
-				return createLocationDimensionAdapter();
-			}
-			@Override
-			public <LHT extends IModelElement, RHT extends IModelElement> Adapter caseLocationConstraint(LocationConstraint<LHT, RHT> object) {
-				return createLocationConstraintAdapter();
-			}
-			@Override
-			public Adapter caseComponentAllocationConstraint(ComponentAllocationConstraint object) {
-				return createComponentAllocationConstraintAdapter();
-			}
-			@Override
-			public Adapter caseComponentDislocationConstraint(ComponentDislocationConstraint object) {
-				return createComponentDislocationConstraintAdapter();
-			}
-			@Override
-			public Adapter caseIIdLabeled(IIdLabeled object) {
-				return createIIdLabeledAdapter();
-			}
-			@Override
-			public Adapter caseINamedElement(INamedElement object) {
-				return createINamedElementAdapter();
-			}
-			@Override
-			public Adapter caseINamedCommentedElement(INamedCommentedElement object) {
-				return createINamedCommentedElementAdapter();
-			}
-			@Override
-			public Adapter caseIProblemDimension(IProblemDimension object) {
-				return createIProblemDimensionAdapter();
-			}
-			@Override
-			public Adapter caseMOEAExplorationExpression(MOEAExplorationExpression object) {
-				return createMOEAExplorationExpressionAdapter();
-			}
-			@Override
-			public <T> Adapter caseExplorationTarget(ExplorationTarget<T> object) {
-				return createExplorationTargetAdapter();
-			}
-			@Override
-			public <T> Adapter caseExplorationConstraint(ExplorationConstraint<T> object) {
-				return createExplorationConstraintAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.location.LocationDimension <em>Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.location.LocationDimension
-	 * @generated
-	 */
-	public Adapter createLocationDimensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.location.LocationConstraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.location.LocationConstraint
-	 * @generated
-	 */
-	public Adapter createLocationConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.location.ComponentAllocationConstraint <em>Component Allocation Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.location.ComponentAllocationConstraint
-	 * @generated
-	 */
-	public Adapter createComponentAllocationConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.location.ComponentDislocationConstraint <em>Component Dislocation Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.location.ComponentDislocationConstraint
-	 * @generated
-	 */
-	public Adapter createComponentDislocationConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.IIdLabeled <em>IId Labeled</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.IIdLabeled
-	 * @generated
-	 */
-	public Adapter createIIdLabeledAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.INamedElement <em>INamed Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.INamedElement
-	 * @generated
-	 */
-	public Adapter createINamedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.INamedCommentedElement <em>INamed Commented Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.INamedCommentedElement
-	 * @generated
-	 */
-	public Adapter createINamedCommentedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.IProblemDimension <em>IProblem Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.IProblemDimension
-	 * @generated
-	 */
-	public Adapter createIProblemDimensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression <em>MOEA Exploration Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression
-	 * @generated
-	 */
-	public Adapter createMOEAExplorationExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.ExplorationTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.ExplorationTarget
-	 * @generated
-	 */
-	public Adapter createExplorationTargetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.ExplorationConstraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.ExplorationConstraint
-	 * @generated
-	 */
-	public Adapter createExplorationConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //LocationAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/util/LocationSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/util/LocationSwitch.java
deleted file mode 100644
index 9e549876..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/location/util/LocationSwitch.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.location.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-import org.fortiss.af3.exploration.model.IProblemDimension;
-
-import org.fortiss.af3.exploration.model.location.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-import org.fortiss.tooling.kernel.model.IIdLabeled;
-import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.model.INamedElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.location.LocationPackage
- * @generated
- */
-public class LocationSwitch<T1> extends Switch<T1> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static LocationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = LocationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T1 doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case LocationPackage.LOCATION_DIMENSION: {
-				LocationDimension locationDimension = (LocationDimension)theEObject;
-				T1 result = caseLocationDimension(locationDimension);
-				if (result == null) result = caseIProblemDimension(locationDimension);
-				if (result == null) result = caseINamedCommentedElement(locationDimension);
-				if (result == null) result = caseINamedElement(locationDimension);
-				if (result == null) result = caseIIdLabeled(locationDimension);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case LocationPackage.LOCATION_CONSTRAINT: {
-				LocationConstraint<?, ?> locationConstraint = (LocationConstraint<?, ?>)theEObject;
-				T1 result = caseLocationConstraint(locationConstraint);
-				if (result == null) result = caseLocationDimension(locationConstraint);
-				if (result == null) result = caseMOEAExplorationExpression(locationConstraint);
-				if (result == null) result = caseIProblemDimension(locationConstraint);
-				if (result == null) result = caseINamedCommentedElement(locationConstraint);
-				if (result == null) result = caseINamedElement(locationConstraint);
-				if (result == null) result = caseIIdLabeled(locationConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case LocationPackage.COMPONENT_ALLOCATION_CONSTRAINT: {
-				ComponentAllocationConstraint componentAllocationConstraint = (ComponentAllocationConstraint)theEObject;
-				T1 result = caseComponentAllocationConstraint(componentAllocationConstraint);
-				if (result == null) result = caseLocationConstraint(componentAllocationConstraint);
-				if (result == null) result = caseExplorationConstraint(componentAllocationConstraint);
-				if (result == null) result = caseLocationDimension(componentAllocationConstraint);
-				if (result == null) result = caseMOEAExplorationExpression(componentAllocationConstraint);
-				if (result == null) result = caseExplorationTarget(componentAllocationConstraint);
-				if (result == null) result = caseIProblemDimension(componentAllocationConstraint);
-				if (result == null) result = caseINamedCommentedElement(componentAllocationConstraint);
-				if (result == null) result = caseINamedElement(componentAllocationConstraint);
-				if (result == null) result = caseIIdLabeled(componentAllocationConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case LocationPackage.COMPONENT_DISLOCATION_CONSTRAINT: {
-				ComponentDislocationConstraint componentDislocationConstraint = (ComponentDislocationConstraint)theEObject;
-				T1 result = caseComponentDislocationConstraint(componentDislocationConstraint);
-				if (result == null) result = caseLocationConstraint(componentDislocationConstraint);
-				if (result == null) result = caseExplorationConstraint(componentDislocationConstraint);
-				if (result == null) result = caseLocationDimension(componentDislocationConstraint);
-				if (result == null) result = caseMOEAExplorationExpression(componentDislocationConstraint);
-				if (result == null) result = caseExplorationTarget(componentDislocationConstraint);
-				if (result == null) result = caseIProblemDimension(componentDislocationConstraint);
-				if (result == null) result = caseINamedCommentedElement(componentDislocationConstraint);
-				if (result == null) result = caseINamedElement(componentDislocationConstraint);
-				if (result == null) result = caseIIdLabeled(componentDislocationConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Dimension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseLocationDimension(LocationDimension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <LHT extends IModelElement, RHT extends IModelElement> T1 caseLocationConstraint(LocationConstraint<LHT, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Component Allocation Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Component Allocation Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseComponentAllocationConstraint(ComponentAllocationConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Component Dislocation Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Component Dislocation Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseComponentDislocationConstraint(ComponentDislocationConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IId Labeled</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IId Labeled</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseIIdLabeled(IIdLabeled object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseINamedElement(INamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>INamed Commented Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>INamed Commented Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseINamedCommentedElement(INamedCommentedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IProblem Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IProblem Dimension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseIProblemDimension(IProblemDimension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>MOEA Exploration Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>MOEA Exploration Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseMOEAExplorationExpression(MOEAExplorationExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Target</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseExplorationTarget(ExplorationTarget<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseExplorationConstraint(ExplorationConstraint<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T1 defaultCase(EObject object) {
-		return null;
-	}
-
-} //LocationSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/DeadlineComp.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/DeadlineComp.java
deleted file mode 100644
index 2c33ffbc..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/DeadlineComp.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp;
-
-import org.fortiss.af3.exploration.dsl.model.types.NumberLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Deadline Comp</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.model.time.TimePackage#getDeadlineComp()
- * @model superTypes="org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp<org.eclipse.emf.ecore.EDoubleObject, org.fortiss.af3.exploration.model.time.LatencyCalc, org.fortiss.af3.exploration.dsl.model.types.NumberLiteral<org.eclipse.emf.ecore.EDoubleObject>>"
- * @generated
- */
-public interface DeadlineComp extends ComparisonOp<Double, LatencyCalc, NumberLiteral<Double>> {
-} // DeadlineComp
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/DeadlineConstraint.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/DeadlineConstraint.java
deleted file mode 100644
index e2e9d39a..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/DeadlineConstraint.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Deadline Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * TODO: write documentation (in the model!)
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.model.time.TimePackage#getDeadlineConstraint()
- * @model superTypes="org.fortiss.af3.exploration.model.time.TimeDimension org.fortiss.af3.exploration.model.ExplorationConstraint<org.eclipse.emf.ecore.EDoubleObject> org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression"
- * @generated
- */
-public interface DeadlineConstraint extends TimeDimension, ExplorationConstraint<Double>, MOEAExplorationExpression {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * TODO: write documentation (in the model!)
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return getDeadline();'"
-	 * @generated
-	 */
-	Double getLimitation();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Returns the {@link Component} whose start execution time defines the beginning of the deadline.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return DeadlineConstraintStaticImpl.getStartComponent(this);'"
-	 * @generated
-	 */
-	Component getStartComponent();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Sets the {@link Component} whose start execution time defines the beginning of the deadline.
-	 * <!-- end-model-doc -->
-	 * @model componentRequired="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='DeadlineConstraintStaticImpl.setStartComponent(this, component);'"
-	 * @generated
-	 */
-	void setStartComponent(Component component);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Returns the {@link Component} whose execution end time must may not be beyond the deadline.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return DeadlineConstraintStaticImpl.getEndComponent(this);'"
-	 * @generated
-	 */
-	Component getEndComponent();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Sets the {@link Component} whose execution end time must may not be beyond the deadline.
-	 * <!-- end-model-doc -->
-	 * @model componentRequired="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='DeadlineConstraintStaticImpl.setEndComponent(this, component);'"
-	 * @generated
-	 */
-	void setEndComponent(Component component);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Returns the deadline value that defines the maximally allowed latency between the start time of the start{@link Component} and the finish time of the end{@link Component}.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return DeadlineConstraintStaticImpl.getDeadline(this);'"
-	 * @generated
-	 */
-	Double getDeadline();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Returns the deadline value that defines the maximally allowed latency between the start time of the start{@link Component} and the finish time of the end{@link Component}.
-	 * <!-- end-model-doc -->
-	 * @model periodRequired="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='DeadlineConstraintStaticImpl.setDeadline(this, period);'"
-	 * @generated
-	 */
-	void setDeadline(Double period);
-
-} // DeadlineConstraint
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/LatencyCalc.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/LatencyCalc.java
deleted file mode 100644
index 0538a304..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/LatencyCalc.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Latency Calc</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.model.time.TimePackage#getLatencyCalc()
- * @model superTypes="org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression<org.eclipse.emf.ecore.EDoubleObject>"
- * @generated
- */
-public interface LatencyCalc extends ArithmeticExpression<Double> {
-} // LatencyCalc
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/PeriodConstraint.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/PeriodConstraint.java
deleted file mode 100644
index 8bf09ad8..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/PeriodConstraint.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Period Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.model.time.TimePackage#getPeriodConstraint()
- * @model superTypes="org.fortiss.af3.exploration.model.time.TimeDimension org.fortiss.af3.exploration.model.ExplorationConstraint<org.eclipse.emf.ecore.EDoubleObject> org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression"
- * @generated
- */
-public interface PeriodConstraint extends TimeDimension, ExplorationConstraint<Double>, MOEAExplorationExpression {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return getPeriod();'"
-	 * @generated
-	 */
-	Double getLimitation();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY. Returns the {@link Component} for which a defined period must hold.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return PeriodConstraintStaticImpl.getComponent(this);'"
-	 * @generated
-	 */
-	Component getComponent();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY. Sets the {@link Component} for which a defined period must hold, i.e. the {@link Component} must be scheduled within this time frame.
-	 * <!-- end-model-doc -->
-	 * @model componentRequired="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='PeriodConstraintStaticImpl.setComponent(this, component);'"
-	 * @generated
-	 */
-	void setComponent(Component component);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY. Returns the period value which is defined in {@code this} {@link ExplorationConstraint}.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return PeriodConstraintStaticImpl.getPeriod(this);'"
-	 * @generated
-	 */
-	Double getPeriod();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY. Sets the period which must be kept by this constraint's referenced {@link Component}, i.e. the {@link Component} must be scheduled within this time frame.
-	 * <!-- end-model-doc -->
-	 * @model periodRequired="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='PeriodConstraintStaticImpl.setPeriod(this, period);'"
-	 * @generated
-	 */
-	void setPeriod(Double period);
-
-} // PeriodConstraint
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimeDimension.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimeDimension.java
deleted file mode 100644
index f9a57372..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimeDimension.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time;
-
-import org.fortiss.af3.exploration.model.IProblemDimension;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dimension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * {@link IProblemDimension} to mark {@link ExplorationTarget}s that operate on temporal properties.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.model.time.TimePackage#getTimeDimension()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface TimeDimension extends IProblemDimension {
-} // TimeDimension
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimeFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimeFactory.java
deleted file mode 100644
index d0e5eddb..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimeFactory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.time.TimePackage
- * @generated
- */
-public interface TimeFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TimeFactory eINSTANCE = org.fortiss.af3.exploration.model.time.impl.TimeFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Deadline Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Deadline Constraint</em>'.
-	 * @generated
-	 */
-	DeadlineConstraint createDeadlineConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Latency Calc</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Latency Calc</em>'.
-	 * @generated
-	 */
-	LatencyCalc createLatencyCalc();
-
-	/**
-	 * Returns a new object of class '<em>Deadline Comp</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Deadline Comp</em>'.
-	 * @generated
-	 */
-	DeadlineComp createDeadlineComp();
-
-	/**
-	 * Returns a new object of class '<em>Period Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Period Constraint</em>'.
-	 * @generated
-	 */
-	PeriodConstraint createPeriodConstraint();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	TimePackage getTimePackage();
-
-} //TimeFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimePackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimePackage.java
deleted file mode 100644
index e2a383fa..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/TimePackage.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.time.TimeFactory
- * @model kind="package"
- * @generated
- */
-public interface TimePackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "time";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/common/time";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-common-time";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TimePackage eINSTANCE = org.fortiss.af3.exploration.model.time.impl.TimePackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.model.time.TimeDimension <em>Dimension</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.model.time.TimeDimension
-	 * @see org.fortiss.af3.exploration.model.time.impl.TimePackageImpl#getTimeDimension()
-	 * @generated
-	 */
-	int TIME_DIMENSION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_DIMENSION__ID = ExplorationPackage.IPROBLEM_DIMENSION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_DIMENSION__NAME = ExplorationPackage.IPROBLEM_DIMENSION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_DIMENSION__COMMENT = ExplorationPackage.IPROBLEM_DIMENSION__COMMENT;
-
-	/**
-	 * The number of structural features of the '<em>Dimension</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_DIMENSION_FEATURE_COUNT = ExplorationPackage.IPROBLEM_DIMENSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.model.time.impl.DeadlineConstraintImpl <em>Deadline Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.model.time.impl.DeadlineConstraintImpl
-	 * @see org.fortiss.af3.exploration.model.time.impl.TimePackageImpl#getDeadlineConstraint()
-	 * @generated
-	 */
-	int DEADLINE_CONSTRAINT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEADLINE_CONSTRAINT__ID = TIME_DIMENSION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEADLINE_CONSTRAINT__NAME = TIME_DIMENSION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEADLINE_CONSTRAINT__COMMENT = TIME_DIMENSION__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Is Soft</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEADLINE_CONSTRAINT__IS_SOFT = TIME_DIMENSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Implicit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEADLINE_CONSTRAINT__IMPLICIT = TIME_DIMENSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEADLINE_CONSTRAINT__EXPRESSION = TIME_DIMENSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Deadline Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEADLINE_CONSTRAINT_FEATURE_COUNT = TIME_DIMENSION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.model.time.impl.LatencyCalcImpl <em>Latency Calc</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.model.time.impl.LatencyCalcImpl
-	 * @see org.fortiss.af3.exploration.model.time.impl.TimePackageImpl#getLatencyCalc()
-	 * @generated
-	 */
-	int LATENCY_CALC = 2;
-
-	/**
-	 * The number of structural features of the '<em>Latency Calc</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LATENCY_CALC_FEATURE_COUNT = ExpressionsPackage.ARITHMETIC_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.model.time.impl.DeadlineCompImpl <em>Deadline Comp</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.model.time.impl.DeadlineCompImpl
-	 * @see org.fortiss.af3.exploration.model.time.impl.TimePackageImpl#getDeadlineComp()
-	 * @generated
-	 */
-	int DEADLINE_COMP = 3;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEADLINE_COMP__OPERATOR = OperatorsPackage.COMPARISON_OP__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEADLINE_COMP__RIGHT = OperatorsPackage.COMPARISON_OP__RIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEADLINE_COMP__LEFT = OperatorsPackage.COMPARISON_OP__LEFT;
-
-	/**
-	 * The number of structural features of the '<em>Deadline Comp</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEADLINE_COMP_FEATURE_COUNT = OperatorsPackage.COMPARISON_OP_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.model.time.impl.PeriodConstraintImpl <em>Period Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.model.time.impl.PeriodConstraintImpl
-	 * @see org.fortiss.af3.exploration.model.time.impl.TimePackageImpl#getPeriodConstraint()
-	 * @generated
-	 */
-	int PERIOD_CONSTRAINT = 4;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERIOD_CONSTRAINT__ID = TIME_DIMENSION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERIOD_CONSTRAINT__NAME = TIME_DIMENSION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERIOD_CONSTRAINT__COMMENT = TIME_DIMENSION__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Is Soft</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERIOD_CONSTRAINT__IS_SOFT = TIME_DIMENSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Implicit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERIOD_CONSTRAINT__IMPLICIT = TIME_DIMENSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERIOD_CONSTRAINT__EXPRESSION = TIME_DIMENSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Period Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERIOD_CONSTRAINT_FEATURE_COUNT = TIME_DIMENSION_FEATURE_COUNT + 3;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.model.time.TimeDimension <em>Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Dimension</em>'.
-	 * @see org.fortiss.af3.exploration.model.time.TimeDimension
-	 * @generated
-	 */
-	EClass getTimeDimension();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.model.time.DeadlineConstraint <em>Deadline Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Deadline Constraint</em>'.
-	 * @see org.fortiss.af3.exploration.model.time.DeadlineConstraint
-	 * @generated
-	 */
-	EClass getDeadlineConstraint();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.model.time.LatencyCalc <em>Latency Calc</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Latency Calc</em>'.
-	 * @see org.fortiss.af3.exploration.model.time.LatencyCalc
-	 * @generated
-	 */
-	EClass getLatencyCalc();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.model.time.DeadlineComp <em>Deadline Comp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Deadline Comp</em>'.
-	 * @see org.fortiss.af3.exploration.model.time.DeadlineComp
-	 * @generated
-	 */
-	EClass getDeadlineComp();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.model.time.PeriodConstraint <em>Period Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Period Constraint</em>'.
-	 * @see org.fortiss.af3.exploration.model.time.PeriodConstraint
-	 * @generated
-	 */
-	EClass getPeriodConstraint();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	TimeFactory getTimeFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.model.time.TimeDimension <em>Dimension</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.model.time.TimeDimension
-		 * @see org.fortiss.af3.exploration.model.time.impl.TimePackageImpl#getTimeDimension()
-		 * @generated
-		 */
-		EClass TIME_DIMENSION = eINSTANCE.getTimeDimension();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.model.time.impl.DeadlineConstraintImpl <em>Deadline Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.model.time.impl.DeadlineConstraintImpl
-		 * @see org.fortiss.af3.exploration.model.time.impl.TimePackageImpl#getDeadlineConstraint()
-		 * @generated
-		 */
-		EClass DEADLINE_CONSTRAINT = eINSTANCE.getDeadlineConstraint();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.model.time.impl.LatencyCalcImpl <em>Latency Calc</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.model.time.impl.LatencyCalcImpl
-		 * @see org.fortiss.af3.exploration.model.time.impl.TimePackageImpl#getLatencyCalc()
-		 * @generated
-		 */
-		EClass LATENCY_CALC = eINSTANCE.getLatencyCalc();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.model.time.impl.DeadlineCompImpl <em>Deadline Comp</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.model.time.impl.DeadlineCompImpl
-		 * @see org.fortiss.af3.exploration.model.time.impl.TimePackageImpl#getDeadlineComp()
-		 * @generated
-		 */
-		EClass DEADLINE_COMP = eINSTANCE.getDeadlineComp();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.model.time.impl.PeriodConstraintImpl <em>Period Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.model.time.impl.PeriodConstraintImpl
-		 * @see org.fortiss.af3.exploration.model.time.impl.TimePackageImpl#getPeriodConstraint()
-		 * @generated
-		 */
-		EClass PERIOD_CONSTRAINT = eINSTANCE.getPeriodConstraint();
-
-	}
-
-} //TimePackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/DeadlineCompImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/DeadlineCompImpl.java
deleted file mode 100644
index 07d0e035..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/DeadlineCompImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.exploration.dsl.model.operators.impl.ComparisonOpImpl;
-
-import org.fortiss.af3.exploration.dsl.model.types.NumberLiteral;
-
-import org.fortiss.af3.exploration.model.time.DeadlineComp;
-import org.fortiss.af3.exploration.model.time.LatencyCalc;
-import org.fortiss.af3.exploration.model.time.TimePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Deadline Comp</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DeadlineCompImpl extends ComparisonOpImpl<Double, LatencyCalc, NumberLiteral<Double>> implements DeadlineComp {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeadlineCompImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TimePackage.Literals.DEADLINE_COMP;
-	}
-
-} //DeadlineCompImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/DeadlineConstraintImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/DeadlineConstraintImpl.java
deleted file mode 100644
index a599d689..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/DeadlineConstraintImpl.java
+++ /dev/null
@@ -1,613 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-import org.fortiss.af3.exploration.model.time.DeadlineConstraint;
-import org.fortiss.af3.exploration.model.time.TimePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Deadline Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.DeadlineConstraintImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.DeadlineConstraintImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.DeadlineConstraintImpl#getComment <em>Comment</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.DeadlineConstraintImpl#isIsSoft <em>Is Soft</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.DeadlineConstraintImpl#isImplicit <em>Implicit</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.DeadlineConstraintImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeadlineConstraintImpl extends EObjectImpl implements DeadlineConstraint {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected int id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_SOFT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSoft = IS_SOFT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IMPLICIT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean implicit = IMPLICIT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected Expression expression;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeadlineConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TimePackage.Literals.DEADLINE_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(int newId) {
-		int oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.DEADLINE_CONSTRAINT__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.DEADLINE_CONSTRAINT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.DEADLINE_CONSTRAINT__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsSoft() {
-		return isSoft;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSoft(boolean newIsSoft) {
-		boolean oldIsSoft = isSoft;
-		isSoft = newIsSoft;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.DEADLINE_CONSTRAINT__IS_SOFT, oldIsSoft, isSoft));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isImplicit() {
-		return implicit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicit(boolean newImplicit) {
-		boolean oldImplicit = implicit;
-		implicit = newImplicit;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.DEADLINE_CONSTRAINT__IMPLICIT, oldImplicit, implicit));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression getExpression() {
-		if (expression != null && expression.eIsProxy()) {
-			InternalEObject oldExpression = (InternalEObject)expression;
-			expression = (Expression)eResolveProxy(oldExpression);
-			if (expression != oldExpression) {
-				InternalEObject newExpression = (InternalEObject)expression;
-				NotificationChain msgs = oldExpression.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TimePackage.DEADLINE_CONSTRAINT__EXPRESSION, null, null);
-				if (newExpression.eInternalContainer() == null) {
-					msgs = newExpression.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TimePackage.DEADLINE_CONSTRAINT__EXPRESSION, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimePackage.DEADLINE_CONSTRAINT__EXPRESSION, oldExpression, expression));
-			}
-		}
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression basicGetExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
-		Expression oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TimePackage.DEADLINE_CONSTRAINT__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(Expression newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TimePackage.DEADLINE_CONSTRAINT__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TimePackage.DEADLINE_CONSTRAINT__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.DEADLINE_CONSTRAINT__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getLimitation() {
-		return getDeadline();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Component getStartComponent() {
-		return DeadlineConstraintStaticImpl.getStartComponent(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStartComponent(final Component component) {
-		DeadlineConstraintStaticImpl.setStartComponent(this, component);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Component getEndComponent() {
-		return DeadlineConstraintStaticImpl.getEndComponent(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEndComponent(final Component component) {
-		DeadlineConstraintStaticImpl.setEndComponent(this, component);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getDeadline() {
-		return DeadlineConstraintStaticImpl.getDeadline(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDeadline(final Double period) {
-		DeadlineConstraintStaticImpl.setDeadline(this, period);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TimePackage.DEADLINE_CONSTRAINT__EXPRESSION:
-				return basicSetExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimePackage.DEADLINE_CONSTRAINT__ID:
-				return getId();
-			case TimePackage.DEADLINE_CONSTRAINT__NAME:
-				return getName();
-			case TimePackage.DEADLINE_CONSTRAINT__COMMENT:
-				return getComment();
-			case TimePackage.DEADLINE_CONSTRAINT__IS_SOFT:
-				return isIsSoft();
-			case TimePackage.DEADLINE_CONSTRAINT__IMPLICIT:
-				return isImplicit();
-			case TimePackage.DEADLINE_CONSTRAINT__EXPRESSION:
-				if (resolve) return getExpression();
-				return basicGetExpression();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimePackage.DEADLINE_CONSTRAINT__ID:
-				setId((Integer)newValue);
-				return;
-			case TimePackage.DEADLINE_CONSTRAINT__NAME:
-				setName((String)newValue);
-				return;
-			case TimePackage.DEADLINE_CONSTRAINT__COMMENT:
-				setComment((String)newValue);
-				return;
-			case TimePackage.DEADLINE_CONSTRAINT__IS_SOFT:
-				setIsSoft((Boolean)newValue);
-				return;
-			case TimePackage.DEADLINE_CONSTRAINT__IMPLICIT:
-				setImplicit((Boolean)newValue);
-				return;
-			case TimePackage.DEADLINE_CONSTRAINT__EXPRESSION:
-				setExpression((Expression)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimePackage.DEADLINE_CONSTRAINT__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case TimePackage.DEADLINE_CONSTRAINT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case TimePackage.DEADLINE_CONSTRAINT__COMMENT:
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case TimePackage.DEADLINE_CONSTRAINT__IS_SOFT:
-				setIsSoft(IS_SOFT_EDEFAULT);
-				return;
-			case TimePackage.DEADLINE_CONSTRAINT__IMPLICIT:
-				setImplicit(IMPLICIT_EDEFAULT);
-				return;
-			case TimePackage.DEADLINE_CONSTRAINT__EXPRESSION:
-				setExpression((Expression)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimePackage.DEADLINE_CONSTRAINT__ID:
-				return id != ID_EDEFAULT;
-			case TimePackage.DEADLINE_CONSTRAINT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case TimePackage.DEADLINE_CONSTRAINT__COMMENT:
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case TimePackage.DEADLINE_CONSTRAINT__IS_SOFT:
-				return isSoft != IS_SOFT_EDEFAULT;
-			case TimePackage.DEADLINE_CONSTRAINT__IMPLICIT:
-				return implicit != IMPLICIT_EDEFAULT;
-			case TimePackage.DEADLINE_CONSTRAINT__EXPRESSION:
-				return expression != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (derivedFeatureID) {
-				case TimePackage.DEADLINE_CONSTRAINT__IS_SOFT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT;
-				case TimePackage.DEADLINE_CONSTRAINT__IMPLICIT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (derivedFeatureID) {
-				case TimePackage.DEADLINE_CONSTRAINT__EXPRESSION: return ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (baseFeatureID) {
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT: return TimePackage.DEADLINE_CONSTRAINT__IS_SOFT;
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT: return TimePackage.DEADLINE_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (baseFeatureID) {
-				case ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION: return TimePackage.DEADLINE_CONSTRAINT__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", comment: ");
-		result.append(comment);
-		result.append(", isSoft: ");
-		result.append(isSoft);
-		result.append(", implicit: ");
-		result.append(implicit);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DeadlineConstraintImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/LatencyCalcImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/LatencyCalcImpl.java
deleted file mode 100644
index f9e060cc..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/LatencyCalcImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.model.time.LatencyCalc;
-import org.fortiss.af3.exploration.model.time.TimePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Latency Calc</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class LatencyCalcImpl extends EObjectImpl implements LatencyCalc {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LatencyCalcImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TimePackage.Literals.LATENCY_CALC;
-	}
-
-} //LatencyCalcImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/PeriodConstraintImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/PeriodConstraintImpl.java
deleted file mode 100644
index 43a1b7dc..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/PeriodConstraintImpl.java
+++ /dev/null
@@ -1,595 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-import org.fortiss.af3.exploration.model.time.PeriodConstraint;
-import org.fortiss.af3.exploration.model.time.TimePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Period Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.PeriodConstraintImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.PeriodConstraintImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.PeriodConstraintImpl#getComment <em>Comment</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.PeriodConstraintImpl#isIsSoft <em>Is Soft</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.PeriodConstraintImpl#isImplicit <em>Implicit</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.model.time.impl.PeriodConstraintImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PeriodConstraintImpl extends EObjectImpl implements PeriodConstraint {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected int id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_SOFT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSoft = IS_SOFT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IMPLICIT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean implicit = IMPLICIT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected Expression expression;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PeriodConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TimePackage.Literals.PERIOD_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(int newId) {
-		int oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.PERIOD_CONSTRAINT__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.PERIOD_CONSTRAINT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.PERIOD_CONSTRAINT__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsSoft() {
-		return isSoft;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSoft(boolean newIsSoft) {
-		boolean oldIsSoft = isSoft;
-		isSoft = newIsSoft;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.PERIOD_CONSTRAINT__IS_SOFT, oldIsSoft, isSoft));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isImplicit() {
-		return implicit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicit(boolean newImplicit) {
-		boolean oldImplicit = implicit;
-		implicit = newImplicit;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.PERIOD_CONSTRAINT__IMPLICIT, oldImplicit, implicit));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression getExpression() {
-		if (expression != null && expression.eIsProxy()) {
-			InternalEObject oldExpression = (InternalEObject)expression;
-			expression = (Expression)eResolveProxy(oldExpression);
-			if (expression != oldExpression) {
-				InternalEObject newExpression = (InternalEObject)expression;
-				NotificationChain msgs = oldExpression.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TimePackage.PERIOD_CONSTRAINT__EXPRESSION, null, null);
-				if (newExpression.eInternalContainer() == null) {
-					msgs = newExpression.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TimePackage.PERIOD_CONSTRAINT__EXPRESSION, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimePackage.PERIOD_CONSTRAINT__EXPRESSION, oldExpression, expression));
-			}
-		}
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression basicGetExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
-		Expression oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TimePackage.PERIOD_CONSTRAINT__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(Expression newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TimePackage.PERIOD_CONSTRAINT__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TimePackage.PERIOD_CONSTRAINT__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TimePackage.PERIOD_CONSTRAINT__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getLimitation() {
-		return getPeriod();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Component getComponent() {
-		return PeriodConstraintStaticImpl.getComponent(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComponent(final Component component) {
-		PeriodConstraintStaticImpl.setComponent(this, component);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getPeriod() {
-		return PeriodConstraintStaticImpl.getPeriod(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPeriod(final Double period) {
-		PeriodConstraintStaticImpl.setPeriod(this, period);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TimePackage.PERIOD_CONSTRAINT__EXPRESSION:
-				return basicSetExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimePackage.PERIOD_CONSTRAINT__ID:
-				return getId();
-			case TimePackage.PERIOD_CONSTRAINT__NAME:
-				return getName();
-			case TimePackage.PERIOD_CONSTRAINT__COMMENT:
-				return getComment();
-			case TimePackage.PERIOD_CONSTRAINT__IS_SOFT:
-				return isIsSoft();
-			case TimePackage.PERIOD_CONSTRAINT__IMPLICIT:
-				return isImplicit();
-			case TimePackage.PERIOD_CONSTRAINT__EXPRESSION:
-				if (resolve) return getExpression();
-				return basicGetExpression();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimePackage.PERIOD_CONSTRAINT__ID:
-				setId((Integer)newValue);
-				return;
-			case TimePackage.PERIOD_CONSTRAINT__NAME:
-				setName((String)newValue);
-				return;
-			case TimePackage.PERIOD_CONSTRAINT__COMMENT:
-				setComment((String)newValue);
-				return;
-			case TimePackage.PERIOD_CONSTRAINT__IS_SOFT:
-				setIsSoft((Boolean)newValue);
-				return;
-			case TimePackage.PERIOD_CONSTRAINT__IMPLICIT:
-				setImplicit((Boolean)newValue);
-				return;
-			case TimePackage.PERIOD_CONSTRAINT__EXPRESSION:
-				setExpression((Expression)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimePackage.PERIOD_CONSTRAINT__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case TimePackage.PERIOD_CONSTRAINT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case TimePackage.PERIOD_CONSTRAINT__COMMENT:
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case TimePackage.PERIOD_CONSTRAINT__IS_SOFT:
-				setIsSoft(IS_SOFT_EDEFAULT);
-				return;
-			case TimePackage.PERIOD_CONSTRAINT__IMPLICIT:
-				setImplicit(IMPLICIT_EDEFAULT);
-				return;
-			case TimePackage.PERIOD_CONSTRAINT__EXPRESSION:
-				setExpression((Expression)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimePackage.PERIOD_CONSTRAINT__ID:
-				return id != ID_EDEFAULT;
-			case TimePackage.PERIOD_CONSTRAINT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case TimePackage.PERIOD_CONSTRAINT__COMMENT:
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case TimePackage.PERIOD_CONSTRAINT__IS_SOFT:
-				return isSoft != IS_SOFT_EDEFAULT;
-			case TimePackage.PERIOD_CONSTRAINT__IMPLICIT:
-				return implicit != IMPLICIT_EDEFAULT;
-			case TimePackage.PERIOD_CONSTRAINT__EXPRESSION:
-				return expression != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (derivedFeatureID) {
-				case TimePackage.PERIOD_CONSTRAINT__IS_SOFT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT;
-				case TimePackage.PERIOD_CONSTRAINT__IMPLICIT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (derivedFeatureID) {
-				case TimePackage.PERIOD_CONSTRAINT__EXPRESSION: return ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (baseFeatureID) {
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT: return TimePackage.PERIOD_CONSTRAINT__IS_SOFT;
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT: return TimePackage.PERIOD_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (baseFeatureID) {
-				case ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION: return TimePackage.PERIOD_CONSTRAINT__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", comment: ");
-		result.append(comment);
-		result.append(", isSoft: ");
-		result.append(isSoft);
-		result.append(", implicit: ");
-		result.append(implicit);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PeriodConstraintImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/TimeFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/TimeFactoryImpl.java
deleted file mode 100644
index 4c20d5a3..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/TimeFactoryImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.model.time.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TimeFactoryImpl extends EFactoryImpl implements TimeFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TimeFactory init() {
-		try {
-			TimeFactory theTimeFactory = (TimeFactory)EPackage.Registry.INSTANCE.getEFactory(TimePackage.eNS_URI);
-			if (theTimeFactory != null) {
-				return theTimeFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new TimeFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TimeFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case TimePackage.DEADLINE_CONSTRAINT: return createDeadlineConstraint();
-			case TimePackage.LATENCY_CALC: return createLatencyCalc();
-			case TimePackage.DEADLINE_COMP: return createDeadlineComp();
-			case TimePackage.PERIOD_CONSTRAINT: return createPeriodConstraint();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeadlineConstraint createDeadlineConstraint() {
-		DeadlineConstraintImpl deadlineConstraint = new DeadlineConstraintImpl();
-		return deadlineConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LatencyCalc createLatencyCalc() {
-		LatencyCalcImpl latencyCalc = new LatencyCalcImpl();
-		return latencyCalc;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeadlineComp createDeadlineComp() {
-		DeadlineCompImpl deadlineComp = new DeadlineCompImpl();
-		return deadlineComp;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PeriodConstraint createPeriodConstraint() {
-		PeriodConstraintImpl periodConstraint = new PeriodConstraintImpl();
-		return periodConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TimePackage getTimePackage() {
-		return (TimePackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static TimePackage getPackage() {
-		return TimePackage.eINSTANCE;
-	}
-
-} //TimeFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/TimePackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/TimePackageImpl.java
deleted file mode 100644
index 7ad68a5a..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/impl/TimePackageImpl.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.component.model.AF3ComponentPackage;
-
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.types.TypesPackage;
-
-import org.fortiss.af3.exploration.model.CommonPackage;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-
-import org.fortiss.af3.exploration.model.impl.CommonPackageImpl;
-
-import org.fortiss.af3.exploration.model.location.LocationPackage;
-
-import org.fortiss.af3.exploration.model.location.impl.LocationPackageImpl;
-
-import org.fortiss.af3.exploration.model.time.DeadlineComp;
-import org.fortiss.af3.exploration.model.time.DeadlineConstraint;
-import org.fortiss.af3.exploration.model.time.LatencyCalc;
-import org.fortiss.af3.exploration.model.time.PeriodConstraint;
-import org.fortiss.af3.exploration.model.time.TimeDimension;
-import org.fortiss.af3.exploration.model.time.TimeFactory;
-import org.fortiss.af3.exploration.model.time.TimePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TimePackageImpl extends EPackageImpl implements TimePackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass timeDimensionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass deadlineConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass latencyCalcEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass deadlineCompEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass periodConstraintEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.model.time.TimePackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private TimePackageImpl() {
-		super(eNS_URI, TimeFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link TimePackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static TimePackage init() {
-		if (isInited) return (TimePackage)EPackage.Registry.INSTANCE.getEPackage(TimePackage.eNS_URI);
-
-		// Obtain or create and register package
-		TimePackageImpl theTimePackage = (TimePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TimePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TimePackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ModelPackage.eINSTANCE.eClass();
-		ExplorationPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		LocationPackageImpl theLocationPackage = (LocationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LocationPackage.eNS_URI) instanceof LocationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LocationPackage.eNS_URI) : LocationPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theTimePackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theLocationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theTimePackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theLocationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theTimePackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(TimePackage.eNS_URI, theTimePackage);
-		return theTimePackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTimeDimension() {
-		return timeDimensionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDeadlineConstraint() {
-		return deadlineConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLatencyCalc() {
-		return latencyCalcEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDeadlineComp() {
-		return deadlineCompEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPeriodConstraint() {
-		return periodConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TimeFactory getTimeFactory() {
-		return (TimeFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		timeDimensionEClass = createEClass(TIME_DIMENSION);
-
-		deadlineConstraintEClass = createEClass(DEADLINE_CONSTRAINT);
-
-		latencyCalcEClass = createEClass(LATENCY_CALC);
-
-		deadlineCompEClass = createEClass(DEADLINE_COMP);
-
-		periodConstraintEClass = createEClass(PERIOD_CONSTRAINT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ExplorationPackage theExplorationPackage = (ExplorationPackage)EPackage.Registry.INSTANCE.getEPackage(ExplorationPackage.eNS_URI);
-		ModelPackage theModelPackage = (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
-		AF3ComponentPackage theAF3ComponentPackage = (AF3ComponentPackage)EPackage.Registry.INSTANCE.getEPackage(AF3ComponentPackage.eNS_URI);
-		ExpressionsPackage theExpressionsPackage = (ExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI);
-		OperatorsPackage theOperatorsPackage = (OperatorsPackage)EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI);
-		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		timeDimensionEClass.getESuperTypes().add(theExplorationPackage.getIProblemDimension());
-		EGenericType g1 = createEGenericType(this.getTimeDimension());
-		deadlineConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExplorationPackage.getExplorationConstraint());
-		EGenericType g2 = createEGenericType(ecorePackage.getEDoubleObject());
-		g1.getETypeArguments().add(g2);
-		deadlineConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theModelPackage.getMOEAExplorationExpression());
-		deadlineConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g2 = createEGenericType(ecorePackage.getEDoubleObject());
-		g1.getETypeArguments().add(g2);
-		latencyCalcEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theOperatorsPackage.getComparisonOp());
-		g2 = createEGenericType(ecorePackage.getEDoubleObject());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(this.getLatencyCalc());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(theTypesPackage.getNumberLiteral());
-		g1.getETypeArguments().add(g2);
-		EGenericType g3 = createEGenericType(ecorePackage.getEDoubleObject());
-		g2.getETypeArguments().add(g3);
-		deadlineCompEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getTimeDimension());
-		periodConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExplorationPackage.getExplorationConstraint());
-		g2 = createEGenericType(ecorePackage.getEDoubleObject());
-		g1.getETypeArguments().add(g2);
-		periodConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theModelPackage.getMOEAExplorationExpression());
-		periodConstraintEClass.getEGenericSuperTypes().add(g1);
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(timeDimensionEClass, TimeDimension.class, "TimeDimension", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(deadlineConstraintEClass, DeadlineConstraint.class, "DeadlineConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		addEOperation(deadlineConstraintEClass, ecorePackage.getEDoubleObject(), "getLimitation", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(deadlineConstraintEClass, theAF3ComponentPackage.getComponent(), "getStartComponent", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		EOperation op = addEOperation(deadlineConstraintEClass, null, "setStartComponent", 1, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theAF3ComponentPackage.getComponent(), "component", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(deadlineConstraintEClass, theAF3ComponentPackage.getComponent(), "getEndComponent", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		op = addEOperation(deadlineConstraintEClass, null, "setEndComponent", 1, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theAF3ComponentPackage.getComponent(), "component", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(deadlineConstraintEClass, ecorePackage.getEDoubleObject(), "getDeadline", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		op = addEOperation(deadlineConstraintEClass, null, "setDeadline", 1, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDoubleObject(), "period", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(latencyCalcEClass, LatencyCalc.class, "LatencyCalc", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(deadlineCompEClass, DeadlineComp.class, "DeadlineComp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(periodConstraintEClass, PeriodConstraint.class, "PeriodConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		addEOperation(periodConstraintEClass, ecorePackage.getEDoubleObject(), "getLimitation", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(periodConstraintEClass, theAF3ComponentPackage.getComponent(), "getComponent", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		op = addEOperation(periodConstraintEClass, null, "setComponent", 1, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theAF3ComponentPackage.getComponent(), "component", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(periodConstraintEClass, ecorePackage.getEDoubleObject(), "getPeriod", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		op = addEOperation(periodConstraintEClass, null, "setPeriod", 1, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDoubleObject(), "period", 1, 1, IS_UNIQUE, IS_ORDERED);
-	}
-
-} //TimePackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/util/TimeAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/util/TimeAdapterFactory.java
deleted file mode 100644
index fcf221d9..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/util/TimeAdapterFactory.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp;
-import org.fortiss.af3.exploration.dsl.model.operators.DualOperator;
-import org.fortiss.af3.exploration.dsl.model.operators.Operator;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-import org.fortiss.af3.exploration.model.IProblemDimension;
-
-import org.fortiss.af3.exploration.model.time.*;
-
-import org.fortiss.tooling.kernel.model.IIdLabeled;
-import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.model.INamedElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.time.TimePackage
- * @generated
- */
-public class TimeAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static TimePackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TimeAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = TimePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TimeSwitch<Adapter> modelSwitch =
-		new TimeSwitch<Adapter>() {
-			@Override
-			public Adapter caseTimeDimension(TimeDimension object) {
-				return createTimeDimensionAdapter();
-			}
-			@Override
-			public Adapter caseDeadlineConstraint(DeadlineConstraint object) {
-				return createDeadlineConstraintAdapter();
-			}
-			@Override
-			public Adapter caseLatencyCalc(LatencyCalc object) {
-				return createLatencyCalcAdapter();
-			}
-			@Override
-			public Adapter caseDeadlineComp(DeadlineComp object) {
-				return createDeadlineCompAdapter();
-			}
-			@Override
-			public Adapter casePeriodConstraint(PeriodConstraint object) {
-				return createPeriodConstraintAdapter();
-			}
-			@Override
-			public Adapter caseIIdLabeled(IIdLabeled object) {
-				return createIIdLabeledAdapter();
-			}
-			@Override
-			public Adapter caseINamedElement(INamedElement object) {
-				return createINamedElementAdapter();
-			}
-			@Override
-			public Adapter caseINamedCommentedElement(INamedCommentedElement object) {
-				return createINamedCommentedElementAdapter();
-			}
-			@Override
-			public Adapter caseIProblemDimension(IProblemDimension object) {
-				return createIProblemDimensionAdapter();
-			}
-			@Override
-			public <T> Adapter caseExplorationTarget(ExplorationTarget<T> object) {
-				return createExplorationTargetAdapter();
-			}
-			@Override
-			public <T> Adapter caseExplorationConstraint(ExplorationConstraint<T> object) {
-				return createExplorationConstraintAdapter();
-			}
-			@Override
-			public Adapter caseMOEAExplorationExpression(MOEAExplorationExpression object) {
-				return createMOEAExplorationExpressionAdapter();
-			}
-			@Override
-			public Adapter caseExpression(Expression object) {
-				return createExpressionAdapter();
-			}
-			@Override
-			public <T> Adapter caseArithmeticExpression(ArithmeticExpression<T> object) {
-				return createArithmeticExpressionAdapter();
-			}
-			@Override
-			public <OP, RHT> Adapter caseOperator(Operator<OP, RHT> object) {
-				return createOperatorAdapter();
-			}
-			@Override
-			public <LHT, OP, RHT> Adapter caseDualOperator(DualOperator<LHT, OP, RHT> object) {
-				return createDualOperatorAdapter();
-			}
-			@Override
-			public Adapter caseBooleanExpression(BooleanExpression object) {
-				return createBooleanExpressionAdapter();
-			}
-			@Override
-			public <T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> Adapter caseComparisonOp(ComparisonOp<T, LHT, RHT> object) {
-				return createComparisonOpAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.time.TimeDimension <em>Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.time.TimeDimension
-	 * @generated
-	 */
-	public Adapter createTimeDimensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.time.DeadlineConstraint <em>Deadline Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.time.DeadlineConstraint
-	 * @generated
-	 */
-	public Adapter createDeadlineConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.time.LatencyCalc <em>Latency Calc</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.time.LatencyCalc
-	 * @generated
-	 */
-	public Adapter createLatencyCalcAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.time.DeadlineComp <em>Deadline Comp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.time.DeadlineComp
-	 * @generated
-	 */
-	public Adapter createDeadlineCompAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.time.PeriodConstraint <em>Period Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.time.PeriodConstraint
-	 * @generated
-	 */
-	public Adapter createPeriodConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.IIdLabeled <em>IId Labeled</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.IIdLabeled
-	 * @generated
-	 */
-	public Adapter createIIdLabeledAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.INamedElement <em>INamed Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.INamedElement
-	 * @generated
-	 */
-	public Adapter createINamedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.INamedCommentedElement <em>INamed Commented Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.INamedCommentedElement
-	 * @generated
-	 */
-	public Adapter createINamedCommentedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.IProblemDimension <em>IProblem Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.IProblemDimension
-	 * @generated
-	 */
-	public Adapter createIProblemDimensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.ExplorationTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.ExplorationTarget
-	 * @generated
-	 */
-	public Adapter createExplorationTargetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.ExplorationConstraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.ExplorationConstraint
-	 * @generated
-	 */
-	public Adapter createExplorationConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression <em>MOEA Exploration Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression
-	 * @generated
-	 */
-	public Adapter createMOEAExplorationExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.Expression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.Expression
-	 * @generated
-	 */
-	public Adapter createExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression <em>Arithmetic Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression
-	 * @generated
-	 */
-	public Adapter createArithmeticExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator <em>Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.Operator
-	 * @generated
-	 */
-	public Adapter createOperatorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.DualOperator <em>Dual Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.DualOperator
-	 * @generated
-	 */
-	public Adapter createDualOperatorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression <em>Boolean Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression
-	 * @generated
-	 */
-	public Adapter createBooleanExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp <em>Comparison Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp
-	 * @generated
-	 */
-	public Adapter createComparisonOpAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //TimeAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/util/TimeSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/util/TimeSwitch.java
deleted file mode 100644
index a40e7bff..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/time/util/TimeSwitch.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.time.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp;
-import org.fortiss.af3.exploration.dsl.model.operators.DualOperator;
-import org.fortiss.af3.exploration.dsl.model.operators.Operator;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-import org.fortiss.af3.exploration.model.IProblemDimension;
-
-import org.fortiss.af3.exploration.model.time.*;
-
-import org.fortiss.tooling.kernel.model.IIdLabeled;
-import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.model.INamedElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.time.TimePackage
- * @generated
- */
-public class TimeSwitch<T1> extends Switch<T1> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static TimePackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TimeSwitch() {
-		if (modelPackage == null) {
-			modelPackage = TimePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T1 doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case TimePackage.TIME_DIMENSION: {
-				TimeDimension timeDimension = (TimeDimension)theEObject;
-				T1 result = caseTimeDimension(timeDimension);
-				if (result == null) result = caseIProblemDimension(timeDimension);
-				if (result == null) result = caseINamedCommentedElement(timeDimension);
-				if (result == null) result = caseINamedElement(timeDimension);
-				if (result == null) result = caseIIdLabeled(timeDimension);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimePackage.DEADLINE_CONSTRAINT: {
-				DeadlineConstraint deadlineConstraint = (DeadlineConstraint)theEObject;
-				T1 result = caseDeadlineConstraint(deadlineConstraint);
-				if (result == null) result = caseTimeDimension(deadlineConstraint);
-				if (result == null) result = caseExplorationConstraint(deadlineConstraint);
-				if (result == null) result = caseMOEAExplorationExpression(deadlineConstraint);
-				if (result == null) result = caseIProblemDimension(deadlineConstraint);
-				if (result == null) result = caseExplorationTarget(deadlineConstraint);
-				if (result == null) result = caseINamedCommentedElement(deadlineConstraint);
-				if (result == null) result = caseINamedElement(deadlineConstraint);
-				if (result == null) result = caseIIdLabeled(deadlineConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimePackage.LATENCY_CALC: {
-				LatencyCalc latencyCalc = (LatencyCalc)theEObject;
-				T1 result = caseLatencyCalc(latencyCalc);
-				if (result == null) result = caseArithmeticExpression(latencyCalc);
-				if (result == null) result = caseExpression(latencyCalc);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimePackage.DEADLINE_COMP: {
-				DeadlineComp deadlineComp = (DeadlineComp)theEObject;
-				T1 result = caseDeadlineComp(deadlineComp);
-				if (result == null) result = caseComparisonOp(deadlineComp);
-				if (result == null) result = caseDualOperator(deadlineComp);
-				if (result == null) result = caseBooleanExpression(deadlineComp);
-				if (result == null) result = caseOperator(deadlineComp);
-				if (result == null) result = caseExpression(deadlineComp);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimePackage.PERIOD_CONSTRAINT: {
-				PeriodConstraint periodConstraint = (PeriodConstraint)theEObject;
-				T1 result = casePeriodConstraint(periodConstraint);
-				if (result == null) result = caseTimeDimension(periodConstraint);
-				if (result == null) result = caseExplorationConstraint(periodConstraint);
-				if (result == null) result = caseMOEAExplorationExpression(periodConstraint);
-				if (result == null) result = caseIProblemDimension(periodConstraint);
-				if (result == null) result = caseExplorationTarget(periodConstraint);
-				if (result == null) result = caseINamedCommentedElement(periodConstraint);
-				if (result == null) result = caseINamedElement(periodConstraint);
-				if (result == null) result = caseIIdLabeled(periodConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Dimension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseTimeDimension(TimeDimension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Deadline Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Deadline Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseDeadlineConstraint(DeadlineConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Latency Calc</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Latency Calc</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseLatencyCalc(LatencyCalc object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Deadline Comp</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Deadline Comp</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseDeadlineComp(DeadlineComp object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Period Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Period Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 casePeriodConstraint(PeriodConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IId Labeled</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IId Labeled</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseIIdLabeled(IIdLabeled object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseINamedElement(INamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>INamed Commented Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>INamed Commented Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseINamedCommentedElement(INamedCommentedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IProblem Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IProblem Dimension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseIProblemDimension(IProblemDimension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Target</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseExplorationTarget(ExplorationTarget<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseExplorationConstraint(ExplorationConstraint<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>MOEA Exploration Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>MOEA Exploration Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseMOEAExplorationExpression(MOEAExplorationExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseExpression(Expression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseArithmeticExpression(ArithmeticExpression<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Operator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Operator</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <OP, RHT> T1 caseOperator(Operator<OP, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dual Operator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Dual Operator</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <LHT, OP, RHT> T1 caseDualOperator(DualOperator<LHT, OP, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Boolean Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Boolean Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseBooleanExpression(BooleanExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Comparison Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Comparison Op</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> T1 caseComparisonOp(ComparisonOp<T, LHT, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T1 defaultCase(EObject object) {
-		return null;
-	}
-
-} //TimeSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/util/CommonAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/util/CommonAdapterFactory.java
deleted file mode 100644
index 9470ddaa..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/util/CommonAdapterFactory.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.model.*;
-
-import org.fortiss.tooling.kernel.model.IIdLabeled;
-import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.model.INamedElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.CommonPackage
- * @generated
- */
-public class CommonAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static CommonPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommonAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = CommonPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CommonSwitch<Adapter> modelSwitch =
-		new CommonSwitch<Adapter>() {
-			@Override
-			public <T> Adapter caseMOExplorationObjective(MOExplorationObjective<T> object) {
-				return createMOExplorationObjectiveAdapter();
-			}
-			@Override
-			public Adapter caseIIdLabeled(IIdLabeled object) {
-				return createIIdLabeledAdapter();
-			}
-			@Override
-			public Adapter caseINamedElement(INamedElement object) {
-				return createINamedElementAdapter();
-			}
-			@Override
-			public Adapter caseINamedCommentedElement(INamedCommentedElement object) {
-				return createINamedCommentedElementAdapter();
-			}
-			@Override
-			public <T> Adapter caseExplorationTarget(ExplorationTarget<T> object) {
-				return createExplorationTargetAdapter();
-			}
-			@Override
-			public <T> Adapter caseExplorationObjective(ExplorationObjective<T> object) {
-				return createExplorationObjectiveAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.MOExplorationObjective <em>MO Exploration Objective</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.MOExplorationObjective
-	 * @generated
-	 */
-	public Adapter createMOExplorationObjectiveAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.IIdLabeled <em>IId Labeled</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.IIdLabeled
-	 * @generated
-	 */
-	public Adapter createIIdLabeledAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.INamedElement <em>INamed Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.INamedElement
-	 * @generated
-	 */
-	public Adapter createINamedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.INamedCommentedElement <em>INamed Commented Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.INamedCommentedElement
-	 * @generated
-	 */
-	public Adapter createINamedCommentedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.ExplorationTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.ExplorationTarget
-	 * @generated
-	 */
-	public Adapter createExplorationTargetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.ExplorationObjective <em>Objective</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.ExplorationObjective
-	 * @generated
-	 */
-	public Adapter createExplorationObjectiveAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //CommonAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/util/CommonSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/util/CommonSwitch.java
deleted file mode 100644
index a2a3ad3c..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/model/util/CommonSwitch.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.model.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.model.*;
-
-import org.fortiss.tooling.kernel.model.IIdLabeled;
-import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.model.INamedElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.model.CommonPackage
- * @generated
- */
-public class CommonSwitch<T1> extends Switch<T1> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static CommonPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommonSwitch() {
-		if (modelPackage == null) {
-			modelPackage = CommonPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T1 doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case CommonPackage.MO_EXPLORATION_OBJECTIVE: {
-				MOExplorationObjective<?> moExplorationObjective = (MOExplorationObjective<?>)theEObject;
-				T1 result = caseMOExplorationObjective(moExplorationObjective);
-				if (result == null) result = caseExplorationObjective(moExplorationObjective);
-				if (result == null) result = caseExplorationTarget(moExplorationObjective);
-				if (result == null) result = caseINamedCommentedElement(moExplorationObjective);
-				if (result == null) result = caseINamedElement(moExplorationObjective);
-				if (result == null) result = caseIIdLabeled(moExplorationObjective);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>MO Exploration Objective</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>MO Exploration Objective</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseMOExplorationObjective(MOExplorationObjective<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IId Labeled</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IId Labeled</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseIIdLabeled(IIdLabeled object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseINamedElement(INamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>INamed Commented Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>INamed Commented Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseINamedCommentedElement(INamedCommentedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Target</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseExplorationTarget(ExplorationTarget<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Objective</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Objective</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseExplorationObjective(ExplorationObjective<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T1 defaultCase(EObject object) {
-		return null;
-	}
-
-} //CommonSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/DseSpecification.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/DseSpecification.java
deleted file mode 100644
index 6a20c1eb..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/DseSpecification.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.fortiss.af3.exploration.model.ExplorationSpecification;
-import org.fortiss.af3.exploration.model.IExplorationFeature;
-
-import org.fortiss.af3.exploration.moea.model.parameters.IOptimizer;
-import org.fortiss.af3.exploration.moea.model.parameters.SystemParameters;
-
-import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dse Specification</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Contains the selected {@link IOptimizer}, the {@link SystemParameter}s, and the {@link ExplorationSpecification} that define a particular DSE problemn.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.DseSpecification#getFeatures <em>Features</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.DseSpecification#getOptimizer <em>Optimizer</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.DseSpecification#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.DseSpecification#getTargetSpecification <em>Target Specification</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getDseSpecification()
- * @model
- * @generated
- */
-public interface DseSpecification extends INamedCommentedElement {
-	/**
-	 * Returns the value of the '<em><b>Features</b></em>' containment reference list.
-	 * The list contents are of type {@link org.fortiss.af3.exploration.model.IExplorationFeature}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Features</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Features</em>' containment reference list.
-	 * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getDseSpecification_Features()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	EList<IExplorationFeature> getFeatures();
-
-	/**
-	 * Returns the value of the '<em><b>Optimizer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Selected {@link IOptimizer} that is used to perform the DSE.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Optimizer</em>' containment reference.
-	 * @see #setOptimizer(IOptimizer)
-	 * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getDseSpecification_Optimizer()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	IOptimizer getOptimizer();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.DseSpecification#getOptimizer <em>Optimizer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optimizer</em>' containment reference.
-	 * @see #getOptimizer()
-	 * @generated
-	 */
-	void setOptimizer(IOptimizer value);
-
-	/**
-	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * {@link SystemParameters} that must be considered during the DSE.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parameters</em>' containment reference.
-	 * @see #setParameters(SystemParameters)
-	 * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getDseSpecification_Parameters()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	SystemParameters getParameters();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.DseSpecification#getParameters <em>Parameters</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parameters</em>' containment reference.
-	 * @see #getParameters()
-	 * @generated
-	 */
-	void setParameters(SystemParameters value);
-
-	/**
-	 * Returns the value of the '<em><b>Target Specification</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specification of the {@link ExplorationTarget}s, i.e., objectives and constraints, which define the optima and the feasible reagin for the DSE problem.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Target Specification</em>' containment reference.
-	 * @see #setTargetSpecification(ExplorationSpecification)
-	 * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getDseSpecification_TargetSpecification()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	ExplorationSpecification getTargetSpecification();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.DseSpecification#getTargetSpecification <em>Target Specification</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Specification</em>' containment reference.
-	 * @see #getTargetSpecification()
-	 * @generated
-	 */
-	void setTargetSpecification(ExplorationSpecification value);
-
-} // DseSpecification
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/ExplorationManager.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/ExplorationManager.java
deleted file mode 100644
index 4565db12..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/ExplorationManager.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.fortiss.tooling.kernel.model.IProjectRootElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Exploration Manager</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Model equivalent for the GUI editor to allow the definition of {@link DseSpecification}s.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.ExplorationManager#getDseSpecifications <em>Dse Specifications</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getExplorationManager()
- * @model
- * @generated
- */
-public interface ExplorationManager extends IProjectRootElement {
-	/**
-	 * Returns the value of the '<em><b>Dse Specifications</b></em>' containment reference list.
-	 * The list contents are of type {@link org.fortiss.af3.exploration.moea.model.DseSpecification}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * List of {@link DseSpecification}s defined via {@code this} {@link ExplorationManager}. There exists only one {@link ExplorationManager} per AF3 project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Dse Specifications</em>' containment reference list.
-	 * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getExplorationManager_DseSpecifications()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<DseSpecification> getDseSpecifications();
-
-} // ExplorationManager
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/ImplementsComponentRef.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/ImplementsComponentRef.java
deleted file mode 100644
index 1c8fbd25..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/ImplementsComponentRef.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.tooling.base.model.element.IHiddenSpecification;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Implements Component Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * For {@link Component}s in a "100% {@link ComponentArchitecture}" this specification contains a reference to the {@link Component} in the "150% / 125% {@link ComponentArchitecture}" which they implement. Note that this specification only exists in {@link ComponentArchitecture}s that are actually generated from a "150% / 125% {@link ComponentArchitecture}".
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.ImplementsComponentRef#getRefComponent <em>Ref Component</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getImplementsComponentRef()
- * @model
- * @generated
- */
-public interface ImplementsComponentRef extends IHiddenSpecification {
-	/**
-	 * Returns the value of the '<em><b>Ref Component</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ref Component</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ref Component</em>' reference.
-	 * @see #setRefComponent(Component)
-	 * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getImplementsComponentRef_RefComponent()
-	 * @model required="true"
-	 * @generated
-	 */
-	Component getRefComponent();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.ImplementsComponentRef#getRefComponent <em>Ref Component</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ref Component</em>' reference.
-	 * @see #getRefComponent()
-	 * @generated
-	 */
-	void setRefComponent(Component value);
-
-} // ImplementsComponentRef
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/MoeaFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/MoeaFactory.java
deleted file mode 100644
index fad53a0c..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/MoeaFactory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.MoeaPackage
- * @generated
- */
-public interface MoeaFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MoeaFactory eINSTANCE = org.fortiss.af3.exploration.moea.model.impl.MoeaFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Exploration Manager</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Exploration Manager</em>'.
-	 * @generated
-	 */
-	ExplorationManager createExplorationManager();
-
-	/**
-	 * Returns a new object of class '<em>Dse Specification</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Dse Specification</em>'.
-	 * @generated
-	 */
-	DseSpecification createDseSpecification();
-
-	/**
-	 * Returns a new object of class '<em>Implements Component Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Implements Component Ref</em>'.
-	 * @generated
-	 */
-	ImplementsComponentRef createImplementsComponentRef();
-
-	/**
-	 * Returns a new object of class '<em>Voter Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Voter Type</em>'.
-	 * @generated
-	 */
-	VoterType createVoterType();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	MoeaPackage getMoeaPackage();
-
-} //MoeaFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/MoeaPackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/MoeaPackage.java
deleted file mode 100644
index e10ff792..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/MoeaPackage.java
+++ /dev/null
@@ -1,561 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.fortiss.tooling.base.model.element.ElementPackage;
-
-import org.fortiss.tooling.kernel.model.FortissToolingKernelPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.MoeaFactory
- * @model kind="package"
- * @generated
- */
-public interface MoeaPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "model";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/moea";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-moea";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MoeaPackage eINSTANCE = org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.impl.ExplorationManagerImpl <em>Exploration Manager</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.impl.ExplorationManagerImpl
-	 * @see org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl#getExplorationManager()
-	 * @generated
-	 */
-	int EXPLORATION_MANAGER = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_MANAGER__ID = FortissToolingKernelPackage.IPROJECT_ROOT_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_MANAGER__NAME = FortissToolingKernelPackage.IPROJECT_ROOT_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_MANAGER__COMMENT = FortissToolingKernelPackage.IPROJECT_ROOT_ELEMENT__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Dse Specifications</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_MANAGER__DSE_SPECIFICATIONS = FortissToolingKernelPackage.IPROJECT_ROOT_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Exploration Manager</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_MANAGER_FEATURE_COUNT = FortissToolingKernelPackage.IPROJECT_ROOT_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.impl.DseSpecificationImpl <em>Dse Specification</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.impl.DseSpecificationImpl
-	 * @see org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl#getDseSpecification()
-	 * @generated
-	 */
-	int DSE_SPECIFICATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DSE_SPECIFICATION__ID = FortissToolingKernelPackage.INAMED_COMMENTED_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DSE_SPECIFICATION__NAME = FortissToolingKernelPackage.INAMED_COMMENTED_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DSE_SPECIFICATION__COMMENT = FortissToolingKernelPackage.INAMED_COMMENTED_ELEMENT__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Features</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DSE_SPECIFICATION__FEATURES = FortissToolingKernelPackage.INAMED_COMMENTED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Optimizer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DSE_SPECIFICATION__OPTIMIZER = FortissToolingKernelPackage.INAMED_COMMENTED_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DSE_SPECIFICATION__PARAMETERS = FortissToolingKernelPackage.INAMED_COMMENTED_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Target Specification</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DSE_SPECIFICATION__TARGET_SPECIFICATION = FortissToolingKernelPackage.INAMED_COMMENTED_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Dse Specification</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DSE_SPECIFICATION_FEATURE_COUNT = FortissToolingKernelPackage.INAMED_COMMENTED_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.impl.ImplementsComponentRefImpl <em>Implements Component Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.impl.ImplementsComponentRefImpl
-	 * @see org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl#getImplementsComponentRef()
-	 * @generated
-	 */
-	int IMPLEMENTS_COMPONENT_REF = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTS_COMPONENT_REF__ID = ElementPackage.IHIDDEN_SPECIFICATION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Specification Of</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF = ElementPackage.IHIDDEN_SPECIFICATION__SPECIFICATION_OF;
-
-	/**
-	 * The feature id for the '<em><b>Ref Component</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTS_COMPONENT_REF__REF_COMPONENT = ElementPackage.IHIDDEN_SPECIFICATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Implements Component Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTS_COMPONENT_REF_FEATURE_COUNT = ElementPackage.IHIDDEN_SPECIFICATION_FEATURE_COUNT + 1;
-
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.impl.VoterTypeImpl <em>Voter Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.impl.VoterTypeImpl
-	 * @see org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl#getVoterType()
-	 * @generated
-	 */
-	int VOTER_TYPE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VOTER_TYPE__ID = ElementPackage.IHIDDEN_SPECIFICATION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Specification Of</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VOTER_TYPE__SPECIFICATION_OF = ElementPackage.IHIDDEN_SPECIFICATION__SPECIFICATION_OF;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VOTER_TYPE__TYPE = ElementPackage.IHIDDEN_SPECIFICATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Voter Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VOTER_TYPE_FEATURE_COUNT = ElementPackage.IHIDDEN_SPECIFICATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.VoterType_t <em>Voter Type t</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.VoterType_t
-	 * @see org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl#getVoterType_t()
-	 * @generated
-	 */
-	int VOTER_TYPE_T = 4;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.ExplorationManager <em>Exploration Manager</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Exploration Manager</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.ExplorationManager
-	 * @generated
-	 */
-	EClass getExplorationManager();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.fortiss.af3.exploration.moea.model.ExplorationManager#getDseSpecifications <em>Dse Specifications</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Dse Specifications</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.ExplorationManager#getDseSpecifications()
-	 * @see #getExplorationManager()
-	 * @generated
-	 */
-	EReference getExplorationManager_DseSpecifications();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.DseSpecification <em>Dse Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Dse Specification</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.DseSpecification
-	 * @generated
-	 */
-	EClass getDseSpecification();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.fortiss.af3.exploration.moea.model.DseSpecification#getFeatures <em>Features</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Features</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.DseSpecification#getFeatures()
-	 * @see #getDseSpecification()
-	 * @generated
-	 */
-	EReference getDseSpecification_Features();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.fortiss.af3.exploration.moea.model.DseSpecification#getOptimizer <em>Optimizer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Optimizer</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.DseSpecification#getOptimizer()
-	 * @see #getDseSpecification()
-	 * @generated
-	 */
-	EReference getDseSpecification_Optimizer();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.fortiss.af3.exploration.moea.model.DseSpecification#getParameters <em>Parameters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Parameters</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.DseSpecification#getParameters()
-	 * @see #getDseSpecification()
-	 * @generated
-	 */
-	EReference getDseSpecification_Parameters();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.fortiss.af3.exploration.moea.model.DseSpecification#getTargetSpecification <em>Target Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Target Specification</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.DseSpecification#getTargetSpecification()
-	 * @see #getDseSpecification()
-	 * @generated
-	 */
-	EReference getDseSpecification_TargetSpecification();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.ImplementsComponentRef <em>Implements Component Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Implements Component Ref</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.ImplementsComponentRef
-	 * @generated
-	 */
-	EClass getImplementsComponentRef();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.fortiss.af3.exploration.moea.model.ImplementsComponentRef#getRefComponent <em>Ref Component</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Ref Component</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.ImplementsComponentRef#getRefComponent()
-	 * @see #getImplementsComponentRef()
-	 * @generated
-	 */
-	EReference getImplementsComponentRef_RefComponent();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.VoterType <em>Voter Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Voter Type</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.VoterType
-	 * @generated
-	 */
-	EClass getVoterType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.moea.model.VoterType#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.VoterType#getType()
-	 * @see #getVoterType()
-	 * @generated
-	 */
-	EAttribute getVoterType_Type();
-
-	/**
-	 * Returns the meta object for enum '{@link org.fortiss.af3.exploration.moea.model.VoterType_t <em>Voter Type t</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Voter Type t</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.VoterType_t
-	 * @generated
-	 */
-	EEnum getVoterType_t();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	MoeaFactory getMoeaFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.impl.ExplorationManagerImpl <em>Exploration Manager</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.impl.ExplorationManagerImpl
-		 * @see org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl#getExplorationManager()
-		 * @generated
-		 */
-		EClass EXPLORATION_MANAGER = eINSTANCE.getExplorationManager();
-
-		/**
-		 * The meta object literal for the '<em><b>Dse Specifications</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXPLORATION_MANAGER__DSE_SPECIFICATIONS = eINSTANCE.getExplorationManager_DseSpecifications();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.impl.DseSpecificationImpl <em>Dse Specification</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.impl.DseSpecificationImpl
-		 * @see org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl#getDseSpecification()
-		 * @generated
-		 */
-		EClass DSE_SPECIFICATION = eINSTANCE.getDseSpecification();
-
-		/**
-		 * The meta object literal for the '<em><b>Features</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DSE_SPECIFICATION__FEATURES = eINSTANCE.getDseSpecification_Features();
-
-		/**
-		 * The meta object literal for the '<em><b>Optimizer</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DSE_SPECIFICATION__OPTIMIZER = eINSTANCE.getDseSpecification_Optimizer();
-
-		/**
-		 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DSE_SPECIFICATION__PARAMETERS = eINSTANCE.getDseSpecification_Parameters();
-
-		/**
-		 * The meta object literal for the '<em><b>Target Specification</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DSE_SPECIFICATION__TARGET_SPECIFICATION = eINSTANCE.getDseSpecification_TargetSpecification();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.impl.ImplementsComponentRefImpl <em>Implements Component Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.impl.ImplementsComponentRefImpl
-		 * @see org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl#getImplementsComponentRef()
-		 * @generated
-		 */
-		EClass IMPLEMENTS_COMPONENT_REF = eINSTANCE.getImplementsComponentRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Ref Component</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference IMPLEMENTS_COMPONENT_REF__REF_COMPONENT = eINSTANCE.getImplementsComponentRef_RefComponent();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.impl.VoterTypeImpl <em>Voter Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.impl.VoterTypeImpl
-		 * @see org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl#getVoterType()
-		 * @generated
-		 */
-		EClass VOTER_TYPE = eINSTANCE.getVoterType();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VOTER_TYPE__TYPE = eINSTANCE.getVoterType_Type();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.VoterType_t <em>Voter Type t</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.VoterType_t
-		 * @see org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl#getVoterType_t()
-		 * @generated
-		 */
-		EEnum VOTER_TYPE_T = eINSTANCE.getVoterType_t();
-
-	}
-
-} //MoeaPackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/VoterType.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/VoterType.java
deleted file mode 100644
index d1feb104..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/VoterType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model;
-
-import org.fortiss.tooling.base.model.element.IHiddenSpecification;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Voter Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.VoterType#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getVoterType()
- * @model
- * @generated
- */
-public interface VoterType extends IHiddenSpecification {
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.fortiss.af3.exploration.moea.model.VoterType_t}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see org.fortiss.af3.exploration.moea.model.VoterType_t
-	 * @see #setType(VoterType_t)
-	 * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getVoterType_Type()
-	 * @model required="true"
-	 * @generated
-	 */
-	VoterType_t getType();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.VoterType#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.fortiss.af3.exploration.moea.model.VoterType_t
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(VoterType_t value);
-
-} // VoterType
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/VoterType_t.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/VoterType_t.java
deleted file mode 100644
index 8bddf7e2..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/VoterType_t.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Voter Type t</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#getVoterType_t()
- * @model
- * @generated
- */
-public enum VoterType_t implements Enumerator {
-	/**
-	 * The '<em><b>Majority Voter</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MAJORITY_VOTER_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MAJORITY_VOTER(0, "MajorityVoter", "MajorityVoter");
-
-	/**
-	 * The '<em><b>Majority Voter</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Majority Voter</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MAJORITY_VOTER
-	 * @model name="MajorityVoter"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MAJORITY_VOTER_VALUE = 0;
-
-	/**
-	 * An array of all the '<em><b>Voter Type t</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final VoterType_t[] VALUES_ARRAY =
-		new VoterType_t[] {
-			MAJORITY_VOTER,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Voter Type t</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<VoterType_t> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Voter Type t</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static VoterType_t get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			VoterType_t result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Voter Type t</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static VoterType_t getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			VoterType_t result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Voter Type t</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static VoterType_t get(int value) {
-		switch (value) {
-			case MAJORITY_VOTER_VALUE: return MAJORITY_VOTER;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private VoterType_t(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //VoterType_t
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/FeatureFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/FeatureFactory.java
deleted file mode 100644
index 74fad07a..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/FeatureFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.feature.FeaturePackage
- * @generated
- */
-public interface FeatureFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	FeatureFactory eINSTANCE = org.fortiss.af3.exploration.moea.model.feature.impl.FeatureFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Safety Exploration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Safety Exploration</em>'.
-	 * @generated
-	 */
-	SafetyExploration createSafetyExploration();
-
-	/**
-	 * Returns a new object of class '<em>Task Instantiation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Task Instantiation</em>'.
-	 * @generated
-	 */
-	TaskInstantiation createTaskInstantiation();
-
-	/**
-	 * Returns a new object of class '<em>Task Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Task Mapping</em>'.
-	 * @generated
-	 */
-	TaskMapping createTaskMapping();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	FeaturePackage getFeaturePackage();
-
-} //FeatureFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/FeaturePackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/FeaturePackage.java
deleted file mode 100644
index 7fecdf28..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/FeaturePackage.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.feature.FeatureFactory
- * @model kind="package"
- * @generated
- */
-public interface FeaturePackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "feature";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/moea/feature";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-moea-feature";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	FeaturePackage eINSTANCE = org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.feature.impl.SafetyExplorationImpl <em>Safety Exploration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.feature.impl.SafetyExplorationImpl
-	 * @see org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl#getSafetyExploration()
-	 * @generated
-	 */
-	int SAFETY_EXPLORATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Adapters</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_EXPLORATION__ADAPTERS = ExplorationPackage.IEXPLORATION_FEATURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Safety Exploration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_EXPLORATION_FEATURE_COUNT = ExplorationPackage.IEXPLORATION_FEATURE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.feature.impl.TaskInstantiationImpl <em>Task Instantiation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.feature.impl.TaskInstantiationImpl
-	 * @see org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl#getTaskInstantiation()
-	 * @generated
-	 */
-	int TASK_INSTANTIATION = 1;
-
-	/**
-	 * The number of structural features of the '<em>Task Instantiation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_INSTANTIATION_FEATURE_COUNT = ExplorationPackage.IEXPLORATION_FEATURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.feature.impl.TaskMappingImpl <em>Task Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.feature.impl.TaskMappingImpl
-	 * @see org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl#getTaskMapping()
-	 * @generated
-	 */
-	int TASK_MAPPING = 2;
-
-	/**
-	 * The number of structural features of the '<em>Task Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_MAPPING_FEATURE_COUNT = ExplorationPackage.IEXPLORATION_FEATURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '<em>ISafety Function Adapter</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ISafetyFunctionAdapter
-	 * @see org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl#getISafetyFunctionAdapter()
-	 * @generated
-	 */
-	int ISAFETY_FUNCTION_ADAPTER = 3;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.feature.SafetyExploration <em>Safety Exploration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Safety Exploration</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.feature.SafetyExploration
-	 * @generated
-	 */
-	EClass getSafetyExploration();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.fortiss.af3.exploration.moea.model.feature.SafetyExploration#getAdapters <em>Adapters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Adapters</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.feature.SafetyExploration#getAdapters()
-	 * @see #getSafetyExploration()
-	 * @generated
-	 */
-	EAttribute getSafetyExploration_Adapters();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.feature.TaskInstantiation <em>Task Instantiation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Task Instantiation</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.feature.TaskInstantiation
-	 * @generated
-	 */
-	EClass getTaskInstantiation();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.feature.TaskMapping <em>Task Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Task Mapping</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.feature.TaskMapping
-	 * @generated
-	 */
-	EClass getTaskMapping();
-
-	/**
-	 * Returns the meta object for data type '{@link org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ISafetyFunctionAdapter <em>ISafety Function Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>ISafety Function Adapter</em>'.
-	 * @see org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ISafetyFunctionAdapter
-	 * @model instanceClass="org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ISafetyFunctionAdapter"
-	 * @generated
-	 */
-	EDataType getISafetyFunctionAdapter();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	FeatureFactory getFeatureFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.feature.impl.SafetyExplorationImpl <em>Safety Exploration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.feature.impl.SafetyExplorationImpl
-		 * @see org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl#getSafetyExploration()
-		 * @generated
-		 */
-		EClass SAFETY_EXPLORATION = eINSTANCE.getSafetyExploration();
-
-		/**
-		 * The meta object literal for the '<em><b>Adapters</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SAFETY_EXPLORATION__ADAPTERS = eINSTANCE.getSafetyExploration_Adapters();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.feature.impl.TaskInstantiationImpl <em>Task Instantiation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.feature.impl.TaskInstantiationImpl
-		 * @see org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl#getTaskInstantiation()
-		 * @generated
-		 */
-		EClass TASK_INSTANTIATION = eINSTANCE.getTaskInstantiation();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.feature.impl.TaskMappingImpl <em>Task Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.feature.impl.TaskMappingImpl
-		 * @see org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl#getTaskMapping()
-		 * @generated
-		 */
-		EClass TASK_MAPPING = eINSTANCE.getTaskMapping();
-
-		/**
-		 * The meta object literal for the '<em>ISafety Function Adapter</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ISafetyFunctionAdapter
-		 * @see org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl#getISafetyFunctionAdapter()
-		 * @generated
-		 */
-		EDataType ISAFETY_FUNCTION_ADAPTER = eINSTANCE.getISafetyFunctionAdapter();
-
-	}
-
-} //FeaturePackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/SafetyExploration.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/SafetyExploration.java
deleted file mode 100644
index e4357527..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/SafetyExploration.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ISafetyFunctionAdapter;
-
-import org.fortiss.af3.exploration.model.IExplorationFeature;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Safety Exploration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.feature.SafetyExploration#getAdapters <em>Adapters</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.feature.FeaturePackage#getSafetyExploration()
- * @model
- * @generated
- */
-public interface SafetyExploration extends IExplorationFeature {
-	/**
-	 * Returns the value of the '<em><b>Adapters</b></em>' attribute list.
-	 * The list contents are of type {@link org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ISafetyFunctionAdapter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Adapters</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Adapters</em>' attribute list.
-	 * @see org.fortiss.af3.exploration.moea.model.feature.FeaturePackage#getSafetyExploration_Adapters()
-	 * @model dataType="org.fortiss.af3.exploration.moea.model.feature.ISafetyFunctionAdapter"
-	 * @generated
-	 */
-	EList<ISafetyFunctionAdapter> getAdapters();
-
-} // SafetyExploration
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/TaskInstantiation.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/TaskInstantiation.java
deleted file mode 100644
index 468a0e51..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/TaskInstantiation.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature;
-
-import org.fortiss.af3.exploration.model.IExplorationFeature;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Task Instantiation</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.moea.model.feature.FeaturePackage#getTaskInstantiation()
- * @model
- * @generated
- */
-public interface TaskInstantiation extends IExplorationFeature {
-} // TaskInstantiation
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/TaskMapping.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/TaskMapping.java
deleted file mode 100644
index 73a8d000..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/TaskMapping.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature;
-
-import org.fortiss.af3.exploration.model.IExplorationFeature;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Task Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.moea.model.feature.FeaturePackage#getTaskMapping()
- * @model
- * @generated
- */
-public interface TaskMapping extends IExplorationFeature {
-} // TaskMapping
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/FeatureFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/FeatureFactoryImpl.java
deleted file mode 100644
index 833d8add..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/FeatureFactoryImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ISafetyFunctionAdapter;
-
-import org.fortiss.af3.exploration.moea.model.feature.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class FeatureFactoryImpl extends EFactoryImpl implements FeatureFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FeatureFactory init() {
-		try {
-			FeatureFactory theFeatureFactory = (FeatureFactory)EPackage.Registry.INSTANCE.getEFactory(FeaturePackage.eNS_URI);
-			if (theFeatureFactory != null) {
-				return theFeatureFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new FeatureFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case FeaturePackage.SAFETY_EXPLORATION: return createSafetyExploration();
-			case FeaturePackage.TASK_INSTANTIATION: return createTaskInstantiation();
-			case FeaturePackage.TASK_MAPPING: return createTaskMapping();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case FeaturePackage.ISAFETY_FUNCTION_ADAPTER:
-				return createISafetyFunctionAdapterFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case FeaturePackage.ISAFETY_FUNCTION_ADAPTER:
-				return convertISafetyFunctionAdapterToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SafetyExploration createSafetyExploration() {
-		SafetyExplorationImpl safetyExploration = new SafetyExplorationImpl();
-		return safetyExploration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskInstantiation createTaskInstantiation() {
-		TaskInstantiationImpl taskInstantiation = new TaskInstantiationImpl();
-		return taskInstantiation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskMapping createTaskMapping() {
-		TaskMappingImpl taskMapping = new TaskMappingImpl();
-		return taskMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ISafetyFunctionAdapter createISafetyFunctionAdapterFromString(EDataType eDataType, String initialValue) {
-		return (ISafetyFunctionAdapter)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertISafetyFunctionAdapterToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeaturePackage getFeaturePackage() {
-		return (FeaturePackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static FeaturePackage getPackage() {
-		return FeaturePackage.eINSTANCE;
-	}
-
-} //FeatureFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/FeaturePackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/FeaturePackageImpl.java
deleted file mode 100644
index 5b754174..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/FeaturePackageImpl.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ISafetyFunctionAdapter;
-
-import org.fortiss.af3.exploration.model.CommonPackage;
-import org.fortiss.af3.exploration.model.DimensionsPackage;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-
-import org.fortiss.af3.exploration.moea.model.MoeaPackage;
-
-import org.fortiss.af3.exploration.moea.model.feature.FeatureFactory;
-import org.fortiss.af3.exploration.moea.model.feature.FeaturePackage;
-import org.fortiss.af3.exploration.moea.model.feature.SafetyExploration;
-import org.fortiss.af3.exploration.moea.model.feature.TaskInstantiation;
-import org.fortiss.af3.exploration.moea.model.feature.TaskMapping;
-
-import org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage;
-
-import org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-
-import org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage;
-
-import org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class FeaturePackageImpl extends EPackageImpl implements FeaturePackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass safetyExplorationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taskInstantiationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taskMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType iSafetyFunctionAdapterEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.moea.model.feature.FeaturePackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private FeaturePackageImpl() {
-		super(eNS_URI, FeatureFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link FeaturePackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static FeaturePackage init() {
-		if (isInited) return (FeaturePackage)EPackage.Registry.INSTANCE.getEPackage(FeaturePackage.eNS_URI);
-
-		// Obtain or create and register package
-		FeaturePackageImpl theFeaturePackage = (FeaturePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FeaturePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FeaturePackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		CommonPackage.eINSTANCE.eClass();
-		DimensionsPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		MoeaPackageImpl theMoeaPackage = (MoeaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(MoeaPackage.eNS_URI) instanceof MoeaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(MoeaPackage.eNS_URI) : MoeaPackage.eINSTANCE);
-		ParametersPackageImpl theParametersPackage = (ParametersPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ParametersPackage.eNS_URI) instanceof ParametersPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ParametersPackage.eNS_URI) : ParametersPackage.eINSTANCE);
-		PredefinedPackageImpl thePredefinedPackage = (PredefinedPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PredefinedPackage.eNS_URI) instanceof PredefinedPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PredefinedPackage.eNS_URI) : PredefinedPackage.eINSTANCE);
-		SolutionsPackageImpl theSolutionsPackage = (SolutionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SolutionsPackage.eNS_URI) instanceof SolutionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SolutionsPackage.eNS_URI) : SolutionsPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theFeaturePackage.createPackageContents();
-		theMoeaPackage.createPackageContents();
-		theParametersPackage.createPackageContents();
-		thePredefinedPackage.createPackageContents();
-		theSolutionsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theFeaturePackage.initializePackageContents();
-		theMoeaPackage.initializePackageContents();
-		theParametersPackage.initializePackageContents();
-		thePredefinedPackage.initializePackageContents();
-		theSolutionsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theFeaturePackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(FeaturePackage.eNS_URI, theFeaturePackage);
-		return theFeaturePackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSafetyExploration() {
-		return safetyExplorationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSafetyExploration_Adapters() {
-		return (EAttribute)safetyExplorationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTaskInstantiation() {
-		return taskInstantiationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTaskMapping() {
-		return taskMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getISafetyFunctionAdapter() {
-		return iSafetyFunctionAdapterEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureFactory getFeatureFactory() {
-		return (FeatureFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		safetyExplorationEClass = createEClass(SAFETY_EXPLORATION);
-		createEAttribute(safetyExplorationEClass, SAFETY_EXPLORATION__ADAPTERS);
-
-		taskInstantiationEClass = createEClass(TASK_INSTANTIATION);
-
-		taskMappingEClass = createEClass(TASK_MAPPING);
-
-		// Create data types
-		iSafetyFunctionAdapterEDataType = createEDataType(ISAFETY_FUNCTION_ADAPTER);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ExplorationPackage theExplorationPackage = (ExplorationPackage)EPackage.Registry.INSTANCE.getEPackage(ExplorationPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		safetyExplorationEClass.getESuperTypes().add(theExplorationPackage.getIExplorationFeature());
-		taskInstantiationEClass.getESuperTypes().add(theExplorationPackage.getIExplorationFeature());
-		taskMappingEClass.getESuperTypes().add(theExplorationPackage.getIExplorationFeature());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(safetyExplorationEClass, SafetyExploration.class, "SafetyExploration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSafetyExploration_Adapters(), this.getISafetyFunctionAdapter(), "adapters", null, 0, -1, SafetyExploration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(taskInstantiationEClass, TaskInstantiation.class, "TaskInstantiation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(taskMappingEClass, TaskMapping.class, "TaskMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Initialize data types
-		initEDataType(iSafetyFunctionAdapterEDataType, ISafetyFunctionAdapter.class, "ISafetyFunctionAdapter", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-	}
-
-} //FeaturePackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/SafetyExplorationImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/SafetyExplorationImpl.java
deleted file mode 100644
index 5d29e016..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/SafetyExplorationImpl.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
-import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ISafetyFunctionAdapter;
-
-import org.fortiss.af3.exploration.moea.model.feature.FeaturePackage;
-import org.fortiss.af3.exploration.moea.model.feature.SafetyExploration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Safety Exploration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.feature.impl.SafetyExplorationImpl#getAdapters <em>Adapters</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SafetyExplorationImpl extends EObjectImpl implements SafetyExploration {
-	/**
-	 * The cached value of the '{@link #getAdapters() <em>Adapters</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdapters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ISafetyFunctionAdapter> adapters;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SafetyExplorationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return FeaturePackage.Literals.SAFETY_EXPLORATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ISafetyFunctionAdapter> getAdapters() {
-		if (adapters == null) {
-			adapters = new EDataTypeUniqueEList<ISafetyFunctionAdapter>(ISafetyFunctionAdapter.class, this, FeaturePackage.SAFETY_EXPLORATION__ADAPTERS);
-		}
-		return adapters;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FeaturePackage.SAFETY_EXPLORATION__ADAPTERS:
-				return getAdapters();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FeaturePackage.SAFETY_EXPLORATION__ADAPTERS:
-				getAdapters().clear();
-				getAdapters().addAll((Collection<? extends ISafetyFunctionAdapter>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FeaturePackage.SAFETY_EXPLORATION__ADAPTERS:
-				getAdapters().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FeaturePackage.SAFETY_EXPLORATION__ADAPTERS:
-				return adapters != null && !adapters.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (adapters: ");
-		result.append(adapters);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SafetyExplorationImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/TaskInstantiationImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/TaskInstantiationImpl.java
deleted file mode 100644
index 03054ea8..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/TaskInstantiationImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.moea.model.feature.FeaturePackage;
-import org.fortiss.af3.exploration.moea.model.feature.TaskInstantiation;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Task Instantiation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class TaskInstantiationImpl extends EObjectImpl implements TaskInstantiation {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskInstantiationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return FeaturePackage.Literals.TASK_INSTANTIATION;
-	}
-
-} //TaskInstantiationImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/TaskMappingImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/TaskMappingImpl.java
deleted file mode 100644
index 4bde6a73..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/impl/TaskMappingImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.moea.model.feature.FeaturePackage;
-import org.fortiss.af3.exploration.moea.model.feature.TaskMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Task Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class TaskMappingImpl extends EObjectImpl implements TaskMapping {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return FeaturePackage.Literals.TASK_MAPPING;
-	}
-
-} //TaskMappingImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/util/FeatureAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/util/FeatureAdapterFactory.java
deleted file mode 100644
index 2b3f11e3..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/util/FeatureAdapterFactory.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.model.IExplorationFeature;
-
-import org.fortiss.af3.exploration.moea.model.feature.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.feature.FeaturePackage
- * @generated
- */
-public class FeatureAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static FeaturePackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = FeaturePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureSwitch<Adapter> modelSwitch =
-		new FeatureSwitch<Adapter>() {
-			@Override
-			public Adapter caseSafetyExploration(SafetyExploration object) {
-				return createSafetyExplorationAdapter();
-			}
-			@Override
-			public Adapter caseTaskInstantiation(TaskInstantiation object) {
-				return createTaskInstantiationAdapter();
-			}
-			@Override
-			public Adapter caseTaskMapping(TaskMapping object) {
-				return createTaskMappingAdapter();
-			}
-			@Override
-			public Adapter caseIExplorationFeature(IExplorationFeature object) {
-				return createIExplorationFeatureAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.feature.SafetyExploration <em>Safety Exploration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.feature.SafetyExploration
-	 * @generated
-	 */
-	public Adapter createSafetyExplorationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.feature.TaskInstantiation <em>Task Instantiation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.feature.TaskInstantiation
-	 * @generated
-	 */
-	public Adapter createTaskInstantiationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.feature.TaskMapping <em>Task Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.feature.TaskMapping
-	 * @generated
-	 */
-	public Adapter createTaskMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.IExplorationFeature <em>IExploration Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.IExplorationFeature
-	 * @generated
-	 */
-	public Adapter createIExplorationFeatureAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //FeatureAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/util/FeatureSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/util/FeatureSwitch.java
deleted file mode 100644
index 08cd31bd..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/feature/util/FeatureSwitch.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.feature.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.model.IExplorationFeature;
-
-import org.fortiss.af3.exploration.moea.model.feature.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.feature.FeaturePackage
- * @generated
- */
-public class FeatureSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static FeaturePackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureSwitch() {
-		if (modelPackage == null) {
-			modelPackage = FeaturePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case FeaturePackage.SAFETY_EXPLORATION: {
-				SafetyExploration safetyExploration = (SafetyExploration)theEObject;
-				T result = caseSafetyExploration(safetyExploration);
-				if (result == null) result = caseIExplorationFeature(safetyExploration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case FeaturePackage.TASK_INSTANTIATION: {
-				TaskInstantiation taskInstantiation = (TaskInstantiation)theEObject;
-				T result = caseTaskInstantiation(taskInstantiation);
-				if (result == null) result = caseIExplorationFeature(taskInstantiation);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case FeaturePackage.TASK_MAPPING: {
-				TaskMapping taskMapping = (TaskMapping)theEObject;
-				T result = caseTaskMapping(taskMapping);
-				if (result == null) result = caseIExplorationFeature(taskMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Safety Exploration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Safety Exploration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSafetyExploration(SafetyExploration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Task Instantiation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Task Instantiation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTaskInstantiation(TaskInstantiation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Task Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Task Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTaskMapping(TaskMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IExploration Feature</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IExploration Feature</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIExplorationFeature(IExplorationFeature object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //FeatureSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/DseSpecificationImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/DseSpecificationImpl.java
deleted file mode 100644
index bc4f4268..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/DseSpecificationImpl.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.fortiss.af3.exploration.model.ExplorationSpecification;
-import org.fortiss.af3.exploration.model.IExplorationFeature;
-
-import org.fortiss.af3.exploration.moea.model.DseSpecification;
-import org.fortiss.af3.exploration.moea.model.MoeaPackage;
-
-import org.fortiss.af3.exploration.moea.model.parameters.IOptimizer;
-import org.fortiss.af3.exploration.moea.model.parameters.SystemParameters;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dse Specification</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.DseSpecificationImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.DseSpecificationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.DseSpecificationImpl#getComment <em>Comment</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.DseSpecificationImpl#getFeatures <em>Features</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.DseSpecificationImpl#getOptimizer <em>Optimizer</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.DseSpecificationImpl#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.DseSpecificationImpl#getTargetSpecification <em>Target Specification</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DseSpecificationImpl extends EObjectImpl implements DseSpecification {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected int id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getFeatures() <em>Features</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFeatures()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<IExplorationFeature> features;
-
-	/**
-	 * The cached value of the '{@link #getOptimizer() <em>Optimizer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOptimizer()
-	 * @generated
-	 * @ordered
-	 */
-	protected IOptimizer optimizer;
-
-	/**
-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParameters()
-	 * @generated
-	 * @ordered
-	 */
-	protected SystemParameters parameters;
-
-	/**
-	 * The cached value of the '{@link #getTargetSpecification() <em>Target Specification</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetSpecification()
-	 * @generated
-	 * @ordered
-	 */
-	protected ExplorationSpecification targetSpecification;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DseSpecificationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MoeaPackage.Literals.DSE_SPECIFICATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(int newId) {
-		int oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.DSE_SPECIFICATION__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.DSE_SPECIFICATION__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.DSE_SPECIFICATION__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<IExplorationFeature> getFeatures() {
-		if (features == null) {
-			features = new EObjectContainmentEList.Resolving<IExplorationFeature>(IExplorationFeature.class, this, MoeaPackage.DSE_SPECIFICATION__FEATURES);
-		}
-		return features;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IOptimizer getOptimizer() {
-		if (optimizer != null && optimizer.eIsProxy()) {
-			InternalEObject oldOptimizer = (InternalEObject)optimizer;
-			optimizer = (IOptimizer)eResolveProxy(oldOptimizer);
-			if (optimizer != oldOptimizer) {
-				InternalEObject newOptimizer = (InternalEObject)optimizer;
-				NotificationChain msgs = oldOptimizer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__OPTIMIZER, null, null);
-				if (newOptimizer.eInternalContainer() == null) {
-					msgs = newOptimizer.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__OPTIMIZER, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MoeaPackage.DSE_SPECIFICATION__OPTIMIZER, oldOptimizer, optimizer));
-			}
-		}
-		return optimizer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IOptimizer basicGetOptimizer() {
-		return optimizer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOptimizer(IOptimizer newOptimizer, NotificationChain msgs) {
-		IOptimizer oldOptimizer = optimizer;
-		optimizer = newOptimizer;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MoeaPackage.DSE_SPECIFICATION__OPTIMIZER, oldOptimizer, newOptimizer);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOptimizer(IOptimizer newOptimizer) {
-		if (newOptimizer != optimizer) {
-			NotificationChain msgs = null;
-			if (optimizer != null)
-				msgs = ((InternalEObject)optimizer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__OPTIMIZER, null, msgs);
-			if (newOptimizer != null)
-				msgs = ((InternalEObject)newOptimizer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__OPTIMIZER, null, msgs);
-			msgs = basicSetOptimizer(newOptimizer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.DSE_SPECIFICATION__OPTIMIZER, newOptimizer, newOptimizer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SystemParameters getParameters() {
-		if (parameters != null && parameters.eIsProxy()) {
-			InternalEObject oldParameters = (InternalEObject)parameters;
-			parameters = (SystemParameters)eResolveProxy(oldParameters);
-			if (parameters != oldParameters) {
-				InternalEObject newParameters = (InternalEObject)parameters;
-				NotificationChain msgs = oldParameters.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__PARAMETERS, null, null);
-				if (newParameters.eInternalContainer() == null) {
-					msgs = newParameters.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__PARAMETERS, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MoeaPackage.DSE_SPECIFICATION__PARAMETERS, oldParameters, parameters));
-			}
-		}
-		return parameters;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SystemParameters basicGetParameters() {
-		return parameters;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetParameters(SystemParameters newParameters, NotificationChain msgs) {
-		SystemParameters oldParameters = parameters;
-		parameters = newParameters;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MoeaPackage.DSE_SPECIFICATION__PARAMETERS, oldParameters, newParameters);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParameters(SystemParameters newParameters) {
-		if (newParameters != parameters) {
-			NotificationChain msgs = null;
-			if (parameters != null)
-				msgs = ((InternalEObject)parameters).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__PARAMETERS, null, msgs);
-			if (newParameters != null)
-				msgs = ((InternalEObject)newParameters).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__PARAMETERS, null, msgs);
-			msgs = basicSetParameters(newParameters, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.DSE_SPECIFICATION__PARAMETERS, newParameters, newParameters));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationSpecification getTargetSpecification() {
-		if (targetSpecification != null && targetSpecification.eIsProxy()) {
-			InternalEObject oldTargetSpecification = (InternalEObject)targetSpecification;
-			targetSpecification = (ExplorationSpecification)eResolveProxy(oldTargetSpecification);
-			if (targetSpecification != oldTargetSpecification) {
-				InternalEObject newTargetSpecification = (InternalEObject)targetSpecification;
-				NotificationChain msgs = oldTargetSpecification.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION, null, null);
-				if (newTargetSpecification.eInternalContainer() == null) {
-					msgs = newTargetSpecification.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION, oldTargetSpecification, targetSpecification));
-			}
-		}
-		return targetSpecification;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationSpecification basicGetTargetSpecification() {
-		return targetSpecification;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTargetSpecification(ExplorationSpecification newTargetSpecification, NotificationChain msgs) {
-		ExplorationSpecification oldTargetSpecification = targetSpecification;
-		targetSpecification = newTargetSpecification;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION, oldTargetSpecification, newTargetSpecification);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTargetSpecification(ExplorationSpecification newTargetSpecification) {
-		if (newTargetSpecification != targetSpecification) {
-			NotificationChain msgs = null;
-			if (targetSpecification != null)
-				msgs = ((InternalEObject)targetSpecification).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION, null, msgs);
-			if (newTargetSpecification != null)
-				msgs = ((InternalEObject)newTargetSpecification).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION, null, msgs);
-			msgs = basicSetTargetSpecification(newTargetSpecification, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION, newTargetSpecification, newTargetSpecification));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MoeaPackage.DSE_SPECIFICATION__FEATURES:
-				return ((InternalEList<?>)getFeatures()).basicRemove(otherEnd, msgs);
-			case MoeaPackage.DSE_SPECIFICATION__OPTIMIZER:
-				return basicSetOptimizer(null, msgs);
-			case MoeaPackage.DSE_SPECIFICATION__PARAMETERS:
-				return basicSetParameters(null, msgs);
-			case MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION:
-				return basicSetTargetSpecification(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MoeaPackage.DSE_SPECIFICATION__ID:
-				return getId();
-			case MoeaPackage.DSE_SPECIFICATION__NAME:
-				return getName();
-			case MoeaPackage.DSE_SPECIFICATION__COMMENT:
-				return getComment();
-			case MoeaPackage.DSE_SPECIFICATION__FEATURES:
-				return getFeatures();
-			case MoeaPackage.DSE_SPECIFICATION__OPTIMIZER:
-				if (resolve) return getOptimizer();
-				return basicGetOptimizer();
-			case MoeaPackage.DSE_SPECIFICATION__PARAMETERS:
-				if (resolve) return getParameters();
-				return basicGetParameters();
-			case MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION:
-				if (resolve) return getTargetSpecification();
-				return basicGetTargetSpecification();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MoeaPackage.DSE_SPECIFICATION__ID:
-				setId((Integer)newValue);
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__NAME:
-				setName((String)newValue);
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__COMMENT:
-				setComment((String)newValue);
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__FEATURES:
-				getFeatures().clear();
-				getFeatures().addAll((Collection<? extends IExplorationFeature>)newValue);
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__OPTIMIZER:
-				setOptimizer((IOptimizer)newValue);
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__PARAMETERS:
-				setParameters((SystemParameters)newValue);
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION:
-				setTargetSpecification((ExplorationSpecification)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MoeaPackage.DSE_SPECIFICATION__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__COMMENT:
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__FEATURES:
-				getFeatures().clear();
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__OPTIMIZER:
-				setOptimizer((IOptimizer)null);
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__PARAMETERS:
-				setParameters((SystemParameters)null);
-				return;
-			case MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION:
-				setTargetSpecification((ExplorationSpecification)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MoeaPackage.DSE_SPECIFICATION__ID:
-				return id != ID_EDEFAULT;
-			case MoeaPackage.DSE_SPECIFICATION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case MoeaPackage.DSE_SPECIFICATION__COMMENT:
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case MoeaPackage.DSE_SPECIFICATION__FEATURES:
-				return features != null && !features.isEmpty();
-			case MoeaPackage.DSE_SPECIFICATION__OPTIMIZER:
-				return optimizer != null;
-			case MoeaPackage.DSE_SPECIFICATION__PARAMETERS:
-				return parameters != null;
-			case MoeaPackage.DSE_SPECIFICATION__TARGET_SPECIFICATION:
-				return targetSpecification != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", comment: ");
-		result.append(comment);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DseSpecificationImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/ExplorationManagerImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/ExplorationManagerImpl.java
deleted file mode 100644
index 92f66e58..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/ExplorationManagerImpl.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.fortiss.af3.exploration.moea.model.DseSpecification;
-import org.fortiss.af3.exploration.moea.model.ExplorationManager;
-import org.fortiss.af3.exploration.moea.model.MoeaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Exploration Manager</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.ExplorationManagerImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.ExplorationManagerImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.ExplorationManagerImpl#getComment <em>Comment</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.ExplorationManagerImpl#getDseSpecifications <em>Dse Specifications</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExplorationManagerImpl extends EObjectImpl implements ExplorationManager {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected int id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDseSpecifications() <em>Dse Specifications</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDseSpecifications()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<DseSpecification> dseSpecifications;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExplorationManagerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MoeaPackage.Literals.EXPLORATION_MANAGER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(int newId) {
-		int oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.EXPLORATION_MANAGER__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.EXPLORATION_MANAGER__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.EXPLORATION_MANAGER__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<DseSpecification> getDseSpecifications() {
-		if (dseSpecifications == null) {
-			dseSpecifications = new EObjectContainmentEList.Resolving<DseSpecification>(DseSpecification.class, this, MoeaPackage.EXPLORATION_MANAGER__DSE_SPECIFICATIONS);
-		}
-		return dseSpecifications;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MoeaPackage.EXPLORATION_MANAGER__DSE_SPECIFICATIONS:
-				return ((InternalEList<?>)getDseSpecifications()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MoeaPackage.EXPLORATION_MANAGER__ID:
-				return getId();
-			case MoeaPackage.EXPLORATION_MANAGER__NAME:
-				return getName();
-			case MoeaPackage.EXPLORATION_MANAGER__COMMENT:
-				return getComment();
-			case MoeaPackage.EXPLORATION_MANAGER__DSE_SPECIFICATIONS:
-				return getDseSpecifications();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MoeaPackage.EXPLORATION_MANAGER__ID:
-				setId((Integer)newValue);
-				return;
-			case MoeaPackage.EXPLORATION_MANAGER__NAME:
-				setName((String)newValue);
-				return;
-			case MoeaPackage.EXPLORATION_MANAGER__COMMENT:
-				setComment((String)newValue);
-				return;
-			case MoeaPackage.EXPLORATION_MANAGER__DSE_SPECIFICATIONS:
-				getDseSpecifications().clear();
-				getDseSpecifications().addAll((Collection<? extends DseSpecification>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MoeaPackage.EXPLORATION_MANAGER__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case MoeaPackage.EXPLORATION_MANAGER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case MoeaPackage.EXPLORATION_MANAGER__COMMENT:
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case MoeaPackage.EXPLORATION_MANAGER__DSE_SPECIFICATIONS:
-				getDseSpecifications().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MoeaPackage.EXPLORATION_MANAGER__ID:
-				return id != ID_EDEFAULT;
-			case MoeaPackage.EXPLORATION_MANAGER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case MoeaPackage.EXPLORATION_MANAGER__COMMENT:
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case MoeaPackage.EXPLORATION_MANAGER__DSE_SPECIFICATIONS:
-				return dseSpecifications != null && !dseSpecifications.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", comment: ");
-		result.append(comment);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ExplorationManagerImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/ImplementsComponentRefImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/ImplementsComponentRefImpl.java
deleted file mode 100644
index c9d4b390..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/ImplementsComponentRefImpl.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.moea.model.ImplementsComponentRef;
-import org.fortiss.af3.exploration.moea.model.MoeaPackage;
-
-import org.fortiss.tooling.base.model.element.ElementPackage;
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Implements Component Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.ImplementsComponentRefImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.ImplementsComponentRefImpl#getSpecificationOf <em>Specification Of</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.ImplementsComponentRefImpl#getRefComponent <em>Ref Component</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ImplementsComponentRefImpl extends EObjectImpl implements ImplementsComponentRef {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected int id = ID_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getRefComponent() <em>Ref Component</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRefComponent()
-	 * @generated
-	 * @ordered
-	 */
-	protected Component refComponent;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ImplementsComponentRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MoeaPackage.Literals.IMPLEMENTS_COMPONENT_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(int newId) {
-		int oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.IMPLEMENTS_COMPONENT_REF__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IModelElement getSpecificationOf() {
-		if (eContainerFeatureID() != MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF) return null;
-		return (IModelElement)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IModelElement basicGetSpecificationOf() {
-		if (eContainerFeatureID() != MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF) return null;
-		return (IModelElement)eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSpecificationOf(IModelElement newSpecificationOf, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newSpecificationOf, MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSpecificationOf(IModelElement newSpecificationOf) {
-		if (newSpecificationOf != eInternalContainer() || (eContainerFeatureID() != MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF && newSpecificationOf != null)) {
-			if (EcoreUtil.isAncestor(this, newSpecificationOf))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newSpecificationOf != null)
-				msgs = ((InternalEObject)newSpecificationOf).eInverseAdd(this, ElementPackage.IMODEL_ELEMENT__SPECIFICATIONS, IModelElement.class, msgs);
-			msgs = basicSetSpecificationOf(newSpecificationOf, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF, newSpecificationOf, newSpecificationOf));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Component getRefComponent() {
-		if (refComponent != null && refComponent.eIsProxy()) {
-			InternalEObject oldRefComponent = (InternalEObject)refComponent;
-			refComponent = (Component)eResolveProxy(oldRefComponent);
-			if (refComponent != oldRefComponent) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MoeaPackage.IMPLEMENTS_COMPONENT_REF__REF_COMPONENT, oldRefComponent, refComponent));
-			}
-		}
-		return refComponent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Component basicGetRefComponent() {
-		return refComponent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRefComponent(Component newRefComponent) {
-		Component oldRefComponent = refComponent;
-		refComponent = newRefComponent;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.IMPLEMENTS_COMPONENT_REF__REF_COMPONENT, oldRefComponent, refComponent));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetSpecificationOf((IModelElement)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF:
-				return basicSetSpecificationOf(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF:
-				return eInternalContainer().eInverseRemove(this, ElementPackage.IMODEL_ELEMENT__SPECIFICATIONS, IModelElement.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__ID:
-				return getId();
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF:
-				if (resolve) return getSpecificationOf();
-				return basicGetSpecificationOf();
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__REF_COMPONENT:
-				if (resolve) return getRefComponent();
-				return basicGetRefComponent();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__ID:
-				setId((Integer)newValue);
-				return;
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF:
-				setSpecificationOf((IModelElement)newValue);
-				return;
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__REF_COMPONENT:
-				setRefComponent((Component)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF:
-				setSpecificationOf((IModelElement)null);
-				return;
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__REF_COMPONENT:
-				setRefComponent((Component)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__ID:
-				return id != ID_EDEFAULT;
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__SPECIFICATION_OF:
-				return basicGetSpecificationOf() != null;
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF__REF_COMPONENT:
-				return refComponent != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ImplementsComponentRefImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/MoeaFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/MoeaFactoryImpl.java
deleted file mode 100644
index 7c5bdade..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/MoeaFactoryImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.moea.model.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MoeaFactoryImpl extends EFactoryImpl implements MoeaFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MoeaFactory init() {
-		try {
-			MoeaFactory theMoeaFactory = (MoeaFactory)EPackage.Registry.INSTANCE.getEFactory(MoeaPackage.eNS_URI);
-			if (theMoeaFactory != null) {
-				return theMoeaFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new MoeaFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MoeaFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case MoeaPackage.EXPLORATION_MANAGER: return createExplorationManager();
-			case MoeaPackage.DSE_SPECIFICATION: return createDseSpecification();
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF: return createImplementsComponentRef();
-			case MoeaPackage.VOTER_TYPE: return createVoterType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case MoeaPackage.VOTER_TYPE_T:
-				return createVoterType_tFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case MoeaPackage.VOTER_TYPE_T:
-				return convertVoterType_tToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationManager createExplorationManager() {
-		ExplorationManagerImpl explorationManager = new ExplorationManagerImpl();
-		return explorationManager;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DseSpecification createDseSpecification() {
-		DseSpecificationImpl dseSpecification = new DseSpecificationImpl();
-		return dseSpecification;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ImplementsComponentRef createImplementsComponentRef() {
-		ImplementsComponentRefImpl implementsComponentRef = new ImplementsComponentRefImpl();
-		return implementsComponentRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VoterType createVoterType() {
-		VoterTypeImpl voterType = new VoterTypeImpl();
-		return voterType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VoterType_t createVoterType_tFromString(EDataType eDataType, String initialValue) {
-		VoterType_t result = VoterType_t.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertVoterType_tToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MoeaPackage getMoeaPackage() {
-		return (MoeaPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static MoeaPackage getPackage() {
-		return MoeaPackage.eINSTANCE;
-	}
-
-} //MoeaFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/MoeaPackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/MoeaPackageImpl.java
deleted file mode 100644
index 3bfac136..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/MoeaPackageImpl.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.component.model.AF3ComponentPackage;
-
-import org.fortiss.af3.exploration.model.CommonPackage;
-import org.fortiss.af3.exploration.model.DimensionsPackage;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-
-import org.fortiss.af3.exploration.moea.model.DseSpecification;
-import org.fortiss.af3.exploration.moea.model.ExplorationManager;
-import org.fortiss.af3.exploration.moea.model.ImplementsComponentRef;
-import org.fortiss.af3.exploration.moea.model.MoeaFactory;
-import org.fortiss.af3.exploration.moea.model.MoeaPackage;
-
-import org.fortiss.af3.exploration.moea.model.VoterType;
-import org.fortiss.af3.exploration.moea.model.VoterType_t;
-import org.fortiss.af3.exploration.moea.model.feature.FeaturePackage;
-
-import org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage;
-
-import org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-
-import org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage;
-
-import org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl;
-
-import org.fortiss.tooling.base.model.element.ElementPackage;
-
-import org.fortiss.tooling.kernel.model.FortissToolingKernelPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MoeaPackageImpl extends EPackageImpl implements MoeaPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass explorationManagerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass dseSpecificationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass implementsComponentRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass voterTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum voterType_tEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.moea.model.MoeaPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private MoeaPackageImpl() {
-		super(eNS_URI, MoeaFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link MoeaPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static MoeaPackage init() {
-		if (isInited) return (MoeaPackage)EPackage.Registry.INSTANCE.getEPackage(MoeaPackage.eNS_URI);
-
-		// Obtain or create and register package
-		MoeaPackageImpl theMoeaPackage = (MoeaPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MoeaPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MoeaPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		CommonPackage.eINSTANCE.eClass();
-		DimensionsPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		FeaturePackageImpl theFeaturePackage = (FeaturePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(FeaturePackage.eNS_URI) instanceof FeaturePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(FeaturePackage.eNS_URI) : FeaturePackage.eINSTANCE);
-		ParametersPackageImpl theParametersPackage = (ParametersPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ParametersPackage.eNS_URI) instanceof ParametersPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ParametersPackage.eNS_URI) : ParametersPackage.eINSTANCE);
-		PredefinedPackageImpl thePredefinedPackage = (PredefinedPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PredefinedPackage.eNS_URI) instanceof PredefinedPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PredefinedPackage.eNS_URI) : PredefinedPackage.eINSTANCE);
-		SolutionsPackageImpl theSolutionsPackage = (SolutionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SolutionsPackage.eNS_URI) instanceof SolutionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SolutionsPackage.eNS_URI) : SolutionsPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theMoeaPackage.createPackageContents();
-		theFeaturePackage.createPackageContents();
-		theParametersPackage.createPackageContents();
-		thePredefinedPackage.createPackageContents();
-		theSolutionsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theMoeaPackage.initializePackageContents();
-		theFeaturePackage.initializePackageContents();
-		theParametersPackage.initializePackageContents();
-		thePredefinedPackage.initializePackageContents();
-		theSolutionsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theMoeaPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(MoeaPackage.eNS_URI, theMoeaPackage);
-		return theMoeaPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExplorationManager() {
-		return explorationManagerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExplorationManager_DseSpecifications() {
-		return (EReference)explorationManagerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDseSpecification() {
-		return dseSpecificationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDseSpecification_Features() {
-		return (EReference)dseSpecificationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDseSpecification_Optimizer() {
-		return (EReference)dseSpecificationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDseSpecification_Parameters() {
-		return (EReference)dseSpecificationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDseSpecification_TargetSpecification() {
-		return (EReference)dseSpecificationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getImplementsComponentRef() {
-		return implementsComponentRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getImplementsComponentRef_RefComponent() {
-		return (EReference)implementsComponentRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getVoterType() {
-		return voterTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getVoterType_Type() {
-		return (EAttribute)voterTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getVoterType_t() {
-		return voterType_tEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MoeaFactory getMoeaFactory() {
-		return (MoeaFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		explorationManagerEClass = createEClass(EXPLORATION_MANAGER);
-		createEReference(explorationManagerEClass, EXPLORATION_MANAGER__DSE_SPECIFICATIONS);
-
-		dseSpecificationEClass = createEClass(DSE_SPECIFICATION);
-		createEReference(dseSpecificationEClass, DSE_SPECIFICATION__FEATURES);
-		createEReference(dseSpecificationEClass, DSE_SPECIFICATION__OPTIMIZER);
-		createEReference(dseSpecificationEClass, DSE_SPECIFICATION__PARAMETERS);
-		createEReference(dseSpecificationEClass, DSE_SPECIFICATION__TARGET_SPECIFICATION);
-
-		implementsComponentRefEClass = createEClass(IMPLEMENTS_COMPONENT_REF);
-		createEReference(implementsComponentRefEClass, IMPLEMENTS_COMPONENT_REF__REF_COMPONENT);
-
-		voterTypeEClass = createEClass(VOTER_TYPE);
-		createEAttribute(voterTypeEClass, VOTER_TYPE__TYPE);
-
-		// Create enums
-		voterType_tEEnum = createEEnum(VOTER_TYPE_T);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		FeaturePackage theFeaturePackage = (FeaturePackage)EPackage.Registry.INSTANCE.getEPackage(FeaturePackage.eNS_URI);
-		ParametersPackage theParametersPackage = (ParametersPackage)EPackage.Registry.INSTANCE.getEPackage(ParametersPackage.eNS_URI);
-		PredefinedPackage thePredefinedPackage = (PredefinedPackage)EPackage.Registry.INSTANCE.getEPackage(PredefinedPackage.eNS_URI);
-		SolutionsPackage theSolutionsPackage = (SolutionsPackage)EPackage.Registry.INSTANCE.getEPackage(SolutionsPackage.eNS_URI);
-		FortissToolingKernelPackage theFortissToolingKernelPackage = (FortissToolingKernelPackage)EPackage.Registry.INSTANCE.getEPackage(FortissToolingKernelPackage.eNS_URI);
-		ExplorationPackage theExplorationPackage = (ExplorationPackage)EPackage.Registry.INSTANCE.getEPackage(ExplorationPackage.eNS_URI);
-		ElementPackage theElementPackage = (ElementPackage)EPackage.Registry.INSTANCE.getEPackage(ElementPackage.eNS_URI);
-		AF3ComponentPackage theAF3ComponentPackage = (AF3ComponentPackage)EPackage.Registry.INSTANCE.getEPackage(AF3ComponentPackage.eNS_URI);
-
-		// Add subpackages
-		getESubpackages().add(theFeaturePackage);
-		getESubpackages().add(theParametersPackage);
-		getESubpackages().add(thePredefinedPackage);
-		getESubpackages().add(theSolutionsPackage);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		explorationManagerEClass.getESuperTypes().add(theFortissToolingKernelPackage.getIProjectRootElement());
-		dseSpecificationEClass.getESuperTypes().add(theFortissToolingKernelPackage.getINamedCommentedElement());
-		implementsComponentRefEClass.getESuperTypes().add(theElementPackage.getIHiddenSpecification());
-		voterTypeEClass.getESuperTypes().add(theElementPackage.getIHiddenSpecification());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(explorationManagerEClass, ExplorationManager.class, "ExplorationManager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getExplorationManager_DseSpecifications(), this.getDseSpecification(), null, "dseSpecifications", null, 0, -1, ExplorationManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(dseSpecificationEClass, DseSpecification.class, "DseSpecification", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDseSpecification_Features(), theExplorationPackage.getIExplorationFeature(), null, "features", null, 1, -1, DseSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDseSpecification_Optimizer(), theParametersPackage.getIOptimizer(), null, "optimizer", null, 1, 1, DseSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDseSpecification_Parameters(), theParametersPackage.getSystemParameters(), null, "parameters", null, 1, 1, DseSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDseSpecification_TargetSpecification(), theExplorationPackage.getExplorationSpecification(), null, "targetSpecification", null, 1, 1, DseSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(implementsComponentRefEClass, ImplementsComponentRef.class, "ImplementsComponentRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getImplementsComponentRef_RefComponent(), theAF3ComponentPackage.getComponent(), null, "refComponent", null, 1, 1, ImplementsComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(voterTypeEClass, VoterType.class, "VoterType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getVoterType_Type(), this.getVoterType_t(), "type", null, 1, 1, VoterType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(voterType_tEEnum, VoterType_t.class, "VoterType_t");
-		addEEnumLiteral(voterType_tEEnum, VoterType_t.MAJORITY_VOTER);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //MoeaPackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/VoterTypeImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/VoterTypeImpl.java
deleted file mode 100644
index 2006609d..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/impl/VoterTypeImpl.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.fortiss.af3.exploration.moea.model.MoeaPackage;
-import org.fortiss.af3.exploration.moea.model.VoterType;
-import org.fortiss.af3.exploration.moea.model.VoterType_t;
-
-import org.fortiss.tooling.base.model.element.ElementPackage;
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Voter Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.VoterTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.VoterTypeImpl#getSpecificationOf <em>Specification Of</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.impl.VoterTypeImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class VoterTypeImpl extends EObjectImpl implements VoterType {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected int id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final VoterType_t TYPE_EDEFAULT = VoterType_t.MAJORITY_VOTER;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected VoterType_t type = TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected VoterTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MoeaPackage.Literals.VOTER_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(int newId) {
-		int oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.VOTER_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IModelElement getSpecificationOf() {
-		if (eContainerFeatureID() != MoeaPackage.VOTER_TYPE__SPECIFICATION_OF) return null;
-		return (IModelElement)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IModelElement basicGetSpecificationOf() {
-		if (eContainerFeatureID() != MoeaPackage.VOTER_TYPE__SPECIFICATION_OF) return null;
-		return (IModelElement)eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSpecificationOf(IModelElement newSpecificationOf, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newSpecificationOf, MoeaPackage.VOTER_TYPE__SPECIFICATION_OF, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSpecificationOf(IModelElement newSpecificationOf) {
-		if (newSpecificationOf != eInternalContainer() || (eContainerFeatureID() != MoeaPackage.VOTER_TYPE__SPECIFICATION_OF && newSpecificationOf != null)) {
-			if (EcoreUtil.isAncestor(this, newSpecificationOf))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newSpecificationOf != null)
-				msgs = ((InternalEObject)newSpecificationOf).eInverseAdd(this, ElementPackage.IMODEL_ELEMENT__SPECIFICATIONS, IModelElement.class, msgs);
-			msgs = basicSetSpecificationOf(newSpecificationOf, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.VOTER_TYPE__SPECIFICATION_OF, newSpecificationOf, newSpecificationOf));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VoterType_t getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(VoterType_t newType) {
-		VoterType_t oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MoeaPackage.VOTER_TYPE__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MoeaPackage.VOTER_TYPE__SPECIFICATION_OF:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetSpecificationOf((IModelElement)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MoeaPackage.VOTER_TYPE__SPECIFICATION_OF:
-				return basicSetSpecificationOf(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case MoeaPackage.VOTER_TYPE__SPECIFICATION_OF:
-				return eInternalContainer().eInverseRemove(this, ElementPackage.IMODEL_ELEMENT__SPECIFICATIONS, IModelElement.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MoeaPackage.VOTER_TYPE__ID:
-				return getId();
-			case MoeaPackage.VOTER_TYPE__SPECIFICATION_OF:
-				if (resolve) return getSpecificationOf();
-				return basicGetSpecificationOf();
-			case MoeaPackage.VOTER_TYPE__TYPE:
-				return getType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MoeaPackage.VOTER_TYPE__ID:
-				setId((Integer)newValue);
-				return;
-			case MoeaPackage.VOTER_TYPE__SPECIFICATION_OF:
-				setSpecificationOf((IModelElement)newValue);
-				return;
-			case MoeaPackage.VOTER_TYPE__TYPE:
-				setType((VoterType_t)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MoeaPackage.VOTER_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case MoeaPackage.VOTER_TYPE__SPECIFICATION_OF:
-				setSpecificationOf((IModelElement)null);
-				return;
-			case MoeaPackage.VOTER_TYPE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MoeaPackage.VOTER_TYPE__ID:
-				return id != ID_EDEFAULT;
-			case MoeaPackage.VOTER_TYPE__SPECIFICATION_OF:
-				return basicGetSpecificationOf() != null;
-			case MoeaPackage.VOTER_TYPE__TYPE:
-				return type != TYPE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", type: ");
-		result.append(type);
-		result.append(')');
-		return result.toString();
-	}
-
-} //VoterTypeImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/EAOptimizer.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/EAOptimizer.java
deleted file mode 100644
index 5a77fc72..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/EAOptimizer.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>EA Optimizer</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * {@link IOptimizer} backend for evolutionary algorithms which also contains the relevant parameters for this kind of optimizer.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getAlpha <em>Alpha</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getMu <em>Mu</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getIterations <em>Iterations</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getSpea2Tournament <em>Spea2 Tournament</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#isParallelExecution <em>Parallel Execution</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage#getEAOptimizer()
- * @model
- * @generated
- */
-public interface EAOptimizer extends IOptimizer {
-	/**
-	 * Returns the value of the '<em><b>Alpha</b></em>' attribute.
-	 * The default value is <code>"1000"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the size of the population.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Alpha</em>' attribute.
-	 * @see #setAlpha(int)
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage#getEAOptimizer_Alpha()
-	 * @model default="1000" required="true"
-	 * @generated
-	 */
-	int getAlpha();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getAlpha <em>Alpha</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Alpha</em>' attribute.
-	 * @see #getAlpha()
-	 * @generated
-	 */
-	void setAlpha(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Mu</b></em>' attribute.
-	 * The default value is <code>"50"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Number of parents to generate the offspring added to the population for the next iteration of the algorithm.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mu</em>' attribute.
-	 * @see #setMu(int)
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage#getEAOptimizer_Mu()
-	 * @model default="50" required="true"
-	 * @generated
-	 */
-	int getMu();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getMu <em>Mu</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mu</em>' attribute.
-	 * @see #getMu()
-	 * @generated
-	 */
-	void setMu(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Iterations</b></em>' attribute.
-	 * The default value is <code>"100"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the number of iterations (aka generations) before the optimization terminates and the found solution(s) (if any) are returned.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Iterations</em>' attribute.
-	 * @see #setIterations(int)
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage#getEAOptimizer_Iterations()
-	 * @model default="100" required="true"
-	 * @generated
-	 */
-	int getIterations();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getIterations <em>Iterations</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Iterations</em>' attribute.
-	 * @see #getIterations()
-	 * @generated
-	 */
-	void setIterations(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Spea2 Tournament</b></em>' attribute.
-	 * The default value is <code>"5"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the selection pressure for the SPEA2 genetic algorithm.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Spea2 Tournament</em>' attribute.
-	 * @see #setSpea2Tournament(int)
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage#getEAOptimizer_Spea2Tournament()
-	 * @model default="5" required="true"
-	 * @generated
-	 */
-	int getSpea2Tournament();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getSpea2Tournament <em>Spea2 Tournament</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Spea2 Tournament</em>' attribute.
-	 * @see #getSpea2Tournament()
-	 * @generated
-	 */
-	void setSpea2Tournament(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Parallel Execution</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines whether the algorithm shall use parallel processing, if available in the algorithm.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parallel Execution</em>' attribute.
-	 * @see #setParallelExecution(boolean)
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage#getEAOptimizer_ParallelExecution()
-	 * @model default="false" required="true"
-	 * @generated
-	 */
-	boolean isParallelExecution();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#isParallelExecution <em>Parallel Execution</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parallel Execution</em>' attribute.
-	 * @see #isParallelExecution()
-	 * @generated
-	 */
-	void setParallelExecution(boolean value);
-
-} // EAOptimizer
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ExecutionModel.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ExecutionModel.java
deleted file mode 100644
index dcb9cfbc..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ExecutionModel.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Execution Model</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Defines the failure assumption.
- * <!-- end-model-doc -->
- * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage#getExecutionModel()
- * @model
- * @generated
- */
-public enum ExecutionModel implements Enumerator {
-	/**
-	 * The '<em><b>TT FAIL SILENCE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TT_FAIL_SILENCE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	TT_FAIL_SILENCE(0, "TT_FAIL_SILENCE", "TT_FAIL_SILENCE"),
-
-	/**
-	 * The '<em><b>TT FAULT DETECTION VOTING</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TT_FAULT_DETECTION_VOTING_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	TT_FAULT_DETECTION_VOTING(1, "TT_FAULT_DETECTION_VOTING", "TT_FAULT_DETECTION_VOTING");
-
-	/**
-	 * The '<em><b>TT FAIL SILENCE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TT FAIL SILENCE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TT_FAIL_SILENCE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TT_FAIL_SILENCE_VALUE = 0;
-
-	/**
-	 * The '<em><b>TT FAULT DETECTION VOTING</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TT FAULT DETECTION VOTING</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TT_FAULT_DETECTION_VOTING
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TT_FAULT_DETECTION_VOTING_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Execution Model</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ExecutionModel[] VALUES_ARRAY =
-		new ExecutionModel[] {
-			TT_FAIL_SILENCE,
-			TT_FAULT_DETECTION_VOTING,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Execution Model</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<ExecutionModel> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Execution Model</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ExecutionModel get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ExecutionModel result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Execution Model</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ExecutionModel getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ExecutionModel result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Execution Model</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ExecutionModel get(int value) {
-		switch (value) {
-			case TT_FAIL_SILENCE_VALUE: return TT_FAIL_SILENCE;
-			case TT_FAULT_DETECTION_VOTING_VALUE: return TT_FAULT_DETECTION_VOTING;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ExecutionModel(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //ExecutionModel
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/IOptimizer.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/IOptimizer.java
deleted file mode 100644
index 876c45c8..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/IOptimizer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IOptimizer</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Marker interface for available optimization backends for the DSE.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage#getIOptimizer()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface IOptimizer extends EObject {
-} // IOptimizer
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ParametersFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ParametersFactory.java
deleted file mode 100644
index adc20b3c..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ParametersFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage
- * @generated
- */
-public interface ParametersFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ParametersFactory eINSTANCE = org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>System Parameters</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>System Parameters</em>'.
-	 * @generated
-	 */
-	SystemParameters createSystemParameters();
-
-	/**
-	 * Returns a new object of class '<em>EA Optimizer</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>EA Optimizer</em>'.
-	 * @generated
-	 */
-	EAOptimizer createEAOptimizer();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ParametersPackage getParametersPackage();
-
-} //ParametersFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ParametersPackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ParametersPackage.java
deleted file mode 100644
index 55344910..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/ParametersPackage.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersFactory
- * @model kind="package"
- * @generated
- */
-public interface ParametersPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "parameters";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/moea/parameters";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-moea-parameters";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ParametersPackage eINSTANCE = org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.parameters.impl.SystemParametersImpl <em>System Parameters</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.SystemParametersImpl
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl#getSystemParameters()
-	 * @generated
-	 */
-	int SYSTEM_PARAMETERS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Execution Model</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SYSTEM_PARAMETERS__EXECUTION_MODEL = 0;
-
-	/**
-	 * The number of structural features of the '<em>System Parameters</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SYSTEM_PARAMETERS_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.parameters.IOptimizer <em>IOptimizer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.IOptimizer
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl#getIOptimizer()
-	 * @generated
-	 */
-	int IOPTIMIZER = 1;
-
-	/**
-	 * The number of structural features of the '<em>IOptimizer</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IOPTIMIZER_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.parameters.impl.EAOptimizerImpl <em>EA Optimizer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.EAOptimizerImpl
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl#getEAOptimizer()
-	 * @generated
-	 */
-	int EA_OPTIMIZER = 2;
-
-	/**
-	 * The feature id for the '<em><b>Alpha</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EA_OPTIMIZER__ALPHA = IOPTIMIZER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Mu</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EA_OPTIMIZER__MU = IOPTIMIZER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Iterations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EA_OPTIMIZER__ITERATIONS = IOPTIMIZER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Spea2 Tournament</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EA_OPTIMIZER__SPEA2_TOURNAMENT = IOPTIMIZER_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Parallel Execution</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EA_OPTIMIZER__PARALLEL_EXECUTION = IOPTIMIZER_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>EA Optimizer</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EA_OPTIMIZER_FEATURE_COUNT = IOPTIMIZER_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel <em>Execution Model</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl#getExecutionModel()
-	 * @generated
-	 */
-	int EXECUTION_MODEL = 3;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.parameters.SystemParameters <em>System Parameters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>System Parameters</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.SystemParameters
-	 * @generated
-	 */
-	EClass getSystemParameters();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.moea.model.parameters.SystemParameters#getExecutionModel <em>Execution Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Execution Model</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.SystemParameters#getExecutionModel()
-	 * @see #getSystemParameters()
-	 * @generated
-	 */
-	EAttribute getSystemParameters_ExecutionModel();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.parameters.IOptimizer <em>IOptimizer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IOptimizer</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.IOptimizer
-	 * @generated
-	 */
-	EClass getIOptimizer();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer <em>EA Optimizer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EA Optimizer</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer
-	 * @generated
-	 */
-	EClass getEAOptimizer();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getAlpha <em>Alpha</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Alpha</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getAlpha()
-	 * @see #getEAOptimizer()
-	 * @generated
-	 */
-	EAttribute getEAOptimizer_Alpha();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getMu <em>Mu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mu</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getMu()
-	 * @see #getEAOptimizer()
-	 * @generated
-	 */
-	EAttribute getEAOptimizer_Mu();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getIterations <em>Iterations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Iterations</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getIterations()
-	 * @see #getEAOptimizer()
-	 * @generated
-	 */
-	EAttribute getEAOptimizer_Iterations();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getSpea2Tournament <em>Spea2 Tournament</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Spea2 Tournament</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#getSpea2Tournament()
-	 * @see #getEAOptimizer()
-	 * @generated
-	 */
-	EAttribute getEAOptimizer_Spea2Tournament();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#isParallelExecution <em>Parallel Execution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Parallel Execution</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer#isParallelExecution()
-	 * @see #getEAOptimizer()
-	 * @generated
-	 */
-	EAttribute getEAOptimizer_ParallelExecution();
-
-	/**
-	 * Returns the meta object for enum '{@link org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel <em>Execution Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Execution Model</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel
-	 * @generated
-	 */
-	EEnum getExecutionModel();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ParametersFactory getParametersFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.parameters.impl.SystemParametersImpl <em>System Parameters</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.SystemParametersImpl
-		 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl#getSystemParameters()
-		 * @generated
-		 */
-		EClass SYSTEM_PARAMETERS = eINSTANCE.getSystemParameters();
-
-		/**
-		 * The meta object literal for the '<em><b>Execution Model</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SYSTEM_PARAMETERS__EXECUTION_MODEL = eINSTANCE.getSystemParameters_ExecutionModel();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.parameters.IOptimizer <em>IOptimizer</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.parameters.IOptimizer
-		 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl#getIOptimizer()
-		 * @generated
-		 */
-		EClass IOPTIMIZER = eINSTANCE.getIOptimizer();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.parameters.impl.EAOptimizerImpl <em>EA Optimizer</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.EAOptimizerImpl
-		 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl#getEAOptimizer()
-		 * @generated
-		 */
-		EClass EA_OPTIMIZER = eINSTANCE.getEAOptimizer();
-
-		/**
-		 * The meta object literal for the '<em><b>Alpha</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EA_OPTIMIZER__ALPHA = eINSTANCE.getEAOptimizer_Alpha();
-
-		/**
-		 * The meta object literal for the '<em><b>Mu</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EA_OPTIMIZER__MU = eINSTANCE.getEAOptimizer_Mu();
-
-		/**
-		 * The meta object literal for the '<em><b>Iterations</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EA_OPTIMIZER__ITERATIONS = eINSTANCE.getEAOptimizer_Iterations();
-
-		/**
-		 * The meta object literal for the '<em><b>Spea2 Tournament</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EA_OPTIMIZER__SPEA2_TOURNAMENT = eINSTANCE.getEAOptimizer_Spea2Tournament();
-
-		/**
-		 * The meta object literal for the '<em><b>Parallel Execution</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EA_OPTIMIZER__PARALLEL_EXECUTION = eINSTANCE.getEAOptimizer_ParallelExecution();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel <em>Execution Model</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel
-		 * @see org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl#getExecutionModel()
-		 * @generated
-		 */
-		EEnum EXECUTION_MODEL = eINSTANCE.getExecutionModel();
-
-	}
-
-} //ParametersPackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/SystemParameters.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/SystemParameters.java
deleted file mode 100644
index 048de4ba..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/SystemParameters.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>System Parameters</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Defines the parameters associated with the system models.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.SystemParameters#getExecutionModel <em>Execution Model</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage#getSystemParameters()
- * @model
- * @generated
- */
-public interface SystemParameters extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Execution Model</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the failure assumption of the system.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Execution Model</em>' attribute.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel
-	 * @see #setExecutionModel(ExecutionModel)
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage#getSystemParameters_ExecutionModel()
-	 * @model required="true"
-	 * @generated
-	 */
-	ExecutionModel getExecutionModel();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.parameters.SystemParameters#getExecutionModel <em>Execution Model</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Execution Model</em>' attribute.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel
-	 * @see #getExecutionModel()
-	 * @generated
-	 */
-	void setExecutionModel(ExecutionModel value);
-
-} // SystemParameters
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/EAOptimizerImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/EAOptimizerImpl.java
deleted file mode 100644
index d906a00a..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/EAOptimizerImpl.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer;
-import org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EA Optimizer</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.impl.EAOptimizerImpl#getAlpha <em>Alpha</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.impl.EAOptimizerImpl#getMu <em>Mu</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.impl.EAOptimizerImpl#getIterations <em>Iterations</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.impl.EAOptimizerImpl#getSpea2Tournament <em>Spea2 Tournament</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.impl.EAOptimizerImpl#isParallelExecution <em>Parallel Execution</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EAOptimizerImpl extends EObjectImpl implements EAOptimizer {
-	/**
-	 * The default value of the '{@link #getAlpha() <em>Alpha</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlpha()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ALPHA_EDEFAULT = 1000;
-
-	/**
-	 * The cached value of the '{@link #getAlpha() <em>Alpha</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlpha()
-	 * @generated
-	 * @ordered
-	 */
-	protected int alpha = ALPHA_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMu() <em>Mu</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMu()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MU_EDEFAULT = 50;
-
-	/**
-	 * The cached value of the '{@link #getMu() <em>Mu</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMu()
-	 * @generated
-	 * @ordered
-	 */
-	protected int mu = MU_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getIterations() <em>Iterations</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIterations()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ITERATIONS_EDEFAULT = 100;
-
-	/**
-	 * The cached value of the '{@link #getIterations() <em>Iterations</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIterations()
-	 * @generated
-	 * @ordered
-	 */
-	protected int iterations = ITERATIONS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSpea2Tournament() <em>Spea2 Tournament</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSpea2Tournament()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int SPEA2_TOURNAMENT_EDEFAULT = 5;
-
-	/**
-	 * The cached value of the '{@link #getSpea2Tournament() <em>Spea2 Tournament</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSpea2Tournament()
-	 * @generated
-	 * @ordered
-	 */
-	protected int spea2Tournament = SPEA2_TOURNAMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isParallelExecution() <em>Parallel Execution</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isParallelExecution()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PARALLEL_EXECUTION_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isParallelExecution() <em>Parallel Execution</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isParallelExecution()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean parallelExecution = PARALLEL_EXECUTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EAOptimizerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ParametersPackage.Literals.EA_OPTIMIZER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getAlpha() {
-		return alpha;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAlpha(int newAlpha) {
-		int oldAlpha = alpha;
-		alpha = newAlpha;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ParametersPackage.EA_OPTIMIZER__ALPHA, oldAlpha, alpha));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getMu() {
-		return mu;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMu(int newMu) {
-		int oldMu = mu;
-		mu = newMu;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ParametersPackage.EA_OPTIMIZER__MU, oldMu, mu));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getIterations() {
-		return iterations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIterations(int newIterations) {
-		int oldIterations = iterations;
-		iterations = newIterations;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ParametersPackage.EA_OPTIMIZER__ITERATIONS, oldIterations, iterations));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getSpea2Tournament() {
-		return spea2Tournament;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSpea2Tournament(int newSpea2Tournament) {
-		int oldSpea2Tournament = spea2Tournament;
-		spea2Tournament = newSpea2Tournament;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ParametersPackage.EA_OPTIMIZER__SPEA2_TOURNAMENT, oldSpea2Tournament, spea2Tournament));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isParallelExecution() {
-		return parallelExecution;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParallelExecution(boolean newParallelExecution) {
-		boolean oldParallelExecution = parallelExecution;
-		parallelExecution = newParallelExecution;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ParametersPackage.EA_OPTIMIZER__PARALLEL_EXECUTION, oldParallelExecution, parallelExecution));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ParametersPackage.EA_OPTIMIZER__ALPHA:
-				return getAlpha();
-			case ParametersPackage.EA_OPTIMIZER__MU:
-				return getMu();
-			case ParametersPackage.EA_OPTIMIZER__ITERATIONS:
-				return getIterations();
-			case ParametersPackage.EA_OPTIMIZER__SPEA2_TOURNAMENT:
-				return getSpea2Tournament();
-			case ParametersPackage.EA_OPTIMIZER__PARALLEL_EXECUTION:
-				return isParallelExecution();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ParametersPackage.EA_OPTIMIZER__ALPHA:
-				setAlpha((Integer)newValue);
-				return;
-			case ParametersPackage.EA_OPTIMIZER__MU:
-				setMu((Integer)newValue);
-				return;
-			case ParametersPackage.EA_OPTIMIZER__ITERATIONS:
-				setIterations((Integer)newValue);
-				return;
-			case ParametersPackage.EA_OPTIMIZER__SPEA2_TOURNAMENT:
-				setSpea2Tournament((Integer)newValue);
-				return;
-			case ParametersPackage.EA_OPTIMIZER__PARALLEL_EXECUTION:
-				setParallelExecution((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ParametersPackage.EA_OPTIMIZER__ALPHA:
-				setAlpha(ALPHA_EDEFAULT);
-				return;
-			case ParametersPackage.EA_OPTIMIZER__MU:
-				setMu(MU_EDEFAULT);
-				return;
-			case ParametersPackage.EA_OPTIMIZER__ITERATIONS:
-				setIterations(ITERATIONS_EDEFAULT);
-				return;
-			case ParametersPackage.EA_OPTIMIZER__SPEA2_TOURNAMENT:
-				setSpea2Tournament(SPEA2_TOURNAMENT_EDEFAULT);
-				return;
-			case ParametersPackage.EA_OPTIMIZER__PARALLEL_EXECUTION:
-				setParallelExecution(PARALLEL_EXECUTION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ParametersPackage.EA_OPTIMIZER__ALPHA:
-				return alpha != ALPHA_EDEFAULT;
-			case ParametersPackage.EA_OPTIMIZER__MU:
-				return mu != MU_EDEFAULT;
-			case ParametersPackage.EA_OPTIMIZER__ITERATIONS:
-				return iterations != ITERATIONS_EDEFAULT;
-			case ParametersPackage.EA_OPTIMIZER__SPEA2_TOURNAMENT:
-				return spea2Tournament != SPEA2_TOURNAMENT_EDEFAULT;
-			case ParametersPackage.EA_OPTIMIZER__PARALLEL_EXECUTION:
-				return parallelExecution != PARALLEL_EXECUTION_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (alpha: ");
-		result.append(alpha);
-		result.append(", mu: ");
-		result.append(mu);
-		result.append(", iterations: ");
-		result.append(iterations);
-		result.append(", spea2Tournament: ");
-		result.append(spea2Tournament);
-		result.append(", parallelExecution: ");
-		result.append(parallelExecution);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EAOptimizerImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/ParametersFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/ParametersFactoryImpl.java
deleted file mode 100644
index de1b1565..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/ParametersFactoryImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.moea.model.parameters.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ParametersFactoryImpl extends EFactoryImpl implements ParametersFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ParametersFactory init() {
-		try {
-			ParametersFactory theParametersFactory = (ParametersFactory)EPackage.Registry.INSTANCE.getEFactory(ParametersPackage.eNS_URI);
-			if (theParametersFactory != null) {
-				return theParametersFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ParametersFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParametersFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ParametersPackage.SYSTEM_PARAMETERS: return createSystemParameters();
-			case ParametersPackage.EA_OPTIMIZER: return createEAOptimizer();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case ParametersPackage.EXECUTION_MODEL:
-				return createExecutionModelFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case ParametersPackage.EXECUTION_MODEL:
-				return convertExecutionModelToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SystemParameters createSystemParameters() {
-		SystemParametersImpl systemParameters = new SystemParametersImpl();
-		return systemParameters;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAOptimizer createEAOptimizer() {
-		EAOptimizerImpl eaOptimizer = new EAOptimizerImpl();
-		return eaOptimizer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExecutionModel createExecutionModelFromString(EDataType eDataType, String initialValue) {
-		ExecutionModel result = ExecutionModel.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertExecutionModelToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParametersPackage getParametersPackage() {
-		return (ParametersPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static ParametersPackage getPackage() {
-		return ParametersPackage.eINSTANCE;
-	}
-
-} //ParametersFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/ParametersPackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/ParametersPackageImpl.java
deleted file mode 100644
index 47a82f21..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/ParametersPackageImpl.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.exploration.model.CommonPackage;
-import org.fortiss.af3.exploration.model.DimensionsPackage;
-
-import org.fortiss.af3.exploration.moea.model.MoeaPackage;
-
-import org.fortiss.af3.exploration.moea.model.feature.FeaturePackage;
-
-import org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer;
-import org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel;
-import org.fortiss.af3.exploration.moea.model.parameters.IOptimizer;
-import org.fortiss.af3.exploration.moea.model.parameters.ParametersFactory;
-import org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage;
-import org.fortiss.af3.exploration.moea.model.parameters.SystemParameters;
-
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-
-import org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage;
-
-import org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ParametersPackageImpl extends EPackageImpl implements ParametersPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass systemParametersEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass iOptimizerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass eaOptimizerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum executionModelEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ParametersPackageImpl() {
-		super(eNS_URI, ParametersFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link ParametersPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ParametersPackage init() {
-		if (isInited) return (ParametersPackage)EPackage.Registry.INSTANCE.getEPackage(ParametersPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ParametersPackageImpl theParametersPackage = (ParametersPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ParametersPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ParametersPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		CommonPackage.eINSTANCE.eClass();
-		DimensionsPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		MoeaPackageImpl theMoeaPackage = (MoeaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(MoeaPackage.eNS_URI) instanceof MoeaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(MoeaPackage.eNS_URI) : MoeaPackage.eINSTANCE);
-		FeaturePackageImpl theFeaturePackage = (FeaturePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(FeaturePackage.eNS_URI) instanceof FeaturePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(FeaturePackage.eNS_URI) : FeaturePackage.eINSTANCE);
-		PredefinedPackageImpl thePredefinedPackage = (PredefinedPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PredefinedPackage.eNS_URI) instanceof PredefinedPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PredefinedPackage.eNS_URI) : PredefinedPackage.eINSTANCE);
-		SolutionsPackageImpl theSolutionsPackage = (SolutionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SolutionsPackage.eNS_URI) instanceof SolutionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SolutionsPackage.eNS_URI) : SolutionsPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theParametersPackage.createPackageContents();
-		theMoeaPackage.createPackageContents();
-		theFeaturePackage.createPackageContents();
-		thePredefinedPackage.createPackageContents();
-		theSolutionsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theParametersPackage.initializePackageContents();
-		theMoeaPackage.initializePackageContents();
-		theFeaturePackage.initializePackageContents();
-		thePredefinedPackage.initializePackageContents();
-		theSolutionsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theParametersPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(ParametersPackage.eNS_URI, theParametersPackage);
-		return theParametersPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSystemParameters() {
-		return systemParametersEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSystemParameters_ExecutionModel() {
-		return (EAttribute)systemParametersEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIOptimizer() {
-		return iOptimizerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEAOptimizer() {
-		return eaOptimizerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEAOptimizer_Alpha() {
-		return (EAttribute)eaOptimizerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEAOptimizer_Mu() {
-		return (EAttribute)eaOptimizerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEAOptimizer_Iterations() {
-		return (EAttribute)eaOptimizerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEAOptimizer_Spea2Tournament() {
-		return (EAttribute)eaOptimizerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEAOptimizer_ParallelExecution() {
-		return (EAttribute)eaOptimizerEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getExecutionModel() {
-		return executionModelEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParametersFactory getParametersFactory() {
-		return (ParametersFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		systemParametersEClass = createEClass(SYSTEM_PARAMETERS);
-		createEAttribute(systemParametersEClass, SYSTEM_PARAMETERS__EXECUTION_MODEL);
-
-		iOptimizerEClass = createEClass(IOPTIMIZER);
-
-		eaOptimizerEClass = createEClass(EA_OPTIMIZER);
-		createEAttribute(eaOptimizerEClass, EA_OPTIMIZER__ALPHA);
-		createEAttribute(eaOptimizerEClass, EA_OPTIMIZER__MU);
-		createEAttribute(eaOptimizerEClass, EA_OPTIMIZER__ITERATIONS);
-		createEAttribute(eaOptimizerEClass, EA_OPTIMIZER__SPEA2_TOURNAMENT);
-		createEAttribute(eaOptimizerEClass, EA_OPTIMIZER__PARALLEL_EXECUTION);
-
-		// Create enums
-		executionModelEEnum = createEEnum(EXECUTION_MODEL);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		eaOptimizerEClass.getESuperTypes().add(this.getIOptimizer());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(systemParametersEClass, SystemParameters.class, "SystemParameters", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSystemParameters_ExecutionModel(), this.getExecutionModel(), "executionModel", null, 1, 1, SystemParameters.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(iOptimizerEClass, IOptimizer.class, "IOptimizer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(eaOptimizerEClass, EAOptimizer.class, "EAOptimizer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEAOptimizer_Alpha(), ecorePackage.getEInt(), "alpha", "1000", 1, 1, EAOptimizer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEAOptimizer_Mu(), ecorePackage.getEInt(), "mu", "50", 1, 1, EAOptimizer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEAOptimizer_Iterations(), ecorePackage.getEInt(), "iterations", "100", 1, 1, EAOptimizer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEAOptimizer_Spea2Tournament(), ecorePackage.getEInt(), "spea2Tournament", "5", 1, 1, EAOptimizer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEAOptimizer_ParallelExecution(), ecorePackage.getEBoolean(), "parallelExecution", "false", 1, 1, EAOptimizer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(executionModelEEnum, ExecutionModel.class, "ExecutionModel");
-		addEEnumLiteral(executionModelEEnum, ExecutionModel.TT_FAIL_SILENCE);
-		addEEnumLiteral(executionModelEEnum, ExecutionModel.TT_FAULT_DETECTION_VOTING);
-	}
-
-} //ParametersPackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/SystemParametersImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/SystemParametersImpl.java
deleted file mode 100644
index f899137b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/impl/SystemParametersImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel;
-import org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage;
-import org.fortiss.af3.exploration.moea.model.parameters.SystemParameters;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>System Parameters</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.parameters.impl.SystemParametersImpl#getExecutionModel <em>Execution Model</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SystemParametersImpl extends EObjectImpl implements SystemParameters {
-	/**
-	 * The default value of the '{@link #getExecutionModel() <em>Execution Model</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExecutionModel()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ExecutionModel EXECUTION_MODEL_EDEFAULT = ExecutionModel.TT_FAIL_SILENCE;
-
-	/**
-	 * The cached value of the '{@link #getExecutionModel() <em>Execution Model</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExecutionModel()
-	 * @generated
-	 * @ordered
-	 */
-	protected ExecutionModel executionModel = EXECUTION_MODEL_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SystemParametersImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ParametersPackage.Literals.SYSTEM_PARAMETERS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExecutionModel getExecutionModel() {
-		return executionModel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExecutionModel(ExecutionModel newExecutionModel) {
-		ExecutionModel oldExecutionModel = executionModel;
-		executionModel = newExecutionModel == null ? EXECUTION_MODEL_EDEFAULT : newExecutionModel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ParametersPackage.SYSTEM_PARAMETERS__EXECUTION_MODEL, oldExecutionModel, executionModel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ParametersPackage.SYSTEM_PARAMETERS__EXECUTION_MODEL:
-				return getExecutionModel();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ParametersPackage.SYSTEM_PARAMETERS__EXECUTION_MODEL:
-				setExecutionModel((ExecutionModel)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ParametersPackage.SYSTEM_PARAMETERS__EXECUTION_MODEL:
-				setExecutionModel(EXECUTION_MODEL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ParametersPackage.SYSTEM_PARAMETERS__EXECUTION_MODEL:
-				return executionModel != EXECUTION_MODEL_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (executionModel: ");
-		result.append(executionModel);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SystemParametersImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/util/ParametersAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/util/ParametersAdapterFactory.java
deleted file mode 100644
index f9b6f5e4..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/util/ParametersAdapterFactory.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.moea.model.parameters.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage
- * @generated
- */
-public class ParametersAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ParametersPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParametersAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ParametersPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ParametersSwitch<Adapter> modelSwitch =
-		new ParametersSwitch<Adapter>() {
-			@Override
-			public Adapter caseSystemParameters(SystemParameters object) {
-				return createSystemParametersAdapter();
-			}
-			@Override
-			public Adapter caseIOptimizer(IOptimizer object) {
-				return createIOptimizerAdapter();
-			}
-			@Override
-			public Adapter caseEAOptimizer(EAOptimizer object) {
-				return createEAOptimizerAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.parameters.SystemParameters <em>System Parameters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.SystemParameters
-	 * @generated
-	 */
-	public Adapter createSystemParametersAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.parameters.IOptimizer <em>IOptimizer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.IOptimizer
-	 * @generated
-	 */
-	public Adapter createIOptimizerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer <em>EA Optimizer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer
-	 * @generated
-	 */
-	public Adapter createEAOptimizerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ParametersAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/util/ParametersSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/util/ParametersSwitch.java
deleted file mode 100644
index 344bb3e8..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/parameters/util/ParametersSwitch.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.parameters.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.moea.model.parameters.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage
- * @generated
- */
-public class ParametersSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ParametersPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParametersSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ParametersPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ParametersPackage.SYSTEM_PARAMETERS: {
-				SystemParameters systemParameters = (SystemParameters)theEObject;
-				T result = caseSystemParameters(systemParameters);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ParametersPackage.IOPTIMIZER: {
-				IOptimizer iOptimizer = (IOptimizer)theEObject;
-				T result = caseIOptimizer(iOptimizer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ParametersPackage.EA_OPTIMIZER: {
-				EAOptimizer eaOptimizer = (EAOptimizer)theEObject;
-				T result = caseEAOptimizer(eaOptimizer);
-				if (result == null) result = caseIOptimizer(eaOptimizer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>System Parameters</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>System Parameters</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSystemParameters(SystemParameters object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IOptimizer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IOptimizer</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIOptimizer(IOptimizer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EA Optimizer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EA Optimizer</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEAOptimizer(EAOptimizer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //ParametersSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ComponentMultiAllocationConstraint.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ComponentMultiAllocationConstraint.java
deleted file mode 100644
index 03c5f958..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ComponentMultiAllocationConstraint.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-
-import org.fortiss.af3.platform.model.ExecutionUnit;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Component Multi Allocation Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY. Defines to which {@link ExecutionUnit}s a {@link Component} may be allocated to.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getComponentMultiAllocationConstraint()
- * @model superTypes="org.fortiss.af3.exploration.moea.model.predefined.MultiLocationConstraint<org.fortiss.af3.component.model.Component, org.fortiss.af3.platform.model.ExecutionUnit> org.fortiss.af3.exploration.model.ExplorationConstraint<org.eclipse.emf.ecore.EBooleanObject>"
- * @generated
- */
-public interface ComponentMultiAllocationConstraint extends MultiLocationConstraint<Component, ExecutionUnit>, ExplorationConstraint<Boolean> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Sets the set of allowed {@link ComponentAllocation}s for the given {@link Component} to the set of {@link ExecutionUnit}s. Here, any of the given {@link ExecutionUnit}s is a valid allocation traget, where the given {@link Component} is not required to have an instance on each of the given {@link ExecutionUnit}s.
-	 * <!-- end-model-doc -->
-	 * @model compRequired="true" execUnitsRequired="true" execUnitsMany="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='ComponentMultiAllocationConstraintStaticImpl.setComponentMultiAllocations(this, comp, execUnits);'"
-	 * @generated
-	 */
-	void setComponentMultiAllocations(Component comp, EList<ExecutionUnit> execUnits);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Returns the {@link Component} which is restricted in it allocation targets.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return getLeftMultiLocationModelElement();'"
-	 * @generated
-	 */
-	Component getComponent();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Returns the list of {@link ExecutionUnit}s which are allowed allocation targets.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true" many="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return getAllRightMultiLocationModelElements();'"
-	 * @generated
-	 */
-	EList<ExecutionUnit> getExecutionUnits();
-
-} // ComponentMultiAllocationConstraint
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ComponentMultiDislocationConstraint.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ComponentMultiDislocationConstraint.java
deleted file mode 100644
index b6a165c6..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ComponentMultiDislocationConstraint.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-
-import org.fortiss.af3.platform.model.ExecutionUnit;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Component Multi Dislocation Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY. Defines to which {@link ExecutionUnit}s a {@link Component} may be <b>NOT</b> allocated to.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getComponentMultiDislocationConstraint()
- * @model superTypes="org.fortiss.af3.exploration.moea.model.predefined.MultiLocationConstraint<org.fortiss.af3.component.model.Component, org.fortiss.af3.platform.model.ExecutionUnit> org.fortiss.af3.exploration.model.ExplorationConstraint<org.eclipse.emf.ecore.EBooleanObject>"
- * @generated
- */
-public interface ComponentMultiDislocationConstraint extends MultiLocationConstraint<Component, ExecutionUnit>, ExplorationConstraint<Boolean> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Sets the set of disallowed {@link ComponentDislocation}s for the given {@link Component} to the set of {@link ExecutionUnit}s. Here, any of the given {@link ExecutionUnit}s is an invalid allocation traget for any instance of the given {@link Component}.
-	 * <!-- end-model-doc -->
-	 * @model compRequired="true" execUnitsRequired="true" execUnitsMany="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='ComponentMultiDislocationConstraintStaticImpl.setComponentMultiDislocations(this, comp, execUnits);'"
-	 * @generated
-	 */
-	void setComponentMultiDislocations(Component comp, EList<ExecutionUnit> execUnits);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Returns the {@link Component} which is restricted in it allocation targets.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return getLeftMultiLocationModelElement();'"
-	 * @generated
-	 */
-	Component getComponent();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Returns the list of {@link ExecutionUnit}s which are disallowed allocation targets.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true" many="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return getAllRightMultiLocationModelElements();'"
-	 * @generated
-	 */
-	EList<ExecutionUnit> getExecutionUnits();
-
-} // ComponentMultiDislocationConstraint
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/EnergyMinObjective.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/EnergyMinObjective.java
deleted file mode 100644
index b72fdc08..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/EnergyMinObjective.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.model.EnergyDimension;
-import org.fortiss.af3.exploration.model.MOExplorationObjective;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Energy Min Objective</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * {@link ExplorationObjective} that minimizes the consumed emergy of a system.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getEnergyMinObjective()
- * @model superTypes="org.fortiss.af3.exploration.model.MOExplorationObjective<org.eclipse.emf.ecore.EDoubleObject> org.fortiss.af3.exploration.model.EnergyDimension org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression"
- * @generated
- */
-public interface EnergyMinObjective extends MOExplorationObjective<Double>, EnergyDimension, MOEAExplorationExpression {
-} // EnergyMinObjective
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureMinObjective.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureMinObjective.java
deleted file mode 100644
index 93cabbfb..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureMinObjective.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.model.MOExplorationObjective;
-import org.fortiss.af3.exploration.model.ResourceDimension;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Failure Min Objective</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * {@link ExplorationObjective} that minimizes the failure probability of a defined task.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective#getMode <em>Mode</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getFailureMinObjective()
- * @model superTypes="org.fortiss.af3.exploration.model.ResourceDimension org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression org.fortiss.af3.exploration.model.MOExplorationObjective<org.eclipse.emf.ecore.EDoubleObject>"
- * @generated
- */
-public interface FailureMinObjective extends ResourceDimension, MOEAExplorationExpression, MOExplorationObjective<Double> {
-	/**
-	 * Returns the value of the '<em><b>Mode</b></em>' attribute.
-	 * The default value is <code>"FailSafe"</code>.
-	 * The literals are from the enumeration {@link org.fortiss.af3.exploration.moea.model.predefined.FailureMode}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the failure modes of the tasks.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mode</em>' attribute.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureMode
-	 * @see #setMode(FailureMode)
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getFailureMinObjective_Mode()
-	 * @model default="FailSafe" required="true"
-	 * @generated
-	 */
-	FailureMode getMode();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective#getMode <em>Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mode</em>' attribute.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureMode
-	 * @see #getMode()
-	 * @generated
-	 */
-	void setMode(FailureMode value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.fortiss.af3.exploration.moea.model.predefined.FailureType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines which types of failures shall be considered in the reliability analysis.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureType
-	 * @see #setType(FailureType)
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getFailureMinObjective_Type()
-	 * @model required="true"
-	 * @generated
-	 */
-	FailureType getType();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureType
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(FailureType value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Returns the {@link Component} that is the subject of the {@link ReliabilityAnalysis} which is the target of the minimization.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return FailureMinObjectiveStaticImpl.getFailureMinTargetComponent(this);'"
-	 * @generated
-	 */
-	Component getTargetComponent();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Sets the given {@link Component} as the subject of the {@link ReliabilityAnalysis} which is the target of the minimization.
-	 * <!-- end-model-doc -->
-	 * @model targetComponentRequired="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='FailureMinObjectiveStaticImpl.setFailureMinTargetComponent(this, targetComponent);'"
-	 * @generated
-	 */
-	void setTargetComponent(Component targetComponent);
-
-} // FailureMinObjective
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureMode.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureMode.java
deleted file mode 100644
index c06e4b9b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureMode.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Failure Mode</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Defines the failure modes of tasks.
- * <!-- end-model-doc -->
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getFailureMode()
- * @model
- * @generated
- */
-public enum FailureMode implements Enumerator {
-	/**
-	 * The '<em><b>Fail Safe</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FAIL_SAFE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	FAIL_SAFE(0, "FailSafe", "FailSafe"),
-
-	/**
-	 * The '<em><b>Fail Operational</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FAIL_OPERATIONAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	FAIL_OPERATIONAL(1, "FailOperational", "FailOperational");
-
-	/**
-	 * The '<em><b>Fail Safe</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Fail Safe</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FAIL_SAFE
-	 * @model name="FailSafe"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FAIL_SAFE_VALUE = 0;
-
-	/**
-	 * The '<em><b>Fail Operational</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Fail Operational</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FAIL_OPERATIONAL
-	 * @model name="FailOperational"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FAIL_OPERATIONAL_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Failure Mode</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final FailureMode[] VALUES_ARRAY =
-		new FailureMode[] {
-			FAIL_SAFE,
-			FAIL_OPERATIONAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Failure Mode</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<FailureMode> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Failure Mode</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FailureMode get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FailureMode result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Failure Mode</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FailureMode getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FailureMode result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Failure Mode</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FailureMode get(int value) {
-		switch (value) {
-			case FAIL_SAFE_VALUE: return FAIL_SAFE;
-			case FAIL_OPERATIONAL_VALUE: return FAIL_OPERATIONAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private FailureMode(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //FailureMode
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureType.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureType.java
deleted file mode 100644
index 0a1bdfe9..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/FailureType.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Failure Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Defines which types of failures shall be considered in the reliability analysis.
- * <!-- end-model-doc -->
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getFailureType()
- * @model
- * @generated
- */
-public enum FailureType implements Enumerator {
-	/**
-	 * The '<em><b>DUF</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DUF_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DUF(0, "DUF", "DUF"),
-
-	/**
-	 * The '<em><b>SDC</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SDC_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SDC(1, "SDC", "SDC"),
-
-	/**
-	 * The '<em><b>ALL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ALL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ALL(2, "ALL", "ALL");
-
-	/**
-	 * The '<em><b>DUF</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>DUF</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DUF
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DUF_VALUE = 0;
-
-	/**
-	 * The '<em><b>SDC</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SDC</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SDC
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SDC_VALUE = 1;
-
-	/**
-	 * The '<em><b>ALL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ALL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ALL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ALL_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Failure Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final FailureType[] VALUES_ARRAY =
-		new FailureType[] {
-			DUF,
-			SDC,
-			ALL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Failure Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<FailureType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Failure Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FailureType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FailureType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Failure Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FailureType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FailureType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Failure Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FailureType get(int value) {
-		switch (value) {
-			case DUF_VALUE: return DUF;
-			case SDC_VALUE: return SDC;
-			case ALL_VALUE: return ALL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private FailureType(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //FailureType
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/MultiLocationConstraint.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/MultiLocationConstraint.java
deleted file mode 100644
index 7a3342db..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/MultiLocationConstraint.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.fortiss.af3.exploration.model.location.LocationConstraint;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Multi Location Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.MultiLocationConstraint#getSingleLocationConstraints <em>Single Location Constraints</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getMultiLocationConstraint()
- * @model
- * @generated
- */
-public interface MultiLocationConstraint<LHT extends IModelElement, RHT extends IModelElement> extends LocationConstraint<LHT, RHT> {
-	/**
-	 * Returns the value of the '<em><b>Single Location Constraints</b></em>' reference list.
-	 * The list contents are of type {@link org.fortiss.af3.exploration.model.location.LocationConstraint}&lt;LHT, RHT>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * DEPRECATED/LEGACY. Defines the list of {@link LocationConstraint}s comprising {@code this} constraint.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Single Location Constraints</em>' reference list.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getMultiLocationConstraint_SingleLocationConstraints()
-	 * @model required="true"
-	 * @generated
-	 */
-	EList<LocationConstraint<LHT, RHT>> getSingleLocationConstraints();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Returns the {@link IModelElement} defined on the left hand side of an {@link LocationOp}.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return MultiLocationConstraintStaticImpl.getLeftMultiLocationModelElement(this);'"
-	 * @generated
-	 */
-	LHT getLeftMultiLocationModelElement();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Returns the {@link EEList} of all {@link IModelElement} defined on the right hand side of an {@link LocationOp} of the contained {@link LocationConstraint}s.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true" many="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return MultiLocationConstraintStaticImpl.getAllRightMultiLocationModelElements(this);'"
-	 * @generated
-	 */
-	EList<RHT> getAllRightMultiLocationModelElements();
-
-} // MultiLocationConstraint
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/PredefinedFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/PredefinedFactory.java
deleted file mode 100644
index 54fa95b6..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/PredefinedFactory.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import org.eclipse.emf.ecore.EFactory;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage
- * @generated
- */
-public interface PredefinedFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	PredefinedFactory eINSTANCE = org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Failure Min Objective</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Failure Min Objective</em>'.
-	 * @generated
-	 */
-	FailureMinObjective createFailureMinObjective();
-
-	/**
-	 * Returns a new object of class '<em>Reliability Analysis</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Reliability Analysis</em>'.
-	 * @generated
-	 */
-	ReliabilityAnalysis createReliabilityAnalysis();
-
-	/**
-	 * Returns a new object of class '<em>Energy Min Objective</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Energy Min Objective</em>'.
-	 * @generated
-	 */
-	EnergyMinObjective createEnergyMinObjective();
-
-	/**
-	 * Returns a new object of class '<em>Multi Location Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Multi Location Constraint</em>'.
-	 * @generated
-	 */
-	<LHT extends IModelElement, RHT extends IModelElement> MultiLocationConstraint<LHT, RHT> createMultiLocationConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Component Multi Allocation Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Component Multi Allocation Constraint</em>'.
-	 * @generated
-	 */
-	ComponentMultiAllocationConstraint createComponentMultiAllocationConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Component Multi Dislocation Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Component Multi Dislocation Constraint</em>'.
-	 * @generated
-	 */
-	ComponentMultiDislocationConstraint createComponentMultiDislocationConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Safety Integrity Level Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Safety Integrity Level Constraint</em>'.
-	 * @generated
-	 */
-	SafetyIntegrityLevelConstraint createSafetyIntegrityLevelConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Safety Comparison</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Safety Comparison</em>'.
-	 * @generated
-	 */
-	<T> SafetyComparison<T> createSafetyComparison();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	PredefinedPackage getPredefinedPackage();
-
-} //PredefinedFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/PredefinedPackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/PredefinedPackage.java
deleted file mode 100644
index 138da4f8..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/PredefinedPackage.java
+++ /dev/null
@@ -1,929 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-import org.fortiss.af3.exploration.model.CommonPackage;
-import org.fortiss.af3.exploration.model.DimensionsPackage;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-
-import org.fortiss.af3.exploration.model.location.LocationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedFactory
- * @model kind="package"
- * @generated
- */
-public interface PredefinedPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "predefined";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/moea/predefined";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-moea-predefined";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	PredefinedPackage eINSTANCE = org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.FailureMinObjectiveImpl <em>Failure Min Objective</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.FailureMinObjectiveImpl
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getFailureMinObjective()
-	 * @generated
-	 */
-	int FAILURE_MIN_OBJECTIVE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FAILURE_MIN_OBJECTIVE__ID = DimensionsPackage.RESOURCE_DIMENSION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FAILURE_MIN_OBJECTIVE__NAME = DimensionsPackage.RESOURCE_DIMENSION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FAILURE_MIN_OBJECTIVE__COMMENT = DimensionsPackage.RESOURCE_DIMENSION__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FAILURE_MIN_OBJECTIVE__EXPRESSION = DimensionsPackage.RESOURCE_DIMENSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Priority</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FAILURE_MIN_OBJECTIVE__PRIORITY = DimensionsPackage.RESOURCE_DIMENSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FAILURE_MIN_OBJECTIVE__MODE = DimensionsPackage.RESOURCE_DIMENSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FAILURE_MIN_OBJECTIVE__TYPE = DimensionsPackage.RESOURCE_DIMENSION_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Failure Min Objective</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FAILURE_MIN_OBJECTIVE_FEATURE_COUNT = DimensionsPackage.RESOURCE_DIMENSION_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ReliabilityAnalysisImpl <em>Reliability Analysis</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.ReliabilityAnalysisImpl
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getReliabilityAnalysis()
-	 * @generated
-	 */
-	int RELIABILITY_ANALYSIS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELIABILITY_ANALYSIS__MODEL_ELEMENT = ExpressionsPackage.ARITHMETIC_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELIABILITY_ANALYSIS__EXPRESSION = ExpressionsPackage.ARITHMETIC_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Reliability Analysis</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELIABILITY_ANALYSIS_FEATURE_COUNT = ExpressionsPackage.ARITHMETIC_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.EnergyMinObjectiveImpl <em>Energy Min Objective</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.EnergyMinObjectiveImpl
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getEnergyMinObjective()
-	 * @generated
-	 */
-	int ENERGY_MIN_OBJECTIVE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENERGY_MIN_OBJECTIVE__ID = CommonPackage.MO_EXPLORATION_OBJECTIVE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENERGY_MIN_OBJECTIVE__NAME = CommonPackage.MO_EXPLORATION_OBJECTIVE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENERGY_MIN_OBJECTIVE__COMMENT = CommonPackage.MO_EXPLORATION_OBJECTIVE__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Priority</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENERGY_MIN_OBJECTIVE__PRIORITY = CommonPackage.MO_EXPLORATION_OBJECTIVE__PRIORITY;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENERGY_MIN_OBJECTIVE__EXPRESSION = CommonPackage.MO_EXPLORATION_OBJECTIVE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Energy Min Objective</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENERGY_MIN_OBJECTIVE_FEATURE_COUNT = CommonPackage.MO_EXPLORATION_OBJECTIVE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.MultiLocationConstraintImpl <em>Multi Location Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.MultiLocationConstraintImpl
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getMultiLocationConstraint()
-	 * @generated
-	 */
-	int MULTI_LOCATION_CONSTRAINT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MULTI_LOCATION_CONSTRAINT__ID = LocationPackage.LOCATION_CONSTRAINT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MULTI_LOCATION_CONSTRAINT__NAME = LocationPackage.LOCATION_CONSTRAINT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MULTI_LOCATION_CONSTRAINT__COMMENT = LocationPackage.LOCATION_CONSTRAINT__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MULTI_LOCATION_CONSTRAINT__EXPRESSION = LocationPackage.LOCATION_CONSTRAINT__EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Single Location Constraints</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MULTI_LOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS = LocationPackage.LOCATION_CONSTRAINT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Multi Location Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MULTI_LOCATION_CONSTRAINT_FEATURE_COUNT = LocationPackage.LOCATION_CONSTRAINT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiAllocationConstraintImpl <em>Component Multi Allocation Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiAllocationConstraintImpl
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getComponentMultiAllocationConstraint()
-	 * @generated
-	 */
-	int COMPONENT_MULTI_ALLOCATION_CONSTRAINT = 4;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_ALLOCATION_CONSTRAINT__ID = MULTI_LOCATION_CONSTRAINT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_ALLOCATION_CONSTRAINT__NAME = MULTI_LOCATION_CONSTRAINT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_ALLOCATION_CONSTRAINT__COMMENT = MULTI_LOCATION_CONSTRAINT__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_ALLOCATION_CONSTRAINT__EXPRESSION = MULTI_LOCATION_CONSTRAINT__EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Single Location Constraints</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_ALLOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS = MULTI_LOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS;
-
-	/**
-	 * The feature id for the '<em><b>Is Soft</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IS_SOFT = MULTI_LOCATION_CONSTRAINT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Implicit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IMPLICIT = MULTI_LOCATION_CONSTRAINT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Component Multi Allocation Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_ALLOCATION_CONSTRAINT_FEATURE_COUNT = MULTI_LOCATION_CONSTRAINT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiDislocationConstraintImpl <em>Component Multi Dislocation Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiDislocationConstraintImpl
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getComponentMultiDislocationConstraint()
-	 * @generated
-	 */
-	int COMPONENT_MULTI_DISLOCATION_CONSTRAINT = 5;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_DISLOCATION_CONSTRAINT__ID = MULTI_LOCATION_CONSTRAINT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_DISLOCATION_CONSTRAINT__NAME = MULTI_LOCATION_CONSTRAINT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_DISLOCATION_CONSTRAINT__COMMENT = MULTI_LOCATION_CONSTRAINT__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_DISLOCATION_CONSTRAINT__EXPRESSION = MULTI_LOCATION_CONSTRAINT__EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Single Location Constraints</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_DISLOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS = MULTI_LOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS;
-
-	/**
-	 * The feature id for the '<em><b>Is Soft</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IS_SOFT = MULTI_LOCATION_CONSTRAINT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Implicit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IMPLICIT = MULTI_LOCATION_CONSTRAINT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Component Multi Dislocation Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPONENT_MULTI_DISLOCATION_CONSTRAINT_FEATURE_COUNT = MULTI_LOCATION_CONSTRAINT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyIntegrityLevelConstraintImpl <em>Safety Integrity Level Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyIntegrityLevelConstraintImpl
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getSafetyIntegrityLevelConstraint()
-	 * @generated
-	 */
-	int SAFETY_INTEGRITY_LEVEL_CONSTRAINT = 6;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_INTEGRITY_LEVEL_CONSTRAINT__ID = ExplorationPackage.EXPLORATION_CONSTRAINT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_INTEGRITY_LEVEL_CONSTRAINT__NAME = ExplorationPackage.EXPLORATION_CONSTRAINT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMMENT = ExplorationPackage.EXPLORATION_CONSTRAINT__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Is Soft</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IS_SOFT = ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT;
-
-	/**
-	 * The feature id for the '<em><b>Implicit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IMPLICIT = ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION = ExplorationPackage.EXPLORATION_CONSTRAINT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Components</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMPONENTS = ExplorationPackage.EXPLORATION_CONSTRAINT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Safety Integrity Level Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_INTEGRITY_LEVEL_CONSTRAINT_FEATURE_COUNT = ExplorationPackage.EXPLORATION_CONSTRAINT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyComparisonImpl <em>Safety Comparison</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyComparisonImpl
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getSafetyComparison()
-	 * @generated
-	 */
-	int SAFETY_COMPARISON = 7;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_COMPARISON__OPERATOR = OperatorsPackage.COMPARISON_OP__OPERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_COMPARISON__RIGHT = OperatorsPackage.COMPARISON_OP__RIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_COMPARISON__LEFT = OperatorsPackage.COMPARISON_OP__LEFT;
-
-	/**
-	 * The number of structural features of the '<em>Safety Comparison</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SAFETY_COMPARISON_FEATURE_COUNT = OperatorsPackage.COMPARISON_OP_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureMode <em>Failure Mode</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureMode
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getFailureMode()
-	 * @generated
-	 */
-	int FAILURE_MODE = 8;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureType <em>Failure Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureType
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getFailureType()
-	 * @generated
-	 */
-	int FAILURE_TYPE = 9;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective <em>Failure Min Objective</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Failure Min Objective</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective
-	 * @generated
-	 */
-	EClass getFailureMinObjective();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective#getMode <em>Mode</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mode</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective#getMode()
-	 * @see #getFailureMinObjective()
-	 * @generated
-	 */
-	EAttribute getFailureMinObjective_Mode();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective#getType()
-	 * @see #getFailureMinObjective()
-	 * @generated
-	 */
-	EAttribute getFailureMinObjective_Type();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.predefined.ReliabilityAnalysis <em>Reliability Analysis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Reliability Analysis</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.ReliabilityAnalysis
-	 * @generated
-	 */
-	EClass getReliabilityAnalysis();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.predefined.EnergyMinObjective <em>Energy Min Objective</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Energy Min Objective</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.EnergyMinObjective
-	 * @generated
-	 */
-	EClass getEnergyMinObjective();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.predefined.MultiLocationConstraint <em>Multi Location Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Multi Location Constraint</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.MultiLocationConstraint
-	 * @generated
-	 */
-	EClass getMultiLocationConstraint();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.fortiss.af3.exploration.moea.model.predefined.MultiLocationConstraint#getSingleLocationConstraints <em>Single Location Constraints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Single Location Constraints</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.MultiLocationConstraint#getSingleLocationConstraints()
-	 * @see #getMultiLocationConstraint()
-	 * @generated
-	 */
-	EReference getMultiLocationConstraint_SingleLocationConstraints();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiAllocationConstraint <em>Component Multi Allocation Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Component Multi Allocation Constraint</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiAllocationConstraint
-	 * @generated
-	 */
-	EClass getComponentMultiAllocationConstraint();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiDislocationConstraint <em>Component Multi Dislocation Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Component Multi Dislocation Constraint</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiDislocationConstraint
-	 * @generated
-	 */
-	EClass getComponentMultiDislocationConstraint();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.predefined.SafetyIntegrityLevelConstraint <em>Safety Integrity Level Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Safety Integrity Level Constraint</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.SafetyIntegrityLevelConstraint
-	 * @generated
-	 */
-	EClass getSafetyIntegrityLevelConstraint();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.fortiss.af3.exploration.moea.model.predefined.SafetyIntegrityLevelConstraint#getComponents <em>Components</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Components</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.SafetyIntegrityLevelConstraint#getComponents()
-	 * @see #getSafetyIntegrityLevelConstraint()
-	 * @generated
-	 */
-	EReference getSafetyIntegrityLevelConstraint_Components();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.predefined.SafetyComparison <em>Safety Comparison</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Safety Comparison</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.SafetyComparison
-	 * @generated
-	 */
-	EClass getSafetyComparison();
-
-	/**
-	 * Returns the meta object for enum '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureMode <em>Failure Mode</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Failure Mode</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureMode
-	 * @generated
-	 */
-	EEnum getFailureMode();
-
-	/**
-	 * Returns the meta object for enum '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureType <em>Failure Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Failure Type</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureType
-	 * @generated
-	 */
-	EEnum getFailureType();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	PredefinedFactory getPredefinedFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.FailureMinObjectiveImpl <em>Failure Min Objective</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.FailureMinObjectiveImpl
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getFailureMinObjective()
-		 * @generated
-		 */
-		EClass FAILURE_MIN_OBJECTIVE = eINSTANCE.getFailureMinObjective();
-
-		/**
-		 * The meta object literal for the '<em><b>Mode</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FAILURE_MIN_OBJECTIVE__MODE = eINSTANCE.getFailureMinObjective_Mode();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FAILURE_MIN_OBJECTIVE__TYPE = eINSTANCE.getFailureMinObjective_Type();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ReliabilityAnalysisImpl <em>Reliability Analysis</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.ReliabilityAnalysisImpl
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getReliabilityAnalysis()
-		 * @generated
-		 */
-		EClass RELIABILITY_ANALYSIS = eINSTANCE.getReliabilityAnalysis();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.EnergyMinObjectiveImpl <em>Energy Min Objective</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.EnergyMinObjectiveImpl
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getEnergyMinObjective()
-		 * @generated
-		 */
-		EClass ENERGY_MIN_OBJECTIVE = eINSTANCE.getEnergyMinObjective();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.MultiLocationConstraintImpl <em>Multi Location Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.MultiLocationConstraintImpl
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getMultiLocationConstraint()
-		 * @generated
-		 */
-		EClass MULTI_LOCATION_CONSTRAINT = eINSTANCE.getMultiLocationConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Single Location Constraints</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MULTI_LOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS = eINSTANCE.getMultiLocationConstraint_SingleLocationConstraints();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiAllocationConstraintImpl <em>Component Multi Allocation Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiAllocationConstraintImpl
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getComponentMultiAllocationConstraint()
-		 * @generated
-		 */
-		EClass COMPONENT_MULTI_ALLOCATION_CONSTRAINT = eINSTANCE.getComponentMultiAllocationConstraint();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiDislocationConstraintImpl <em>Component Multi Dislocation Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiDislocationConstraintImpl
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getComponentMultiDislocationConstraint()
-		 * @generated
-		 */
-		EClass COMPONENT_MULTI_DISLOCATION_CONSTRAINT = eINSTANCE.getComponentMultiDislocationConstraint();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyIntegrityLevelConstraintImpl <em>Safety Integrity Level Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyIntegrityLevelConstraintImpl
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getSafetyIntegrityLevelConstraint()
-		 * @generated
-		 */
-		EClass SAFETY_INTEGRITY_LEVEL_CONSTRAINT = eINSTANCE.getSafetyIntegrityLevelConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Components</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMPONENTS = eINSTANCE.getSafetyIntegrityLevelConstraint_Components();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyComparisonImpl <em>Safety Comparison</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyComparisonImpl
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getSafetyComparison()
-		 * @generated
-		 */
-		EClass SAFETY_COMPARISON = eINSTANCE.getSafetyComparison();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureMode <em>Failure Mode</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureMode
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getFailureMode()
-		 * @generated
-		 */
-		EEnum FAILURE_MODE = eINSTANCE.getFailureMode();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureType <em>Failure Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureType
-		 * @see org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl#getFailureType()
-		 * @generated
-		 */
-		EEnum FAILURE_TYPE = eINSTANCE.getFailureType();
-
-	}
-
-} //PredefinedPackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ReliabilityAnalysis.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ReliabilityAnalysis.java
deleted file mode 100644
index 88129ff7..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/ReliabilityAnalysis.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Reliability Analysis</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getReliabilityAnalysis()
- * @model superTypes="org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression<org.eclipse.emf.ecore.EDoubleObject> org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression<org.fortiss.af3.component.model.Component> org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression"
- * @generated
- */
-public interface ReliabilityAnalysis extends ArithmeticExpression<Double>, ElementExpression<Component>, MOEAExplorationExpression {
-} // ReliabilityAnalysis
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/SafetyComparison.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/SafetyComparison.java
deleted file mode 100644
index 4defa7cc..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/SafetyComparison.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty;
-
-import org.fortiss.af3.platform.model.ExecutionUnit;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Safety Comparison</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY.
- * <!-- end-model-doc -->
- *
- *
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getSafetyComparison()
- * @model
- * @generated
- */
-public interface SafetyComparison<T> extends ComparisonOp<T, ElementProperty<Component, T>, ElementProperty<ExecutionUnit, T>> {
-} // SafetyComparison
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/SafetyIntegrityLevelConstraint.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/SafetyIntegrityLevelConstraint.java
deleted file mode 100644
index b5183f9c..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/SafetyIntegrityLevelConstraint.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.SafetyDimension;
-
-import org.fortiss.af3.safety.model.SIL;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Safety Integrity Level Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * DEPRECATED/LEGACY. Defines for which {@link Component}s their specified SIL must be considered in the evaluation.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.SafetyIntegrityLevelConstraint#getComponents <em>Components</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getSafetyIntegrityLevelConstraint()
- * @model
- * @generated
- */
-public interface SafetyIntegrityLevelConstraint extends ExplorationConstraint<SIL>, SafetyDimension, MOEAExplorationExpression {
-	/**
-	 * Returns the value of the '<em><b>Components</b></em>' reference list.
-	 * The list contents are of type {@link org.fortiss.af3.component.model.Component}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * List of {@link Component}s whose SIL has to be considered in the allocation.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Components</em>' reference list.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#getSafetyIntegrityLevelConstraint_Components()
-	 * @model required="true"
-	 * @generated
-	 */
-	EList<Component> getComponents();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * TODO: write documentation (in the model!)
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" required="true" many="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return SafetyIntegrityLevelConstraintStaticImpl.getLimitation(this);'"
-	 * @generated
-	 */
-	EList<SIL> getLimitation();
-
-} // SafetyIntegrityLevelConstraint
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ComponentMultiAllocationConstraintImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ComponentMultiAllocationConstraintImpl.java
deleted file mode 100644
index 25810d64..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ComponentMultiAllocationConstraintImpl.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-import org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiAllocationConstraint;
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-
-import org.fortiss.af3.platform.model.ExecutionUnit;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Component Multi Allocation Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiAllocationConstraintImpl#isIsSoft <em>Is Soft</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiAllocationConstraintImpl#isImplicit <em>Implicit</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ComponentMultiAllocationConstraintImpl extends MultiLocationConstraintImpl<Component, ExecutionUnit> implements ComponentMultiAllocationConstraint {
-	/**
-	 * The default value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_SOFT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSoft = IS_SOFT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IMPLICIT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean implicit = IMPLICIT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComponentMultiAllocationConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PredefinedPackage.Literals.COMPONENT_MULTI_ALLOCATION_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsSoft() {
-		return isSoft;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSoft(boolean newIsSoft) {
-		boolean oldIsSoft = isSoft;
-		isSoft = newIsSoft;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IS_SOFT, oldIsSoft, isSoft));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isImplicit() {
-		return implicit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicit(boolean newImplicit) {
-		boolean oldImplicit = implicit;
-		implicit = newImplicit;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IMPLICIT, oldImplicit, implicit));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComponentMultiAllocations(final Component comp, final EList<ExecutionUnit> execUnits) {
-		ComponentMultiAllocationConstraintStaticImpl.setComponentMultiAllocations(this, comp, execUnits);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Component getComponent() {
-		return getLeftMultiLocationModelElement();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ExecutionUnit> getExecutionUnits() {
-		return getAllRightMultiLocationModelElements();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IS_SOFT:
-				return isIsSoft();
-			case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IMPLICIT:
-				return isImplicit();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IS_SOFT:
-				setIsSoft((Boolean)newValue);
-				return;
-			case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IMPLICIT:
-				setImplicit((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IS_SOFT:
-				setIsSoft(IS_SOFT_EDEFAULT);
-				return;
-			case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IMPLICIT:
-				setImplicit(IMPLICIT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IS_SOFT:
-				return isSoft != IS_SOFT_EDEFAULT;
-			case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IMPLICIT:
-				return implicit != IMPLICIT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (derivedFeatureID) {
-				case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IS_SOFT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT;
-				case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IMPLICIT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (baseFeatureID) {
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT: return PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IS_SOFT;
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT: return PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isSoft: ");
-		result.append(isSoft);
-		result.append(", implicit: ");
-		result.append(implicit);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ComponentMultiAllocationConstraintImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ComponentMultiDislocationConstraintImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ComponentMultiDislocationConstraintImpl.java
deleted file mode 100644
index 605b13a6..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ComponentMultiDislocationConstraintImpl.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-import org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiDislocationConstraint;
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-
-import org.fortiss.af3.platform.model.ExecutionUnit;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Component Multi Dislocation Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiDislocationConstraintImpl#isIsSoft <em>Is Soft</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ComponentMultiDislocationConstraintImpl#isImplicit <em>Implicit</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ComponentMultiDislocationConstraintImpl extends MultiLocationConstraintImpl<Component, ExecutionUnit> implements ComponentMultiDislocationConstraint {
-	/**
-	 * The default value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_SOFT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSoft = IS_SOFT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IMPLICIT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean implicit = IMPLICIT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComponentMultiDislocationConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PredefinedPackage.Literals.COMPONENT_MULTI_DISLOCATION_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsSoft() {
-		return isSoft;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSoft(boolean newIsSoft) {
-		boolean oldIsSoft = isSoft;
-		isSoft = newIsSoft;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IS_SOFT, oldIsSoft, isSoft));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isImplicit() {
-		return implicit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicit(boolean newImplicit) {
-		boolean oldImplicit = implicit;
-		implicit = newImplicit;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IMPLICIT, oldImplicit, implicit));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComponentMultiDislocations(final Component comp, final EList<ExecutionUnit> execUnits) {
-		ComponentMultiDislocationConstraintStaticImpl.setComponentMultiDislocations(this, comp, execUnits);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Component getComponent() {
-		return getLeftMultiLocationModelElement();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ExecutionUnit> getExecutionUnits() {
-		return getAllRightMultiLocationModelElements();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IS_SOFT:
-				return isIsSoft();
-			case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IMPLICIT:
-				return isImplicit();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IS_SOFT:
-				setIsSoft((Boolean)newValue);
-				return;
-			case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IMPLICIT:
-				setImplicit((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IS_SOFT:
-				setIsSoft(IS_SOFT_EDEFAULT);
-				return;
-			case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IMPLICIT:
-				setImplicit(IMPLICIT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IS_SOFT:
-				return isSoft != IS_SOFT_EDEFAULT;
-			case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IMPLICIT:
-				return implicit != IMPLICIT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (derivedFeatureID) {
-				case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IS_SOFT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT;
-				case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IMPLICIT: return ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == ExplorationTarget.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationConstraint.class) {
-			switch (baseFeatureID) {
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IS_SOFT: return PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IS_SOFT;
-				case ExplorationPackage.EXPLORATION_CONSTRAINT__IMPLICIT: return PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT__IMPLICIT;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isSoft: ");
-		result.append(isSoft);
-		result.append(", implicit: ");
-		result.append(implicit);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ComponentMultiDislocationConstraintImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/EnergyMinObjectiveImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/EnergyMinObjectiveImpl.java
deleted file mode 100644
index 0038d43c..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/EnergyMinObjectiveImpl.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.model.EnergyDimension;
-import org.fortiss.af3.exploration.model.IProblemDimension;
-
-import org.fortiss.af3.exploration.moea.model.predefined.EnergyMinObjective;
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Energy Min Objective</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.EnergyMinObjectiveImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.EnergyMinObjectiveImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.EnergyMinObjectiveImpl#getComment <em>Comment</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.EnergyMinObjectiveImpl#getPriority <em>Priority</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.EnergyMinObjectiveImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EnergyMinObjectiveImpl extends EObjectImpl implements EnergyMinObjective {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected int id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPriority() <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPriority()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PRIORITY_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getPriority() <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPriority()
-	 * @generated
-	 * @ordered
-	 */
-	protected int priority = PRIORITY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected Expression expression;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EnergyMinObjectiveImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PredefinedPackage.Literals.ENERGY_MIN_OBJECTIVE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(int newId) {
-		int oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.ENERGY_MIN_OBJECTIVE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.ENERGY_MIN_OBJECTIVE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.ENERGY_MIN_OBJECTIVE__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getPriority() {
-		return priority;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPriority(int newPriority) {
-		int oldPriority = priority;
-		priority = newPriority;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.ENERGY_MIN_OBJECTIVE__PRIORITY, oldPriority, priority));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression getExpression() {
-		if (expression != null && expression.eIsProxy()) {
-			InternalEObject oldExpression = (InternalEObject)expression;
-			expression = (Expression)eResolveProxy(oldExpression);
-			if (expression != oldExpression) {
-				InternalEObject newExpression = (InternalEObject)expression;
-				NotificationChain msgs = oldExpression.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION, null, null);
-				if (newExpression.eInternalContainer() == null) {
-					msgs = newExpression.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION, oldExpression, expression));
-			}
-		}
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression basicGetExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
-		Expression oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(Expression newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION:
-				return basicSetExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__ID:
-				return getId();
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__NAME:
-				return getName();
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__COMMENT:
-				return getComment();
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__PRIORITY:
-				return getPriority();
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION:
-				if (resolve) return getExpression();
-				return basicGetExpression();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__ID:
-				setId((Integer)newValue);
-				return;
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__NAME:
-				setName((String)newValue);
-				return;
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__COMMENT:
-				setComment((String)newValue);
-				return;
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__PRIORITY:
-				setPriority((Integer)newValue);
-				return;
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION:
-				setExpression((Expression)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__COMMENT:
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__PRIORITY:
-				setPriority(PRIORITY_EDEFAULT);
-				return;
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION:
-				setExpression((Expression)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__ID:
-				return id != ID_EDEFAULT;
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__COMMENT:
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__PRIORITY:
-				return priority != PRIORITY_EDEFAULT;
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION:
-				return expression != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == IProblemDimension.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == EnergyDimension.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (derivedFeatureID) {
-				case PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION: return ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == IProblemDimension.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == EnergyDimension.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (baseFeatureID) {
-				case ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION: return PredefinedPackage.ENERGY_MIN_OBJECTIVE__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", comment: ");
-		result.append(comment);
-		result.append(", priority: ");
-		result.append(priority);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EnergyMinObjectiveImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/FailureMinObjectiveImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/FailureMinObjectiveImpl.java
deleted file mode 100644
index 7f5b7b2b..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/FailureMinObjectiveImpl.java
+++ /dev/null
@@ -1,633 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.model.CommonPackage;
-import org.fortiss.af3.exploration.model.ExplorationObjective;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-import org.fortiss.af3.exploration.model.MOExplorationObjective;
-
-import org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective;
-import org.fortiss.af3.exploration.moea.model.predefined.FailureMode;
-import org.fortiss.af3.exploration.moea.model.predefined.FailureType;
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Failure Min Objective</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.FailureMinObjectiveImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.FailureMinObjectiveImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.FailureMinObjectiveImpl#getComment <em>Comment</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.FailureMinObjectiveImpl#getExpression <em>Expression</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.FailureMinObjectiveImpl#getPriority <em>Priority</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.FailureMinObjectiveImpl#getMode <em>Mode</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.FailureMinObjectiveImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FailureMinObjectiveImpl extends EObjectImpl implements FailureMinObjective {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected int id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected Expression expression;
-
-	/**
-	 * The default value of the '{@link #getPriority() <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPriority()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PRIORITY_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getPriority() <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPriority()
-	 * @generated
-	 * @ordered
-	 */
-	protected int priority = PRIORITY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMode() <em>Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final FailureMode MODE_EDEFAULT = FailureMode.FAIL_SAFE;
-
-	/**
-	 * The cached value of the '{@link #getMode() <em>Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected FailureMode mode = MODE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final FailureType TYPE_EDEFAULT = FailureType.DUF;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected FailureType type = TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FailureMinObjectiveImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PredefinedPackage.Literals.FAILURE_MIN_OBJECTIVE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(int newId) {
-		int oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.FAILURE_MIN_OBJECTIVE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.FAILURE_MIN_OBJECTIVE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.FAILURE_MIN_OBJECTIVE__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression getExpression() {
-		if (expression != null && expression.eIsProxy()) {
-			InternalEObject oldExpression = (InternalEObject)expression;
-			expression = (Expression)eResolveProxy(oldExpression);
-			if (expression != oldExpression) {
-				InternalEObject newExpression = (InternalEObject)expression;
-				NotificationChain msgs = oldExpression.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION, null, null);
-				if (newExpression.eInternalContainer() == null) {
-					msgs = newExpression.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION, oldExpression, expression));
-			}
-		}
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression basicGetExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
-		Expression oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(Expression newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getPriority() {
-		return priority;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPriority(int newPriority) {
-		int oldPriority = priority;
-		priority = newPriority;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.FAILURE_MIN_OBJECTIVE__PRIORITY, oldPriority, priority));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FailureMode getMode() {
-		return mode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMode(FailureMode newMode) {
-		FailureMode oldMode = mode;
-		mode = newMode == null ? MODE_EDEFAULT : newMode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.FAILURE_MIN_OBJECTIVE__MODE, oldMode, mode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FailureType getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(FailureType newType) {
-		FailureType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.FAILURE_MIN_OBJECTIVE__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Component getTargetComponent() {
-		return FailureMinObjectiveStaticImpl.getFailureMinTargetComponent(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTargetComponent(final Component targetComponent) {
-		FailureMinObjectiveStaticImpl.setFailureMinTargetComponent(this, targetComponent);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION:
-				return basicSetExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__ID:
-				return getId();
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__NAME:
-				return getName();
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__COMMENT:
-				return getComment();
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION:
-				if (resolve) return getExpression();
-				return basicGetExpression();
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__PRIORITY:
-				return getPriority();
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__MODE:
-				return getMode();
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__TYPE:
-				return getType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__ID:
-				setId((Integer)newValue);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__NAME:
-				setName((String)newValue);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__COMMENT:
-				setComment((String)newValue);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION:
-				setExpression((Expression)newValue);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__PRIORITY:
-				setPriority((Integer)newValue);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__MODE:
-				setMode((FailureMode)newValue);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__TYPE:
-				setType((FailureType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__COMMENT:
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION:
-				setExpression((Expression)null);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__PRIORITY:
-				setPriority(PRIORITY_EDEFAULT);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__MODE:
-				setMode(MODE_EDEFAULT);
-				return;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__ID:
-				return id != ID_EDEFAULT;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__COMMENT:
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION:
-				return expression != null;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__PRIORITY:
-				return priority != PRIORITY_EDEFAULT;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__MODE:
-				return mode != MODE_EDEFAULT;
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE__TYPE:
-				return type != TYPE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (derivedFeatureID) {
-				case PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION: return ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION;
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationTarget.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationObjective.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == MOExplorationObjective.class) {
-			switch (derivedFeatureID) {
-				case PredefinedPackage.FAILURE_MIN_OBJECTIVE__PRIORITY: return CommonPackage.MO_EXPLORATION_OBJECTIVE__PRIORITY;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (baseFeatureID) {
-				case ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION: return PredefinedPackage.FAILURE_MIN_OBJECTIVE__EXPRESSION;
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationTarget.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == ExplorationObjective.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == MOExplorationObjective.class) {
-			switch (baseFeatureID) {
-				case CommonPackage.MO_EXPLORATION_OBJECTIVE__PRIORITY: return PredefinedPackage.FAILURE_MIN_OBJECTIVE__PRIORITY;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", comment: ");
-		result.append(comment);
-		result.append(", priority: ");
-		result.append(priority);
-		result.append(", mode: ");
-		result.append(mode);
-		result.append(", type: ");
-		result.append(type);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FailureMinObjectiveImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/MultiLocationConstraintImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/MultiLocationConstraintImpl.java
deleted file mode 100644
index 827f89b5..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/MultiLocationConstraintImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-import org.fortiss.af3.exploration.model.location.LocationConstraint;
-
-import org.fortiss.af3.exploration.model.location.impl.LocationConstraintImpl;
-
-import org.fortiss.af3.exploration.moea.model.predefined.MultiLocationConstraint;
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Multi Location Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.MultiLocationConstraintImpl#getSingleLocationConstraints <em>Single Location Constraints</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MultiLocationConstraintImpl<LHT extends IModelElement, RHT extends IModelElement> extends LocationConstraintImpl<LHT, RHT> implements MultiLocationConstraint<LHT, RHT> {
-	/**
-	 * The cached value of the '{@link #getSingleLocationConstraints() <em>Single Location Constraints</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSingleLocationConstraints()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<LocationConstraint<LHT, RHT>> singleLocationConstraints;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MultiLocationConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PredefinedPackage.Literals.MULTI_LOCATION_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<LocationConstraint<LHT, RHT>> getSingleLocationConstraints() {
-		if (singleLocationConstraints == null) {
-			singleLocationConstraints = new EObjectResolvingEList<LocationConstraint<LHT, RHT>>(LocationConstraint.class, this, PredefinedPackage.MULTI_LOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS);
-		}
-		return singleLocationConstraints;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LHT getLeftMultiLocationModelElement() {
-		return MultiLocationConstraintStaticImpl.getLeftMultiLocationModelElement(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<RHT> getAllRightMultiLocationModelElements() {
-		return MultiLocationConstraintStaticImpl.getAllRightMultiLocationModelElements(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PredefinedPackage.MULTI_LOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS:
-				return getSingleLocationConstraints();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PredefinedPackage.MULTI_LOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS:
-				getSingleLocationConstraints().clear();
-				getSingleLocationConstraints().addAll((Collection<? extends LocationConstraint<LHT, RHT>>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.MULTI_LOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS:
-				getSingleLocationConstraints().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.MULTI_LOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS:
-				return singleLocationConstraints != null && !singleLocationConstraints.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //MultiLocationConstraintImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/PredefinedFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/PredefinedFactoryImpl.java
deleted file mode 100644
index 4e2a9c96..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/PredefinedFactoryImpl.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.moea.model.predefined.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PredefinedFactoryImpl extends EFactoryImpl implements PredefinedFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PredefinedFactory init() {
-		try {
-			PredefinedFactory thePredefinedFactory = (PredefinedFactory)EPackage.Registry.INSTANCE.getEFactory(PredefinedPackage.eNS_URI);
-			if (thePredefinedFactory != null) {
-				return thePredefinedFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new PredefinedFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredefinedFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE: return createFailureMinObjective();
-			case PredefinedPackage.RELIABILITY_ANALYSIS: return createReliabilityAnalysis();
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE: return createEnergyMinObjective();
-			case PredefinedPackage.MULTI_LOCATION_CONSTRAINT: return createMultiLocationConstraint();
-			case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT: return createComponentMultiAllocationConstraint();
-			case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT: return createComponentMultiDislocationConstraint();
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT: return createSafetyIntegrityLevelConstraint();
-			case PredefinedPackage.SAFETY_COMPARISON: return createSafetyComparison();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case PredefinedPackage.FAILURE_MODE:
-				return createFailureModeFromString(eDataType, initialValue);
-			case PredefinedPackage.FAILURE_TYPE:
-				return createFailureTypeFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case PredefinedPackage.FAILURE_MODE:
-				return convertFailureModeToString(eDataType, instanceValue);
-			case PredefinedPackage.FAILURE_TYPE:
-				return convertFailureTypeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FailureMinObjective createFailureMinObjective() {
-		FailureMinObjectiveImpl failureMinObjective = new FailureMinObjectiveImpl();
-		return failureMinObjective;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReliabilityAnalysis createReliabilityAnalysis() {
-		ReliabilityAnalysisImpl reliabilityAnalysis = new ReliabilityAnalysisImpl();
-		return reliabilityAnalysis;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnergyMinObjective createEnergyMinObjective() {
-		EnergyMinObjectiveImpl energyMinObjective = new EnergyMinObjectiveImpl();
-		return energyMinObjective;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <LHT extends IModelElement, RHT extends IModelElement> MultiLocationConstraint<LHT, RHT> createMultiLocationConstraint() {
-		MultiLocationConstraintImpl<LHT, RHT> multiLocationConstraint = new MultiLocationConstraintImpl<LHT, RHT>();
-		return multiLocationConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComponentMultiAllocationConstraint createComponentMultiAllocationConstraint() {
-		ComponentMultiAllocationConstraintImpl componentMultiAllocationConstraint = new ComponentMultiAllocationConstraintImpl();
-		return componentMultiAllocationConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComponentMultiDislocationConstraint createComponentMultiDislocationConstraint() {
-		ComponentMultiDislocationConstraintImpl componentMultiDislocationConstraint = new ComponentMultiDislocationConstraintImpl();
-		return componentMultiDislocationConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SafetyIntegrityLevelConstraint createSafetyIntegrityLevelConstraint() {
-		SafetyIntegrityLevelConstraintImpl safetyIntegrityLevelConstraint = new SafetyIntegrityLevelConstraintImpl();
-		return safetyIntegrityLevelConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> SafetyComparison<T> createSafetyComparison() {
-		SafetyComparisonImpl<T> safetyComparison = new SafetyComparisonImpl<T>();
-		return safetyComparison;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FailureMode createFailureModeFromString(EDataType eDataType, String initialValue) {
-		FailureMode result = FailureMode.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertFailureModeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FailureType createFailureTypeFromString(EDataType eDataType, String initialValue) {
-		FailureType result = FailureType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertFailureTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredefinedPackage getPredefinedPackage() {
-		return (PredefinedPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static PredefinedPackage getPackage() {
-		return PredefinedPackage.eINSTANCE;
-	}
-
-} //PredefinedFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/PredefinedPackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/PredefinedPackageImpl.java
deleted file mode 100644
index 3c2786ff..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/PredefinedPackageImpl.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.ETypeParameter;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.component.model.AF3ComponentPackage;
-
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.operators.OperatorsPackage;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.PatternsPackage;
-
-import org.fortiss.af3.exploration.model.CommonPackage;
-import org.fortiss.af3.exploration.model.DimensionsPackage;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-
-import org.fortiss.af3.exploration.model.location.LocationPackage;
-
-import org.fortiss.af3.exploration.moea.model.MoeaPackage;
-
-import org.fortiss.af3.exploration.moea.model.feature.FeaturePackage;
-
-import org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage;
-
-import org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiAllocationConstraint;
-import org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiDislocationConstraint;
-import org.fortiss.af3.exploration.moea.model.predefined.EnergyMinObjective;
-import org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective;
-import org.fortiss.af3.exploration.moea.model.predefined.FailureMode;
-import org.fortiss.af3.exploration.moea.model.predefined.FailureType;
-import org.fortiss.af3.exploration.moea.model.predefined.MultiLocationConstraint;
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedFactory;
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-import org.fortiss.af3.exploration.moea.model.predefined.ReliabilityAnalysis;
-import org.fortiss.af3.exploration.moea.model.predefined.SafetyComparison;
-import org.fortiss.af3.exploration.moea.model.predefined.SafetyIntegrityLevelConstraint;
-
-import org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage;
-
-import org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl;
-
-import org.fortiss.af3.platform.model.AF3PlatformPackage;
-
-import org.fortiss.af3.safety.model.SafetyPackage;
-
-import org.fortiss.tooling.base.model.element.ElementPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PredefinedPackageImpl extends EPackageImpl implements PredefinedPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass failureMinObjectiveEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass reliabilityAnalysisEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass energyMinObjectiveEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass multiLocationConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass componentMultiAllocationConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass componentMultiDislocationConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass safetyIntegrityLevelConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass safetyComparisonEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum failureModeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum failureTypeEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private PredefinedPackageImpl() {
-		super(eNS_URI, PredefinedFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link PredefinedPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static PredefinedPackage init() {
-		if (isInited) return (PredefinedPackage)EPackage.Registry.INSTANCE.getEPackage(PredefinedPackage.eNS_URI);
-
-		// Obtain or create and register package
-		PredefinedPackageImpl thePredefinedPackage = (PredefinedPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PredefinedPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PredefinedPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		CommonPackage.eINSTANCE.eClass();
-		DimensionsPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		MoeaPackageImpl theMoeaPackage = (MoeaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(MoeaPackage.eNS_URI) instanceof MoeaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(MoeaPackage.eNS_URI) : MoeaPackage.eINSTANCE);
-		FeaturePackageImpl theFeaturePackage = (FeaturePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(FeaturePackage.eNS_URI) instanceof FeaturePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(FeaturePackage.eNS_URI) : FeaturePackage.eINSTANCE);
-		ParametersPackageImpl theParametersPackage = (ParametersPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ParametersPackage.eNS_URI) instanceof ParametersPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ParametersPackage.eNS_URI) : ParametersPackage.eINSTANCE);
-		SolutionsPackageImpl theSolutionsPackage = (SolutionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SolutionsPackage.eNS_URI) instanceof SolutionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SolutionsPackage.eNS_URI) : SolutionsPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		thePredefinedPackage.createPackageContents();
-		theMoeaPackage.createPackageContents();
-		theFeaturePackage.createPackageContents();
-		theParametersPackage.createPackageContents();
-		theSolutionsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		thePredefinedPackage.initializePackageContents();
-		theMoeaPackage.initializePackageContents();
-		theFeaturePackage.initializePackageContents();
-		theParametersPackage.initializePackageContents();
-		theSolutionsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		thePredefinedPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(PredefinedPackage.eNS_URI, thePredefinedPackage);
-		return thePredefinedPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFailureMinObjective() {
-		return failureMinObjectiveEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFailureMinObjective_Mode() {
-		return (EAttribute)failureMinObjectiveEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFailureMinObjective_Type() {
-		return (EAttribute)failureMinObjectiveEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReliabilityAnalysis() {
-		return reliabilityAnalysisEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEnergyMinObjective() {
-		return energyMinObjectiveEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMultiLocationConstraint() {
-		return multiLocationConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMultiLocationConstraint_SingleLocationConstraints() {
-		return (EReference)multiLocationConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getComponentMultiAllocationConstraint() {
-		return componentMultiAllocationConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getComponentMultiDislocationConstraint() {
-		return componentMultiDislocationConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSafetyIntegrityLevelConstraint() {
-		return safetyIntegrityLevelConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSafetyIntegrityLevelConstraint_Components() {
-		return (EReference)safetyIntegrityLevelConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSafetyComparison() {
-		return safetyComparisonEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getFailureMode() {
-		return failureModeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getFailureType() {
-		return failureTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredefinedFactory getPredefinedFactory() {
-		return (PredefinedFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		failureMinObjectiveEClass = createEClass(FAILURE_MIN_OBJECTIVE);
-		createEAttribute(failureMinObjectiveEClass, FAILURE_MIN_OBJECTIVE__MODE);
-		createEAttribute(failureMinObjectiveEClass, FAILURE_MIN_OBJECTIVE__TYPE);
-
-		reliabilityAnalysisEClass = createEClass(RELIABILITY_ANALYSIS);
-
-		energyMinObjectiveEClass = createEClass(ENERGY_MIN_OBJECTIVE);
-
-		multiLocationConstraintEClass = createEClass(MULTI_LOCATION_CONSTRAINT);
-		createEReference(multiLocationConstraintEClass, MULTI_LOCATION_CONSTRAINT__SINGLE_LOCATION_CONSTRAINTS);
-
-		componentMultiAllocationConstraintEClass = createEClass(COMPONENT_MULTI_ALLOCATION_CONSTRAINT);
-
-		componentMultiDislocationConstraintEClass = createEClass(COMPONENT_MULTI_DISLOCATION_CONSTRAINT);
-
-		safetyIntegrityLevelConstraintEClass = createEClass(SAFETY_INTEGRITY_LEVEL_CONSTRAINT);
-		createEReference(safetyIntegrityLevelConstraintEClass, SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMPONENTS);
-
-		safetyComparisonEClass = createEClass(SAFETY_COMPARISON);
-
-		// Create enums
-		failureModeEEnum = createEEnum(FAILURE_MODE);
-		failureTypeEEnum = createEEnum(FAILURE_TYPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		DimensionsPackage theDimensionsPackage = (DimensionsPackage)EPackage.Registry.INSTANCE.getEPackage(DimensionsPackage.eNS_URI);
-		ModelPackage theModelPackage = (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		AF3ComponentPackage theAF3ComponentPackage = (AF3ComponentPackage)EPackage.Registry.INSTANCE.getEPackage(AF3ComponentPackage.eNS_URI);
-		ExpressionsPackage theExpressionsPackage = (ExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI);
-		ElementPackage theElementPackage = (ElementPackage)EPackage.Registry.INSTANCE.getEPackage(ElementPackage.eNS_URI);
-		LocationPackage theLocationPackage = (LocationPackage)EPackage.Registry.INSTANCE.getEPackage(LocationPackage.eNS_URI);
-		AF3PlatformPackage theAF3PlatformPackage = (AF3PlatformPackage)EPackage.Registry.INSTANCE.getEPackage(AF3PlatformPackage.eNS_URI);
-		ExplorationPackage theExplorationPackage = (ExplorationPackage)EPackage.Registry.INSTANCE.getEPackage(ExplorationPackage.eNS_URI);
-		SafetyPackage theSafetyPackage = (SafetyPackage)EPackage.Registry.INSTANCE.getEPackage(SafetyPackage.eNS_URI);
-		OperatorsPackage theOperatorsPackage = (OperatorsPackage)EPackage.Registry.INSTANCE.getEPackage(OperatorsPackage.eNS_URI);
-		PatternsPackage thePatternsPackage = (PatternsPackage)EPackage.Registry.INSTANCE.getEPackage(PatternsPackage.eNS_URI);
-
-		// Create type parameters
-		ETypeParameter multiLocationConstraintEClass_LHT = addETypeParameter(multiLocationConstraintEClass, "LHT");
-		ETypeParameter multiLocationConstraintEClass_RHT = addETypeParameter(multiLocationConstraintEClass, "RHT");
-		ETypeParameter safetyComparisonEClass_T = addETypeParameter(safetyComparisonEClass, "T");
-
-		// Set bounds for type parameters
-		EGenericType g1 = createEGenericType(theElementPackage.getIModelElement());
-		multiLocationConstraintEClass_LHT.getEBounds().add(g1);
-		g1 = createEGenericType(theElementPackage.getIModelElement());
-		multiLocationConstraintEClass_RHT.getEBounds().add(g1);
-
-		// Add supertypes to classes
-		g1 = createEGenericType(theDimensionsPackage.getResourceDimension());
-		failureMinObjectiveEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theModelPackage.getMOEAExplorationExpression());
-		failureMinObjectiveEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theCommonPackage.getMOExplorationObjective());
-		EGenericType g2 = createEGenericType(ecorePackage.getEDoubleObject());
-		g1.getETypeArguments().add(g2);
-		failureMinObjectiveEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getArithmeticExpression());
-		g2 = createEGenericType(ecorePackage.getEDoubleObject());
-		g1.getETypeArguments().add(g2);
-		reliabilityAnalysisEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExpressionsPackage.getElementExpression());
-		g2 = createEGenericType(theAF3ComponentPackage.getComponent());
-		g1.getETypeArguments().add(g2);
-		reliabilityAnalysisEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theModelPackage.getMOEAExplorationExpression());
-		reliabilityAnalysisEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theCommonPackage.getMOExplorationObjective());
-		g2 = createEGenericType(ecorePackage.getEDoubleObject());
-		g1.getETypeArguments().add(g2);
-		energyMinObjectiveEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theDimensionsPackage.getEnergyDimension());
-		energyMinObjectiveEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theModelPackage.getMOEAExplorationExpression());
-		energyMinObjectiveEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theLocationPackage.getLocationConstraint());
-		g2 = createEGenericType(multiLocationConstraintEClass_LHT);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(multiLocationConstraintEClass_RHT);
-		g1.getETypeArguments().add(g2);
-		multiLocationConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getMultiLocationConstraint());
-		g2 = createEGenericType(theAF3ComponentPackage.getComponent());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(theAF3PlatformPackage.getExecutionUnit());
-		g1.getETypeArguments().add(g2);
-		componentMultiAllocationConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExplorationPackage.getExplorationConstraint());
-		g2 = createEGenericType(ecorePackage.getEBooleanObject());
-		g1.getETypeArguments().add(g2);
-		componentMultiAllocationConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(this.getMultiLocationConstraint());
-		g2 = createEGenericType(theAF3ComponentPackage.getComponent());
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(theAF3PlatformPackage.getExecutionUnit());
-		g1.getETypeArguments().add(g2);
-		componentMultiDislocationConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExplorationPackage.getExplorationConstraint());
-		g2 = createEGenericType(ecorePackage.getEBooleanObject());
-		g1.getETypeArguments().add(g2);
-		componentMultiDislocationConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theExplorationPackage.getExplorationConstraint());
-		g2 = createEGenericType(theSafetyPackage.getSIL());
-		g1.getETypeArguments().add(g2);
-		safetyIntegrityLevelConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theDimensionsPackage.getSafetyDimension());
-		safetyIntegrityLevelConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theModelPackage.getMOEAExplorationExpression());
-		safetyIntegrityLevelConstraintEClass.getEGenericSuperTypes().add(g1);
-		g1 = createEGenericType(theOperatorsPackage.getComparisonOp());
-		g2 = createEGenericType(safetyComparisonEClass_T);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(thePatternsPackage.getElementProperty());
-		g1.getETypeArguments().add(g2);
-		EGenericType g3 = createEGenericType(theAF3ComponentPackage.getComponent());
-		g2.getETypeArguments().add(g3);
-		g3 = createEGenericType(safetyComparisonEClass_T);
-		g2.getETypeArguments().add(g3);
-		g2 = createEGenericType(thePatternsPackage.getElementProperty());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType(theAF3PlatformPackage.getExecutionUnit());
-		g2.getETypeArguments().add(g3);
-		g3 = createEGenericType(safetyComparisonEClass_T);
-		g2.getETypeArguments().add(g3);
-		safetyComparisonEClass.getEGenericSuperTypes().add(g1);
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(failureMinObjectiveEClass, FailureMinObjective.class, "FailureMinObjective", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFailureMinObjective_Mode(), this.getFailureMode(), "mode", "FailSafe", 1, 1, FailureMinObjective.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFailureMinObjective_Type(), this.getFailureType(), "type", null, 1, 1, FailureMinObjective.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		addEOperation(failureMinObjectiveEClass, theAF3ComponentPackage.getComponent(), "getTargetComponent", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		EOperation op = addEOperation(failureMinObjectiveEClass, null, "setTargetComponent", 1, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theAF3ComponentPackage.getComponent(), "targetComponent", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(reliabilityAnalysisEClass, ReliabilityAnalysis.class, "ReliabilityAnalysis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(energyMinObjectiveEClass, EnergyMinObjective.class, "EnergyMinObjective", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(multiLocationConstraintEClass, MultiLocationConstraint.class, "MultiLocationConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		g1 = createEGenericType(theLocationPackage.getLocationConstraint());
-		g2 = createEGenericType(multiLocationConstraintEClass_LHT);
-		g1.getETypeArguments().add(g2);
-		g2 = createEGenericType(multiLocationConstraintEClass_RHT);
-		g1.getETypeArguments().add(g2);
-		initEReference(getMultiLocationConstraint_SingleLocationConstraints(), g1, null, "singleLocationConstraints", null, 1, -1, MultiLocationConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		op = addEOperation(multiLocationConstraintEClass, null, "getLeftMultiLocationModelElement", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(multiLocationConstraintEClass_LHT);
-		initEOperation(op, g1);
-
-		op = addEOperation(multiLocationConstraintEClass, null, "getAllRightMultiLocationModelElements", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(ecorePackage.getEEList());
-		g2 = createEGenericType(multiLocationConstraintEClass_RHT);
-		g1.getETypeArguments().add(g2);
-		initEOperation(op, g1);
-
-		initEClass(componentMultiAllocationConstraintEClass, ComponentMultiAllocationConstraint.class, "ComponentMultiAllocationConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		op = addEOperation(componentMultiAllocationConstraintEClass, null, "setComponentMultiAllocations", 1, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theAF3ComponentPackage.getComponent(), "comp", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(ecorePackage.getEEList());
-		g2 = createEGenericType(theAF3PlatformPackage.getExecutionUnit());
-		g1.getETypeArguments().add(g2);
-		addEParameter(op, g1, "execUnits", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(componentMultiAllocationConstraintEClass, theAF3ComponentPackage.getComponent(), "getComponent", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		op = addEOperation(componentMultiAllocationConstraintEClass, null, "getExecutionUnits", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(ecorePackage.getEEList());
-		g2 = createEGenericType(theAF3PlatformPackage.getExecutionUnit());
-		g1.getETypeArguments().add(g2);
-		initEOperation(op, g1);
-
-		initEClass(componentMultiDislocationConstraintEClass, ComponentMultiDislocationConstraint.class, "ComponentMultiDislocationConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		op = addEOperation(componentMultiDislocationConstraintEClass, null, "setComponentMultiDislocations", 1, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theAF3ComponentPackage.getComponent(), "comp", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(ecorePackage.getEEList());
-		g2 = createEGenericType(theAF3PlatformPackage.getExecutionUnit());
-		g1.getETypeArguments().add(g2);
-		addEParameter(op, g1, "execUnits", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(componentMultiDislocationConstraintEClass, theAF3ComponentPackage.getComponent(), "getComponent", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		op = addEOperation(componentMultiDislocationConstraintEClass, null, "getExecutionUnits", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(ecorePackage.getEEList());
-		g2 = createEGenericType(theAF3PlatformPackage.getExecutionUnit());
-		g1.getETypeArguments().add(g2);
-		initEOperation(op, g1);
-
-		initEClass(safetyIntegrityLevelConstraintEClass, SafetyIntegrityLevelConstraint.class, "SafetyIntegrityLevelConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSafetyIntegrityLevelConstraint_Components(), theAF3ComponentPackage.getComponent(), null, "components", null, 1, -1, SafetyIntegrityLevelConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		op = addEOperation(safetyIntegrityLevelConstraintEClass, null, "getLimitation", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(ecorePackage.getEEList());
-		g2 = createEGenericType(theSafetyPackage.getSIL());
-		g1.getETypeArguments().add(g2);
-		initEOperation(op, g1);
-
-		initEClass(safetyComparisonEClass, SafetyComparison.class, "SafetyComparison", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Initialize enums and add enum literals
-		initEEnum(failureModeEEnum, FailureMode.class, "FailureMode");
-		addEEnumLiteral(failureModeEEnum, FailureMode.FAIL_SAFE);
-		addEEnumLiteral(failureModeEEnum, FailureMode.FAIL_OPERATIONAL);
-
-		initEEnum(failureTypeEEnum, FailureType.class, "FailureType");
-		addEEnumLiteral(failureTypeEEnum, FailureType.DUF);
-		addEEnumLiteral(failureTypeEEnum, FailureType.SDC);
-		addEEnumLiteral(failureTypeEEnum, FailureType.ALL);
-	}
-
-} //PredefinedPackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ReliabilityAnalysisImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ReliabilityAnalysisImpl.java
deleted file mode 100644
index b4fd22ac..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/ReliabilityAnalysisImpl.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ExpressionsPackage;
-
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-import org.fortiss.af3.exploration.moea.model.predefined.ReliabilityAnalysis;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Reliability Analysis</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ReliabilityAnalysisImpl#getModelElement <em>Model Element</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.ReliabilityAnalysisImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ReliabilityAnalysisImpl extends EObjectImpl implements ReliabilityAnalysis {
-	/**
-	 * The cached value of the '{@link #getModelElement() <em>Model Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getModelElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected Component modelElement;
-
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected Expression expression;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReliabilityAnalysisImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PredefinedPackage.Literals.RELIABILITY_ANALYSIS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Component getModelElement() {
-		if (modelElement != null && modelElement.eIsProxy()) {
-			InternalEObject oldModelElement = (InternalEObject)modelElement;
-			modelElement = (Component)eResolveProxy(oldModelElement);
-			if (modelElement != oldModelElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PredefinedPackage.RELIABILITY_ANALYSIS__MODEL_ELEMENT, oldModelElement, modelElement));
-			}
-		}
-		return modelElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Component basicGetModelElement() {
-		return modelElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setModelElement(Component newModelElement) {
-		Component oldModelElement = modelElement;
-		modelElement = newModelElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.RELIABILITY_ANALYSIS__MODEL_ELEMENT, oldModelElement, modelElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression getExpression() {
-		if (expression != null && expression.eIsProxy()) {
-			InternalEObject oldExpression = (InternalEObject)expression;
-			expression = (Expression)eResolveProxy(oldExpression);
-			if (expression != oldExpression) {
-				InternalEObject newExpression = (InternalEObject)expression;
-				NotificationChain msgs = oldExpression.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION, null, null);
-				if (newExpression.eInternalContainer() == null) {
-					msgs = newExpression.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION, oldExpression, expression));
-			}
-		}
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression basicGetExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
-		Expression oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(Expression newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION:
-				return basicSetExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PredefinedPackage.RELIABILITY_ANALYSIS__MODEL_ELEMENT:
-				if (resolve) return getModelElement();
-				return basicGetModelElement();
-			case PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION:
-				if (resolve) return getExpression();
-				return basicGetExpression();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PredefinedPackage.RELIABILITY_ANALYSIS__MODEL_ELEMENT:
-				setModelElement((Component)newValue);
-				return;
-			case PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION:
-				setExpression((Expression)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.RELIABILITY_ANALYSIS__MODEL_ELEMENT:
-				setModelElement((Component)null);
-				return;
-			case PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION:
-				setExpression((Expression)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.RELIABILITY_ANALYSIS__MODEL_ELEMENT:
-				return modelElement != null;
-			case PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION:
-				return expression != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == ElementExpression.class) {
-			switch (derivedFeatureID) {
-				case PredefinedPackage.RELIABILITY_ANALYSIS__MODEL_ELEMENT: return ExpressionsPackage.ELEMENT_EXPRESSION__MODEL_ELEMENT;
-				default: return -1;
-			}
-		}
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (derivedFeatureID) {
-				case PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION: return ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == ElementExpression.class) {
-			switch (baseFeatureID) {
-				case ExpressionsPackage.ELEMENT_EXPRESSION__MODEL_ELEMENT: return PredefinedPackage.RELIABILITY_ANALYSIS__MODEL_ELEMENT;
-				default: return -1;
-			}
-		}
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (baseFeatureID) {
-				case ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION: return PredefinedPackage.RELIABILITY_ANALYSIS__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-} //ReliabilityAnalysisImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/SafetyComparisonImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/SafetyComparisonImpl.java
deleted file mode 100644
index 288b57b1..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/SafetyComparisonImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.operators.impl.ComparisonOpImpl;
-
-import org.fortiss.af3.exploration.dsl.model.patterns.ElementProperty;
-
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-import org.fortiss.af3.exploration.moea.model.predefined.SafetyComparison;
-
-import org.fortiss.af3.platform.model.ExecutionUnit;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Safety Comparison</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class SafetyComparisonImpl<T> extends ComparisonOpImpl<T, ElementProperty<Component, T>, ElementProperty<ExecutionUnit, T>> implements SafetyComparison<T> {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SafetyComparisonImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PredefinedPackage.Literals.SAFETY_COMPARISON;
-	}
-
-} //SafetyComparisonImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/SafetyIntegrityLevelConstraintImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/SafetyIntegrityLevelConstraintImpl.java
deleted file mode 100644
index 6a171e6a..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/impl/SafetyIntegrityLevelConstraintImpl.java
+++ /dev/null
@@ -1,597 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-import org.fortiss.af3.component.model.Component;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-import org.fortiss.af3.exploration.dsl.model.ModelPackage;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.model.IProblemDimension;
-import org.fortiss.af3.exploration.model.SafetyDimension;
-
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-import org.fortiss.af3.exploration.moea.model.predefined.SafetyIntegrityLevelConstraint;
-
-import org.fortiss.af3.safety.model.SIL;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Safety Integrity Level Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyIntegrityLevelConstraintImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyIntegrityLevelConstraintImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyIntegrityLevelConstraintImpl#getComment <em>Comment</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyIntegrityLevelConstraintImpl#isIsSoft <em>Is Soft</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyIntegrityLevelConstraintImpl#isImplicit <em>Implicit</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyIntegrityLevelConstraintImpl#getExpression <em>Expression</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.predefined.impl.SafetyIntegrityLevelConstraintImpl#getComponents <em>Components</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SafetyIntegrityLevelConstraintImpl extends EObjectImpl implements SafetyIntegrityLevelConstraint {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected int id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_SOFT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsSoft() <em>Is Soft</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSoft()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSoft = IS_SOFT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IMPLICIT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isImplicit()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean implicit = IMPLICIT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected Expression expression;
-
-	/**
-	 * The cached value of the '{@link #getComponents() <em>Components</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComponents()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Component> components;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SafetyIntegrityLevelConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PredefinedPackage.Literals.SAFETY_INTEGRITY_LEVEL_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(int newId) {
-		int oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsSoft() {
-		return isSoft;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSoft(boolean newIsSoft) {
-		boolean oldIsSoft = isSoft;
-		isSoft = newIsSoft;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IS_SOFT, oldIsSoft, isSoft));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isImplicit() {
-		return implicit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicit(boolean newImplicit) {
-		boolean oldImplicit = implicit;
-		implicit = newImplicit;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IMPLICIT, oldImplicit, implicit));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression getExpression() {
-		if (expression != null && expression.eIsProxy()) {
-			InternalEObject oldExpression = (InternalEObject)expression;
-			expression = (Expression)eResolveProxy(oldExpression);
-			if (expression != oldExpression) {
-				InternalEObject newExpression = (InternalEObject)expression;
-				NotificationChain msgs = oldExpression.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION, null, null);
-				if (newExpression.eInternalContainer() == null) {
-					msgs = newExpression.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION, oldExpression, expression));
-			}
-		}
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Expression basicGetExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
-		Expression oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(Expression newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Component> getComponents() {
-		if (components == null) {
-			components = new EObjectResolvingEList<Component>(Component.class, this, PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMPONENTS);
-		}
-		return components;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<SIL> getLimitation() {
-		return SafetyIntegrityLevelConstraintStaticImpl.getLimitation(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION:
-				return basicSetExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__ID:
-				return getId();
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__NAME:
-				return getName();
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMMENT:
-				return getComment();
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IS_SOFT:
-				return isIsSoft();
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IMPLICIT:
-				return isImplicit();
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION:
-				if (resolve) return getExpression();
-				return basicGetExpression();
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMPONENTS:
-				return getComponents();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__ID:
-				setId((Integer)newValue);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__NAME:
-				setName((String)newValue);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMMENT:
-				setComment((String)newValue);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IS_SOFT:
-				setIsSoft((Boolean)newValue);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IMPLICIT:
-				setImplicit((Boolean)newValue);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION:
-				setExpression((Expression)newValue);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMPONENTS:
-				getComponents().clear();
-				getComponents().addAll((Collection<? extends Component>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMMENT:
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IS_SOFT:
-				setIsSoft(IS_SOFT_EDEFAULT);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IMPLICIT:
-				setImplicit(IMPLICIT_EDEFAULT);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION:
-				setExpression((Expression)null);
-				return;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMPONENTS:
-				getComponents().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__ID:
-				return id != ID_EDEFAULT;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMMENT:
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IS_SOFT:
-				return isSoft != IS_SOFT_EDEFAULT;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__IMPLICIT:
-				return implicit != IMPLICIT_EDEFAULT;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION:
-				return expression != null;
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__COMPONENTS:
-				return components != null && !components.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == IProblemDimension.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == SafetyDimension.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (derivedFeatureID) {
-				case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION: return ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == IProblemDimension.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == SafetyDimension.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == MOEAExplorationExpression.class) {
-			switch (baseFeatureID) {
-				case ModelPackage.MOEA_EXPLORATION_EXPRESSION__EXPRESSION: return PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT__EXPRESSION;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", comment: ");
-		result.append(comment);
-		result.append(", isSoft: ");
-		result.append(isSoft);
-		result.append(", implicit: ");
-		result.append(implicit);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SafetyIntegrityLevelConstraintImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/util/PredefinedAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/util/PredefinedAdapterFactory.java
deleted file mode 100644
index 44082417..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/util/PredefinedAdapterFactory.java
+++ /dev/null
@@ -1,653 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp;
-import org.fortiss.af3.exploration.dsl.model.operators.DualOperator;
-import org.fortiss.af3.exploration.dsl.model.operators.Operator;
-
-import org.fortiss.af3.exploration.model.EnergyDimension;
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationObjective;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-import org.fortiss.af3.exploration.model.IProblemDimension;
-import org.fortiss.af3.exploration.model.MOExplorationObjective;
-import org.fortiss.af3.exploration.model.ResourceDimension;
-import org.fortiss.af3.exploration.model.SafetyDimension;
-
-import org.fortiss.af3.exploration.model.location.LocationConstraint;
-import org.fortiss.af3.exploration.model.location.LocationDimension;
-
-import org.fortiss.af3.exploration.moea.model.predefined.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-import org.fortiss.tooling.kernel.model.IIdLabeled;
-import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.model.INamedElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage
- * @generated
- */
-public class PredefinedAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static PredefinedPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredefinedAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = PredefinedPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PredefinedSwitch<Adapter> modelSwitch =
-		new PredefinedSwitch<Adapter>() {
-			@Override
-			public Adapter caseFailureMinObjective(FailureMinObjective object) {
-				return createFailureMinObjectiveAdapter();
-			}
-			@Override
-			public Adapter caseReliabilityAnalysis(ReliabilityAnalysis object) {
-				return createReliabilityAnalysisAdapter();
-			}
-			@Override
-			public Adapter caseEnergyMinObjective(EnergyMinObjective object) {
-				return createEnergyMinObjectiveAdapter();
-			}
-			@Override
-			public <LHT extends IModelElement, RHT extends IModelElement> Adapter caseMultiLocationConstraint(MultiLocationConstraint<LHT, RHT> object) {
-				return createMultiLocationConstraintAdapter();
-			}
-			@Override
-			public Adapter caseComponentMultiAllocationConstraint(ComponentMultiAllocationConstraint object) {
-				return createComponentMultiAllocationConstraintAdapter();
-			}
-			@Override
-			public Adapter caseComponentMultiDislocationConstraint(ComponentMultiDislocationConstraint object) {
-				return createComponentMultiDislocationConstraintAdapter();
-			}
-			@Override
-			public Adapter caseSafetyIntegrityLevelConstraint(SafetyIntegrityLevelConstraint object) {
-				return createSafetyIntegrityLevelConstraintAdapter();
-			}
-			@Override
-			public <T> Adapter caseSafetyComparison(SafetyComparison<T> object) {
-				return createSafetyComparisonAdapter();
-			}
-			@Override
-			public Adapter caseIIdLabeled(IIdLabeled object) {
-				return createIIdLabeledAdapter();
-			}
-			@Override
-			public Adapter caseINamedElement(INamedElement object) {
-				return createINamedElementAdapter();
-			}
-			@Override
-			public Adapter caseINamedCommentedElement(INamedCommentedElement object) {
-				return createINamedCommentedElementAdapter();
-			}
-			@Override
-			public Adapter caseIProblemDimension(IProblemDimension object) {
-				return createIProblemDimensionAdapter();
-			}
-			@Override
-			public Adapter caseResourceDimension(ResourceDimension object) {
-				return createResourceDimensionAdapter();
-			}
-			@Override
-			public Adapter caseMOEAExplorationExpression(MOEAExplorationExpression object) {
-				return createMOEAExplorationExpressionAdapter();
-			}
-			@Override
-			public <T> Adapter caseExplorationTarget(ExplorationTarget<T> object) {
-				return createExplorationTargetAdapter();
-			}
-			@Override
-			public <T> Adapter caseExplorationObjective(ExplorationObjective<T> object) {
-				return createExplorationObjectiveAdapter();
-			}
-			@Override
-			public <T> Adapter caseMOExplorationObjective(MOExplorationObjective<T> object) {
-				return createMOExplorationObjectiveAdapter();
-			}
-			@Override
-			public Adapter caseExpression(Expression object) {
-				return createExpressionAdapter();
-			}
-			@Override
-			public <T> Adapter caseArithmeticExpression(ArithmeticExpression<T> object) {
-				return createArithmeticExpressionAdapter();
-			}
-			@Override
-			public <ME extends IModelElement> Adapter caseElementExpression(ElementExpression<ME> object) {
-				return createElementExpressionAdapter();
-			}
-			@Override
-			public Adapter caseEnergyDimension(EnergyDimension object) {
-				return createEnergyDimensionAdapter();
-			}
-			@Override
-			public Adapter caseLocationDimension(LocationDimension object) {
-				return createLocationDimensionAdapter();
-			}
-			@Override
-			public <LHT extends IModelElement, RHT extends IModelElement> Adapter caseLocationConstraint(LocationConstraint<LHT, RHT> object) {
-				return createLocationConstraintAdapter();
-			}
-			@Override
-			public <T> Adapter caseExplorationConstraint(ExplorationConstraint<T> object) {
-				return createExplorationConstraintAdapter();
-			}
-			@Override
-			public Adapter caseSafetyDimension(SafetyDimension object) {
-				return createSafetyDimensionAdapter();
-			}
-			@Override
-			public <OP, RHT> Adapter caseOperator(Operator<OP, RHT> object) {
-				return createOperatorAdapter();
-			}
-			@Override
-			public <LHT, OP, RHT> Adapter caseDualOperator(DualOperator<LHT, OP, RHT> object) {
-				return createDualOperatorAdapter();
-			}
-			@Override
-			public Adapter caseBooleanExpression(BooleanExpression object) {
-				return createBooleanExpressionAdapter();
-			}
-			@Override
-			public <T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> Adapter caseComparisonOp(ComparisonOp<T, LHT, RHT> object) {
-				return createComparisonOpAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective <em>Failure Min Objective</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective
-	 * @generated
-	 */
-	public Adapter createFailureMinObjectiveAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.predefined.ReliabilityAnalysis <em>Reliability Analysis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.ReliabilityAnalysis
-	 * @generated
-	 */
-	public Adapter createReliabilityAnalysisAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.predefined.EnergyMinObjective <em>Energy Min Objective</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.EnergyMinObjective
-	 * @generated
-	 */
-	public Adapter createEnergyMinObjectiveAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.predefined.MultiLocationConstraint <em>Multi Location Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.MultiLocationConstraint
-	 * @generated
-	 */
-	public Adapter createMultiLocationConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiAllocationConstraint <em>Component Multi Allocation Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiAllocationConstraint
-	 * @generated
-	 */
-	public Adapter createComponentMultiAllocationConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiDislocationConstraint <em>Component Multi Dislocation Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.ComponentMultiDislocationConstraint
-	 * @generated
-	 */
-	public Adapter createComponentMultiDislocationConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.predefined.SafetyIntegrityLevelConstraint <em>Safety Integrity Level Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.SafetyIntegrityLevelConstraint
-	 * @generated
-	 */
-	public Adapter createSafetyIntegrityLevelConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.predefined.SafetyComparison <em>Safety Comparison</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.predefined.SafetyComparison
-	 * @generated
-	 */
-	public Adapter createSafetyComparisonAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.IIdLabeled <em>IId Labeled</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.IIdLabeled
-	 * @generated
-	 */
-	public Adapter createIIdLabeledAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.INamedElement <em>INamed Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.INamedElement
-	 * @generated
-	 */
-	public Adapter createINamedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.INamedCommentedElement <em>INamed Commented Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.INamedCommentedElement
-	 * @generated
-	 */
-	public Adapter createINamedCommentedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.IProblemDimension <em>IProblem Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.IProblemDimension
-	 * @generated
-	 */
-	public Adapter createIProblemDimensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.ResourceDimension <em>Resource Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.ResourceDimension
-	 * @generated
-	 */
-	public Adapter createResourceDimensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression <em>MOEA Exploration Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression
-	 * @generated
-	 */
-	public Adapter createMOEAExplorationExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.ExplorationTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.ExplorationTarget
-	 * @generated
-	 */
-	public Adapter createExplorationTargetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.ExplorationObjective <em>Objective</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.ExplorationObjective
-	 * @generated
-	 */
-	public Adapter createExplorationObjectiveAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.MOExplorationObjective <em>MO Exploration Objective</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.MOExplorationObjective
-	 * @generated
-	 */
-	public Adapter createMOExplorationObjectiveAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.Expression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.Expression
-	 * @generated
-	 */
-	public Adapter createExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression <em>Arithmetic Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression
-	 * @generated
-	 */
-	public Adapter createArithmeticExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression <em>Element Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression
-	 * @generated
-	 */
-	public Adapter createElementExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.EnergyDimension <em>Energy Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.EnergyDimension
-	 * @generated
-	 */
-	public Adapter createEnergyDimensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.location.LocationDimension <em>Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.location.LocationDimension
-	 * @generated
-	 */
-	public Adapter createLocationDimensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.location.LocationConstraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.location.LocationConstraint
-	 * @generated
-	 */
-	public Adapter createLocationConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.ExplorationConstraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.ExplorationConstraint
-	 * @generated
-	 */
-	public Adapter createExplorationConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.SafetyDimension <em>Safety Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.SafetyDimension
-	 * @generated
-	 */
-	public Adapter createSafetyDimensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.Operator <em>Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.Operator
-	 * @generated
-	 */
-	public Adapter createOperatorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.DualOperator <em>Dual Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.DualOperator
-	 * @generated
-	 */
-	public Adapter createDualOperatorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression <em>Boolean Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression
-	 * @generated
-	 */
-	public Adapter createBooleanExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp <em>Comparison Op</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp
-	 * @generated
-	 */
-	public Adapter createComparisonOpAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //PredefinedAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/util/PredefinedSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/util/PredefinedSwitch.java
deleted file mode 100644
index df546bae..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/predefined/util/PredefinedSwitch.java
+++ /dev/null
@@ -1,663 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.predefined.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.dsl.model.MOEAExplorationExpression;
-
-import org.fortiss.af3.exploration.dsl.model.expressions.ArithmeticExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.BooleanExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.ElementExpression;
-import org.fortiss.af3.exploration.dsl.model.expressions.Expression;
-
-import org.fortiss.af3.exploration.dsl.model.operators.ComparisonOp;
-import org.fortiss.af3.exploration.dsl.model.operators.DualOperator;
-import org.fortiss.af3.exploration.dsl.model.operators.Operator;
-
-import org.fortiss.af3.exploration.model.EnergyDimension;
-import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.ExplorationObjective;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-import org.fortiss.af3.exploration.model.IProblemDimension;
-import org.fortiss.af3.exploration.model.MOExplorationObjective;
-import org.fortiss.af3.exploration.model.ResourceDimension;
-import org.fortiss.af3.exploration.model.SafetyDimension;
-
-import org.fortiss.af3.exploration.model.location.LocationConstraint;
-import org.fortiss.af3.exploration.model.location.LocationDimension;
-
-import org.fortiss.af3.exploration.moea.model.predefined.*;
-
-import org.fortiss.tooling.base.model.element.IModelElement;
-
-import org.fortiss.tooling.kernel.model.IIdLabeled;
-import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.model.INamedElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage
- * @generated
- */
-public class PredefinedSwitch<T1> extends Switch<T1> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static PredefinedPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredefinedSwitch() {
-		if (modelPackage == null) {
-			modelPackage = PredefinedPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T1 doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case PredefinedPackage.FAILURE_MIN_OBJECTIVE: {
-				FailureMinObjective failureMinObjective = (FailureMinObjective)theEObject;
-				T1 result = caseFailureMinObjective(failureMinObjective);
-				if (result == null) result = caseResourceDimension(failureMinObjective);
-				if (result == null) result = caseMOEAExplorationExpression(failureMinObjective);
-				if (result == null) result = caseMOExplorationObjective(failureMinObjective);
-				if (result == null) result = caseIProblemDimension(failureMinObjective);
-				if (result == null) result = caseExplorationObjective(failureMinObjective);
-				if (result == null) result = caseExplorationTarget(failureMinObjective);
-				if (result == null) result = caseINamedCommentedElement(failureMinObjective);
-				if (result == null) result = caseINamedElement(failureMinObjective);
-				if (result == null) result = caseIIdLabeled(failureMinObjective);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PredefinedPackage.RELIABILITY_ANALYSIS: {
-				ReliabilityAnalysis reliabilityAnalysis = (ReliabilityAnalysis)theEObject;
-				T1 result = caseReliabilityAnalysis(reliabilityAnalysis);
-				if (result == null) result = caseArithmeticExpression(reliabilityAnalysis);
-				if (result == null) result = caseElementExpression(reliabilityAnalysis);
-				if (result == null) result = caseMOEAExplorationExpression(reliabilityAnalysis);
-				if (result == null) result = caseExpression(reliabilityAnalysis);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PredefinedPackage.ENERGY_MIN_OBJECTIVE: {
-				EnergyMinObjective energyMinObjective = (EnergyMinObjective)theEObject;
-				T1 result = caseEnergyMinObjective(energyMinObjective);
-				if (result == null) result = caseMOExplorationObjective(energyMinObjective);
-				if (result == null) result = caseEnergyDimension(energyMinObjective);
-				if (result == null) result = caseMOEAExplorationExpression(energyMinObjective);
-				if (result == null) result = caseExplorationObjective(energyMinObjective);
-				if (result == null) result = caseIProblemDimension(energyMinObjective);
-				if (result == null) result = caseExplorationTarget(energyMinObjective);
-				if (result == null) result = caseINamedCommentedElement(energyMinObjective);
-				if (result == null) result = caseINamedElement(energyMinObjective);
-				if (result == null) result = caseIIdLabeled(energyMinObjective);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PredefinedPackage.MULTI_LOCATION_CONSTRAINT: {
-				MultiLocationConstraint<?, ?> multiLocationConstraint = (MultiLocationConstraint<?, ?>)theEObject;
-				T1 result = caseMultiLocationConstraint(multiLocationConstraint);
-				if (result == null) result = caseLocationConstraint(multiLocationConstraint);
-				if (result == null) result = caseLocationDimension(multiLocationConstraint);
-				if (result == null) result = caseMOEAExplorationExpression(multiLocationConstraint);
-				if (result == null) result = caseIProblemDimension(multiLocationConstraint);
-				if (result == null) result = caseINamedCommentedElement(multiLocationConstraint);
-				if (result == null) result = caseINamedElement(multiLocationConstraint);
-				if (result == null) result = caseIIdLabeled(multiLocationConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PredefinedPackage.COMPONENT_MULTI_ALLOCATION_CONSTRAINT: {
-				ComponentMultiAllocationConstraint componentMultiAllocationConstraint = (ComponentMultiAllocationConstraint)theEObject;
-				T1 result = caseComponentMultiAllocationConstraint(componentMultiAllocationConstraint);
-				if (result == null) result = caseMultiLocationConstraint(componentMultiAllocationConstraint);
-				if (result == null) result = caseExplorationConstraint(componentMultiAllocationConstraint);
-				if (result == null) result = caseLocationConstraint(componentMultiAllocationConstraint);
-				if (result == null) result = caseExplorationTarget(componentMultiAllocationConstraint);
-				if (result == null) result = caseLocationDimension(componentMultiAllocationConstraint);
-				if (result == null) result = caseMOEAExplorationExpression(componentMultiAllocationConstraint);
-				if (result == null) result = caseIProblemDimension(componentMultiAllocationConstraint);
-				if (result == null) result = caseINamedCommentedElement(componentMultiAllocationConstraint);
-				if (result == null) result = caseINamedElement(componentMultiAllocationConstraint);
-				if (result == null) result = caseIIdLabeled(componentMultiAllocationConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PredefinedPackage.COMPONENT_MULTI_DISLOCATION_CONSTRAINT: {
-				ComponentMultiDislocationConstraint componentMultiDislocationConstraint = (ComponentMultiDislocationConstraint)theEObject;
-				T1 result = caseComponentMultiDislocationConstraint(componentMultiDislocationConstraint);
-				if (result == null) result = caseMultiLocationConstraint(componentMultiDislocationConstraint);
-				if (result == null) result = caseExplorationConstraint(componentMultiDislocationConstraint);
-				if (result == null) result = caseLocationConstraint(componentMultiDislocationConstraint);
-				if (result == null) result = caseExplorationTarget(componentMultiDislocationConstraint);
-				if (result == null) result = caseLocationDimension(componentMultiDislocationConstraint);
-				if (result == null) result = caseMOEAExplorationExpression(componentMultiDislocationConstraint);
-				if (result == null) result = caseIProblemDimension(componentMultiDislocationConstraint);
-				if (result == null) result = caseINamedCommentedElement(componentMultiDislocationConstraint);
-				if (result == null) result = caseINamedElement(componentMultiDislocationConstraint);
-				if (result == null) result = caseIIdLabeled(componentMultiDislocationConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PredefinedPackage.SAFETY_INTEGRITY_LEVEL_CONSTRAINT: {
-				SafetyIntegrityLevelConstraint safetyIntegrityLevelConstraint = (SafetyIntegrityLevelConstraint)theEObject;
-				T1 result = caseSafetyIntegrityLevelConstraint(safetyIntegrityLevelConstraint);
-				if (result == null) result = caseExplorationConstraint(safetyIntegrityLevelConstraint);
-				if (result == null) result = caseSafetyDimension(safetyIntegrityLevelConstraint);
-				if (result == null) result = caseMOEAExplorationExpression(safetyIntegrityLevelConstraint);
-				if (result == null) result = caseExplorationTarget(safetyIntegrityLevelConstraint);
-				if (result == null) result = caseIProblemDimension(safetyIntegrityLevelConstraint);
-				if (result == null) result = caseINamedCommentedElement(safetyIntegrityLevelConstraint);
-				if (result == null) result = caseINamedElement(safetyIntegrityLevelConstraint);
-				if (result == null) result = caseIIdLabeled(safetyIntegrityLevelConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PredefinedPackage.SAFETY_COMPARISON: {
-				SafetyComparison<?> safetyComparison = (SafetyComparison<?>)theEObject;
-				T1 result = caseSafetyComparison(safetyComparison);
-				if (result == null) result = caseComparisonOp(safetyComparison);
-				if (result == null) result = caseDualOperator(safetyComparison);
-				if (result == null) result = caseBooleanExpression(safetyComparison);
-				if (result == null) result = caseOperator(safetyComparison);
-				if (result == null) result = caseExpression(safetyComparison);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Failure Min Objective</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Failure Min Objective</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseFailureMinObjective(FailureMinObjective object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Reliability Analysis</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Reliability Analysis</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseReliabilityAnalysis(ReliabilityAnalysis object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Energy Min Objective</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Energy Min Objective</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseEnergyMinObjective(EnergyMinObjective object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Multi Location Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Multi Location Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <LHT extends IModelElement, RHT extends IModelElement> T1 caseMultiLocationConstraint(MultiLocationConstraint<LHT, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Component Multi Allocation Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Component Multi Allocation Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseComponentMultiAllocationConstraint(ComponentMultiAllocationConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Component Multi Dislocation Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Component Multi Dislocation Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseComponentMultiDislocationConstraint(ComponentMultiDislocationConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Safety Integrity Level Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Safety Integrity Level Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseSafetyIntegrityLevelConstraint(SafetyIntegrityLevelConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Safety Comparison</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Safety Comparison</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseSafetyComparison(SafetyComparison<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IId Labeled</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IId Labeled</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseIIdLabeled(IIdLabeled object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseINamedElement(INamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>INamed Commented Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>INamed Commented Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseINamedCommentedElement(INamedCommentedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IProblem Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IProblem Dimension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseIProblemDimension(IProblemDimension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Resource Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Resource Dimension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseResourceDimension(ResourceDimension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>MOEA Exploration Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>MOEA Exploration Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseMOEAExplorationExpression(MOEAExplorationExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Target</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseExplorationTarget(ExplorationTarget<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Objective</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Objective</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseExplorationObjective(ExplorationObjective<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>MO Exploration Objective</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>MO Exploration Objective</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseMOExplorationObjective(MOExplorationObjective<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseExpression(Expression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Arithmetic Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseArithmeticExpression(ArithmeticExpression<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Element Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Element Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <ME extends IModelElement> T1 caseElementExpression(ElementExpression<ME> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Energy Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Energy Dimension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseEnergyDimension(EnergyDimension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Dimension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseLocationDimension(LocationDimension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <LHT extends IModelElement, RHT extends IModelElement> T1 caseLocationConstraint(LocationConstraint<LHT, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseExplorationConstraint(ExplorationConstraint<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Safety Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Safety Dimension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseSafetyDimension(SafetyDimension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Operator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Operator</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <OP, RHT> T1 caseOperator(Operator<OP, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dual Operator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Dual Operator</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <LHT, OP, RHT> T1 caseDualOperator(DualOperator<LHT, OP, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Boolean Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Boolean Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseBooleanExpression(BooleanExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Comparison Op</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Comparison Op</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T, LHT extends ArithmeticExpression<T>, RHT extends ArithmeticExpression<T>> T1 caseComparisonOp(ComparisonOp<T, LHT, RHT> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T1 defaultCase(EObject object) {
-		return null;
-	}
-
-} //PredefinedSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/ExplorationResult.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/ExplorationResult.java
deleted file mode 100644
index 156ec302..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/ExplorationResult.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Exploration Result</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Contains the evaluation result of a single {@link ExplorationTarget}.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult#getResult <em>Result</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage#getExplorationResult()
- * @model
- * @generated
- */
-public interface ExplorationResult<T> extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Result</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Contains the evaluation result of a single {@link ExplorationTarget}.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Result</em>' attribute.
-	 * @see #setResult(Object)
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage#getExplorationResult_Result()
-	 * @model required="true"
-	 * @generated
-	 */
-	T getResult();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult#getResult <em>Result</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Result</em>' attribute.
-	 * @see #getResult()
-	 * @generated
-	 */
-	void setResult(T value);
-
-} // ExplorationResult
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/ExplorationSolutionSet.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/ExplorationSolutionSet.java
deleted file mode 100644
index 35b35e72..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/ExplorationSolutionSet.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.fortiss.af3.exploration.model.ExplorationSolution;
-import org.fortiss.af3.exploration.model.ExplorationSpecification;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Exploration Solution Set</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Contains the set of {@link ExplorationSolution}s that are solutions to the problem defined in the {@link ExplorationSpecification}.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet#getInputModelAdapter <em>Input Model Adapter</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet#getTargetSpecification <em>Target Specification</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet#getSolutions <em>Solutions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage#getExplorationSolutionSet()
- * @model
- * @generated
- */
-public interface ExplorationSolutionSet extends ExplorationSolution {
-	/**
-	 * Returns the value of the '<em><b>Input Model Adapter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * References the corresponding input models.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Input Model Adapter</em>' attribute.
-	 * @see #setInputModelAdapter(Object)
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage#getExplorationSolutionSet_InputModelAdapter()
-	 * @model required="true"
-	 * @generated
-	 */
-	Object getInputModelAdapter();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet#getInputModelAdapter <em>Input Model Adapter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Input Model Adapter</em>' attribute.
-	 * @see #getInputModelAdapter()
-	 * @generated
-	 */
-	void setInputModelAdapter(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Target Specification</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * References the {@link ExplorationSpecification} for which {@this ExplorationSolutionSet} provides solutions.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Target Specification</em>' reference.
-	 * @see #setTargetSpecification(ExplorationSpecification)
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage#getExplorationSolutionSet_TargetSpecification()
-	 * @model required="true"
-	 * @generated
-	 */
-	ExplorationSpecification getTargetSpecification();
-
-	/**
-	 * Sets the value of the '{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet#getTargetSpecification <em>Target Specification</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Specification</em>' reference.
-	 * @see #getTargetSpecification()
-	 * @generated
-	 */
-	void setTargetSpecification(ExplorationSpecification value);
-
-	/**
-	 * Returns the value of the '<em><b>Solutions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Contains the single solutions that are maps relating the {@link ExplorationTarget}s with their (evaluation) {@link ExplorationResult}s.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Solutions</em>' containment reference list.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage#getExplorationSolutionSet_Solutions()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SingleExplorationSolutionMap> getSolutions();
-
-} // ExplorationSolutionSet
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SingleExplorationSolutionMap.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SingleExplorationSolutionMap.java
deleted file mode 100644
index 3f7f0c97..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SingleExplorationSolutionMap.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Single Exploration Solution Map</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Represents a single solution as a map relating the {@link ExplorationTarget}s with their (evaluation) {@link ExplorationResult}s.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap#getSolutionMap <em>Solution Map</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap#getSolutionModelMap <em>Solution Model Map</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage#getSingleExplorationSolutionMap()
- * @model
- * @generated
- */
-public interface SingleExplorationSolutionMap extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Solution Map</b></em>' map.
-	 * The key is of type {@link org.fortiss.af3.exploration.model.ExplorationTarget<?>},
-	 * and the value is of type {@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult<?>},
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * EMF-implementation of the backend map.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Solution Map</em>' map.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage#getSingleExplorationSolutionMap_SolutionMap()
-	 * @model mapType="org.fortiss.af3.exploration.moea.model.solutions.ExplorationTargetToExplorationResultMap<org.fortiss.af3.exploration.model.ExplorationTarget<?>, org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult<?>>"
-	 * @generated
-	 */
-	EMap<ExplorationTarget<?>, ExplorationResult<?>> getSolutionMap();
-
-	/**
-	 * Returns the value of the '<em><b>Solution Model Map</b></em>' map.
-	 * The key is of type {@link java.lang.Class<?>},
-	 * and the value is of type {@link java.lang.Object},
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Allows to optionally attach calculated solution models to a single solution. They are identified by their type.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Solution Model Map</em>' map.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage#getSingleExplorationSolutionMap_SolutionModelMap()
-	 * @model mapType="org.fortiss.af3.exploration.moea.model.solutions.EJavaClassToEJavaObjectMap<org.eclipse.emf.ecore.EJavaClass<?>, org.eclipse.emf.ecore.EJavaObject>"
-	 * @generated
-	 */
-	EMap<Class<?>, Object> getSolutionModelMap();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Mirrors the standard {@link java.util.Map#containsKey} method.
-	 * <!-- end-model-doc -->
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return solutionMap.containsKey(key);'"
-	 * @generated
-	 */
-	boolean containsKey(ExplorationTarget<?> key);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Mirrors the standard {@link java.util.Map#containsValue} method.
-	 * <!-- end-model-doc -->
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return solutionMap.containsValue(value);'"
-	 * @generated
-	 */
-	boolean containsValue(ExplorationResult<?> value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Mirrors the standard {@link java.util.Map#get} method, except that the Types of the key ({@link ExplorationTarget}) and the returned value ({@link ExplorationValue}) will match.
-	 * <!-- end-model-doc -->
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return (ExplorationResult<T>)solutionMap.get(key);'"
-	 * @generated
-	 */
-	<T> ExplorationResult<T> get(ExplorationTarget<T> key);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Mirrors the standard {@link java.util.Map#keySet} method.
-	 * <!-- end-model-doc -->
-	 * @model required="true" many="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return new <%org.eclipse.emf.common.util.BasicEList%><ExplorationTarget<?>>(solutionMap.keySet());'"
-	 * @generated
-	 */
-	EList<ExplorationTarget<?>> keySet();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Mirrors the standard {@link java.util.Map#get} method, except that the Types of the key ({@link ExplorationTarget}) and the returned value ({@link ExplorationValue}) must match.
-	 * <!-- end-model-doc -->
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return (ExplorationResult<T>)solutionMap.put(key, value);'"
-	 * @generated
-	 */
-	<T> ExplorationResult<T> put(ExplorationTarget<T> key, ExplorationResult<T> value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Mirrors the standard {@link java.util.Map#removeKey} method, except that the Types of the key ({@link ExplorationTarget}) and the returned value ({@link ExplorationValue}) will match.
-	 * <!-- end-model-doc -->
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return (ExplorationResult<T>)solutionMap.get(key);'"
-	 * @generated
-	 */
-	<T> ExplorationResult<T> removeKey(ExplorationTarget<T> key);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Mirrors the standard {@link java.util.Map#values} method, except that its returned value is an {@link EList} instead of a {@link Collection} due to EMF limitations.
-	 * <!-- end-model-doc -->
-	 * @model required="true" many="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return new <%org.eclipse.emf.common.util.BasicEList%><ExplorationResult<?>>(solutionMap.values());'"
-	 * @generated
-	 */
-	EList<ExplorationResult<?>> values();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Allows to retrieve an attached solution model of this representation of a single solution.
-	 * <!-- end-model-doc -->
-	 * @model required="true" modelTypeRequired="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return SingleExplorationSolutionMapStaticImpl.getModel(this, modelType);'"
-	 * @generated
-	 */
-	<T> T getSolutionModel(Class<T> modelType);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Allows to attach a solution model to this representation of a single solution.
-	 * <!-- end-model-doc -->
-	 * @model modelTypeRequired="true" solutionModelRequired="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='SingleExplorationSolutionMapStaticImpl.putSolutionModel(this, modelType, solutionModel);'"
-	 * @generated
-	 */
-	<T> void putSolutionModel(Class<T> modelType, T solutionModel);
-
-} // SingleExplorationSolutionMap
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SolutionsFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SolutionsFactory.java
deleted file mode 100644
index 21bc40ac..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SolutionsFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage
- * @generated
- */
-public interface SolutionsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	SolutionsFactory eINSTANCE = org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Exploration Result</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Exploration Result</em>'.
-	 * @generated
-	 */
-	<T> ExplorationResult<T> createExplorationResult();
-
-	/**
-	 * Returns a new object of class '<em>Exploration Solution Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Exploration Solution Set</em>'.
-	 * @generated
-	 */
-	ExplorationSolutionSet createExplorationSolutionSet();
-
-	/**
-	 * Returns a new object of class '<em>Single Exploration Solution Map</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Single Exploration Solution Map</em>'.
-	 * @generated
-	 */
-	SingleExplorationSolutionMap createSingleExplorationSolutionMap();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	SolutionsPackage getSolutionsPackage();
-
-} //SolutionsFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SolutionsPackage.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SolutionsPackage.java
deleted file mode 100644
index 2448be2a..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/SolutionsPackage.java
+++ /dev/null
@@ -1,564 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsFactory
- * @model kind="package"
- * @generated
- */
-public interface SolutionsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "solutions";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.fortiss.org/af3/exploration/moea/solutions";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org-fortiss-af3-exploration-moea-solutions";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	SolutionsPackage eINSTANCE = org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationResultImpl <em>Exploration Result</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationResultImpl
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl#getExplorationResult()
-	 * @generated
-	 */
-	int EXPLORATION_RESULT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Result</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_RESULT__RESULT = 0;
-
-	/**
-	 * The number of structural features of the '<em>Exploration Result</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_RESULT_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationSolutionSetImpl <em>Exploration Solution Set</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationSolutionSetImpl
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl#getExplorationSolutionSet()
-	 * @generated
-	 */
-	int EXPLORATION_SOLUTION_SET = 1;
-
-	/**
-	 * The feature id for the '<em><b>Input Model Adapter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_SOLUTION_SET__INPUT_MODEL_ADAPTER = ExplorationPackage.EXPLORATION_SOLUTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Target Specification</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_SOLUTION_SET__TARGET_SPECIFICATION = ExplorationPackage.EXPLORATION_SOLUTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Solutions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_SOLUTION_SET__SOLUTIONS = ExplorationPackage.EXPLORATION_SOLUTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Exploration Solution Set</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_SOLUTION_SET_FEATURE_COUNT = ExplorationPackage.EXPLORATION_SOLUTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.solutions.impl.SingleExplorationSolutionMapImpl <em>Single Exploration Solution Map</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SingleExplorationSolutionMapImpl
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl#getSingleExplorationSolutionMap()
-	 * @generated
-	 */
-	int SINGLE_EXPLORATION_SOLUTION_MAP = 2;
-
-	/**
-	 * The feature id for the '<em><b>Solution Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MAP = 0;
-
-	/**
-	 * The feature id for the '<em><b>Solution Model Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MODEL_MAP = 1;
-
-	/**
-	 * The number of structural features of the '<em>Single Exploration Solution Map</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SINGLE_EXPLORATION_SOLUTION_MAP_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationTargetToExplorationResultMapImpl <em>Exploration Target To Exploration Result Map</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationTargetToExplorationResultMapImpl
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl#getExplorationTargetToExplorationResultMap()
-	 * @generated
-	 */
-	int EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP = 3;
-
-	/**
-	 * The feature id for the '<em><b>Key</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__KEY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Exploration Target To Exploration Result Map</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.fortiss.af3.exploration.moea.model.solutions.impl.EJavaClassToEJavaObjectMapImpl <em>EJava Class To EJava Object Map</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.EJavaClassToEJavaObjectMapImpl
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl#getEJavaClassToEJavaObjectMap()
-	 * @generated
-	 */
-	int EJAVA_CLASS_TO_EJAVA_OBJECT_MAP = 4;
-
-	/**
-	 * The feature id for the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__KEY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__VALUE = 1;
-
-	/**
-	 * The number of structural features of the '<em>EJava Class To EJava Object Map</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJAVA_CLASS_TO_EJAVA_OBJECT_MAP_FEATURE_COUNT = 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult <em>Exploration Result</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Exploration Result</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult
-	 * @generated
-	 */
-	EClass getExplorationResult();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult#getResult <em>Result</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Result</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult#getResult()
-	 * @see #getExplorationResult()
-	 * @generated
-	 */
-	EAttribute getExplorationResult_Result();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet <em>Exploration Solution Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Exploration Solution Set</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet
-	 * @generated
-	 */
-	EClass getExplorationSolutionSet();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet#getInputModelAdapter <em>Input Model Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Input Model Adapter</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet#getInputModelAdapter()
-	 * @see #getExplorationSolutionSet()
-	 * @generated
-	 */
-	EAttribute getExplorationSolutionSet_InputModelAdapter();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet#getTargetSpecification <em>Target Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Target Specification</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet#getTargetSpecification()
-	 * @see #getExplorationSolutionSet()
-	 * @generated
-	 */
-	EReference getExplorationSolutionSet_TargetSpecification();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet#getSolutions <em>Solutions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Solutions</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet#getSolutions()
-	 * @see #getExplorationSolutionSet()
-	 * @generated
-	 */
-	EReference getExplorationSolutionSet_Solutions();
-
-	/**
-	 * Returns the meta object for class '{@link org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap <em>Single Exploration Solution Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Single Exploration Solution Map</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap
-	 * @generated
-	 */
-	EClass getSingleExplorationSolutionMap();
-
-	/**
-	 * Returns the meta object for the map '{@link org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap#getSolutionMap <em>Solution Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>Solution Map</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap#getSolutionMap()
-	 * @see #getSingleExplorationSolutionMap()
-	 * @generated
-	 */
-	EReference getSingleExplorationSolutionMap_SolutionMap();
-
-	/**
-	 * Returns the meta object for the map '{@link org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap#getSolutionModelMap <em>Solution Model Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>Solution Model Map</em>'.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap#getSolutionModelMap()
-	 * @see #getSingleExplorationSolutionMap()
-	 * @generated
-	 */
-	EReference getSingleExplorationSolutionMap_SolutionModelMap();
-
-	/**
-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Exploration Target To Exploration Result Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Exploration Target To Exploration Result Map</em>'.
-	 * @see java.util.Map.Entry
-	 * @model keyType="org.fortiss.af3.exploration.model.ExplorationTarget<?>" keyRequired="true"
-	 *        valueType="org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult<?>" valueContainment="true" valueResolveProxies="true" valueRequired="true"
-	 * @generated
-	 */
-	EClass getExplorationTargetToExplorationResultMap();
-
-	/**
-	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Key</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getExplorationTargetToExplorationResultMap()
-	 * @generated
-	 */
-	EReference getExplorationTargetToExplorationResultMap_Key();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Value</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getExplorationTargetToExplorationResultMap()
-	 * @generated
-	 */
-	EReference getExplorationTargetToExplorationResultMap_Value();
-
-	/**
-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>EJava Class To EJava Object Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EJava Class To EJava Object Map</em>'.
-	 * @see java.util.Map.Entry
-	 * @model keyDataType="org.eclipse.emf.ecore.EJavaClass<?>" keyRequired="true"
-	 *        valueDataType="org.eclipse.emf.ecore.EJavaObject" valueRequired="true"
-	 * @generated
-	 */
-	EClass getEJavaClassToEJavaObjectMap();
-
-	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Key</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getEJavaClassToEJavaObjectMap()
-	 * @generated
-	 */
-	EAttribute getEJavaClassToEJavaObjectMap_Key();
-
-	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getEJavaClassToEJavaObjectMap()
-	 * @generated
-	 */
-	EAttribute getEJavaClassToEJavaObjectMap_Value();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	SolutionsFactory getSolutionsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationResultImpl <em>Exploration Result</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationResultImpl
-		 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl#getExplorationResult()
-		 * @generated
-		 */
-		EClass EXPLORATION_RESULT = eINSTANCE.getExplorationResult();
-
-		/**
-		 * The meta object literal for the '<em><b>Result</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EXPLORATION_RESULT__RESULT = eINSTANCE.getExplorationResult_Result();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationSolutionSetImpl <em>Exploration Solution Set</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationSolutionSetImpl
-		 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl#getExplorationSolutionSet()
-		 * @generated
-		 */
-		EClass EXPLORATION_SOLUTION_SET = eINSTANCE.getExplorationSolutionSet();
-
-		/**
-		 * The meta object literal for the '<em><b>Input Model Adapter</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EXPLORATION_SOLUTION_SET__INPUT_MODEL_ADAPTER = eINSTANCE.getExplorationSolutionSet_InputModelAdapter();
-
-		/**
-		 * The meta object literal for the '<em><b>Target Specification</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXPLORATION_SOLUTION_SET__TARGET_SPECIFICATION = eINSTANCE.getExplorationSolutionSet_TargetSpecification();
-
-		/**
-		 * The meta object literal for the '<em><b>Solutions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXPLORATION_SOLUTION_SET__SOLUTIONS = eINSTANCE.getExplorationSolutionSet_Solutions();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.solutions.impl.SingleExplorationSolutionMapImpl <em>Single Exploration Solution Map</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SingleExplorationSolutionMapImpl
-		 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl#getSingleExplorationSolutionMap()
-		 * @generated
-		 */
-		EClass SINGLE_EXPLORATION_SOLUTION_MAP = eINSTANCE.getSingleExplorationSolutionMap();
-
-		/**
-		 * The meta object literal for the '<em><b>Solution Map</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MAP = eINSTANCE.getSingleExplorationSolutionMap_SolutionMap();
-
-		/**
-		 * The meta object literal for the '<em><b>Solution Model Map</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MODEL_MAP = eINSTANCE.getSingleExplorationSolutionMap_SolutionModelMap();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationTargetToExplorationResultMapImpl <em>Exploration Target To Exploration Result Map</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationTargetToExplorationResultMapImpl
-		 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl#getExplorationTargetToExplorationResultMap()
-		 * @generated
-		 */
-		EClass EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP = eINSTANCE.getExplorationTargetToExplorationResultMap();
-
-		/**
-		 * The meta object literal for the '<em><b>Key</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__KEY = eINSTANCE.getExplorationTargetToExplorationResultMap_Key();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE = eINSTANCE.getExplorationTargetToExplorationResultMap_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.fortiss.af3.exploration.moea.model.solutions.impl.EJavaClassToEJavaObjectMapImpl <em>EJava Class To EJava Object Map</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.EJavaClassToEJavaObjectMapImpl
-		 * @see org.fortiss.af3.exploration.moea.model.solutions.impl.SolutionsPackageImpl#getEJavaClassToEJavaObjectMap()
-		 * @generated
-		 */
-		EClass EJAVA_CLASS_TO_EJAVA_OBJECT_MAP = eINSTANCE.getEJavaClassToEJavaObjectMap();
-
-		/**
-		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__KEY = eINSTANCE.getEJavaClassToEJavaObjectMap_Key();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__VALUE = eINSTANCE.getEJavaClassToEJavaObjectMap_Value();
-
-	}
-
-} //SolutionsPackage
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/EJavaClassToEJavaObjectMapImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/EJavaClassToEJavaObjectMapImpl.java
deleted file mode 100644
index 0be335b6..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/EJavaClassToEJavaObjectMapImpl.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.BasicEMap;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EJava Class To EJava Object Map</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.impl.EJavaClassToEJavaObjectMapImpl#getTypedKey <em>Key</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.impl.EJavaClassToEJavaObjectMapImpl#getTypedValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EJavaClassToEJavaObjectMapImpl extends EObjectImpl implements BasicEMap.Entry<Class<?>,Object> {
-	/**
-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected Class<?> key;
-
-	/**
-	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EJavaClassToEJavaObjectMapImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SolutionsPackage.Literals.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Class<?> getTypedKey() {
-		return key;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedKey(Class<?> newKey) {
-		Class<?> oldKey = key;
-		key = newKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__KEY, oldKey, key));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getTypedValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedValue(Object newValue) {
-		Object oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__KEY:
-				return getTypedKey();
-			case SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__VALUE:
-				return getTypedValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__KEY:
-				setTypedKey((Class<?>)newValue);
-				return;
-			case SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__VALUE:
-				setTypedValue(newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__KEY:
-				setTypedKey((Class<?>)null);
-				return;
-			case SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__VALUE:
-				setTypedValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__KEY:
-				return key != null;
-			case SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (key: ");
-		result.append(key);
-		result.append(", value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int hash = -1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHash() {
-		if (hash == -1) {
-			Object theKey = getKey();
-			hash = (theKey == null ? 0 : theKey.hashCode());
-		}
-		return hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHash(int hash) {
-		this.hash = hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Class<?> getKey() {
-		return getTypedKey();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKey(Class<?> key) {
-		setTypedKey(key);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getValue() {
-		return getTypedValue();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object setValue(Object value) {
-		Object oldValue = getValue();
-		setTypedValue(value);
-		return oldValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public EMap<Class<?>, Object> getEMap() {
-		EObject container = eContainer();
-		return container == null ? null : (EMap<Class<?>, Object>)container.eGet(eContainmentFeature());
-	}
-
-} //EJavaClassToEJavaObjectMapImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationResultImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationResultImpl.java
deleted file mode 100644
index 0bc27dcc..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationResultImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult;
-import org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Exploration Result</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationResultImpl#getResult <em>Result</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExplorationResultImpl<T> extends EObjectImpl implements ExplorationResult<T> {
-	/**
-	 * The cached value of the '{@link #getResult() <em>Result</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResult()
-	 * @generated
-	 * @ordered
-	 */
-	protected T result;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExplorationResultImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SolutionsPackage.Literals.EXPLORATION_RESULT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public T getResult() {
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResult(T newResult) {
-		T oldResult = result;
-		result = newResult;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SolutionsPackage.EXPLORATION_RESULT__RESULT, oldResult, result));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_RESULT__RESULT:
-				return getResult();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_RESULT__RESULT:
-				setResult((T)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_RESULT__RESULT:
-				setResult((T)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_RESULT__RESULT:
-				return result != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (result: ");
-		result.append(result);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ExplorationResultImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationSolutionSetImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationSolutionSetImpl.java
deleted file mode 100644
index f0209899..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationSolutionSetImpl.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.fortiss.af3.exploration.model.ExplorationSpecification;
-
-import org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet;
-import org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap;
-import org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Exploration Solution Set</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationSolutionSetImpl#getInputModelAdapter <em>Input Model Adapter</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationSolutionSetImpl#getTargetSpecification <em>Target Specification</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationSolutionSetImpl#getSolutions <em>Solutions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExplorationSolutionSetImpl extends EObjectImpl implements ExplorationSolutionSet {
-	/**
-	 * The default value of the '{@link #getInputModelAdapter() <em>Input Model Adapter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInputModelAdapter()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object INPUT_MODEL_ADAPTER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInputModelAdapter() <em>Input Model Adapter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInputModelAdapter()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object inputModelAdapter = INPUT_MODEL_ADAPTER_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTargetSpecification() <em>Target Specification</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetSpecification()
-	 * @generated
-	 * @ordered
-	 */
-	protected ExplorationSpecification targetSpecification;
-
-	/**
-	 * The cached value of the '{@link #getSolutions() <em>Solutions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSolutions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SingleExplorationSolutionMap> solutions;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExplorationSolutionSetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SolutionsPackage.Literals.EXPLORATION_SOLUTION_SET;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getInputModelAdapter() {
-		return inputModelAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInputModelAdapter(Object newInputModelAdapter) {
-		Object oldInputModelAdapter = inputModelAdapter;
-		inputModelAdapter = newInputModelAdapter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SolutionsPackage.EXPLORATION_SOLUTION_SET__INPUT_MODEL_ADAPTER, oldInputModelAdapter, inputModelAdapter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationSpecification getTargetSpecification() {
-		if (targetSpecification != null && targetSpecification.eIsProxy()) {
-			InternalEObject oldTargetSpecification = (InternalEObject)targetSpecification;
-			targetSpecification = (ExplorationSpecification)eResolveProxy(oldTargetSpecification);
-			if (targetSpecification != oldTargetSpecification) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolutionsPackage.EXPLORATION_SOLUTION_SET__TARGET_SPECIFICATION, oldTargetSpecification, targetSpecification));
-			}
-		}
-		return targetSpecification;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationSpecification basicGetTargetSpecification() {
-		return targetSpecification;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTargetSpecification(ExplorationSpecification newTargetSpecification) {
-		ExplorationSpecification oldTargetSpecification = targetSpecification;
-		targetSpecification = newTargetSpecification;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SolutionsPackage.EXPLORATION_SOLUTION_SET__TARGET_SPECIFICATION, oldTargetSpecification, targetSpecification));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<SingleExplorationSolutionMap> getSolutions() {
-		if (solutions == null) {
-			solutions = new EObjectContainmentEList.Resolving<SingleExplorationSolutionMap>(SingleExplorationSolutionMap.class, this, SolutionsPackage.EXPLORATION_SOLUTION_SET__SOLUTIONS);
-		}
-		return solutions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__SOLUTIONS:
-				return ((InternalEList<?>)getSolutions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__INPUT_MODEL_ADAPTER:
-				return getInputModelAdapter();
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__TARGET_SPECIFICATION:
-				if (resolve) return getTargetSpecification();
-				return basicGetTargetSpecification();
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__SOLUTIONS:
-				return getSolutions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__INPUT_MODEL_ADAPTER:
-				setInputModelAdapter(newValue);
-				return;
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__TARGET_SPECIFICATION:
-				setTargetSpecification((ExplorationSpecification)newValue);
-				return;
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__SOLUTIONS:
-				getSolutions().clear();
-				getSolutions().addAll((Collection<? extends SingleExplorationSolutionMap>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__INPUT_MODEL_ADAPTER:
-				setInputModelAdapter(INPUT_MODEL_ADAPTER_EDEFAULT);
-				return;
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__TARGET_SPECIFICATION:
-				setTargetSpecification((ExplorationSpecification)null);
-				return;
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__SOLUTIONS:
-				getSolutions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__INPUT_MODEL_ADAPTER:
-				return INPUT_MODEL_ADAPTER_EDEFAULT == null ? inputModelAdapter != null : !INPUT_MODEL_ADAPTER_EDEFAULT.equals(inputModelAdapter);
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__TARGET_SPECIFICATION:
-				return targetSpecification != null;
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET__SOLUTIONS:
-				return solutions != null && !solutions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (inputModelAdapter: ");
-		result.append(inputModelAdapter);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ExplorationSolutionSetImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationTargetToExplorationResultMapImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationTargetToExplorationResultMapImpl.java
deleted file mode 100644
index f1a7bd59..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/ExplorationTargetToExplorationResultMapImpl.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.BasicEMap;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-import org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult;
-import org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Exploration Target To Exploration Result Map</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationTargetToExplorationResultMapImpl#getTypedKey <em>Key</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.impl.ExplorationTargetToExplorationResultMapImpl#getTypedValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExplorationTargetToExplorationResultMapImpl extends EObjectImpl implements BasicEMap.Entry<ExplorationTarget<?>,ExplorationResult<?>> {
-	/**
-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected ExplorationTarget<?> key;
-
-	/**
-	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected ExplorationResult<?> value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExplorationTargetToExplorationResultMapImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SolutionsPackage.Literals.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationTarget<?> getTypedKey() {
-		if (key != null && key.eIsProxy()) {
-			InternalEObject oldKey = (InternalEObject)key;
-			key = (ExplorationTarget<?>)eResolveProxy(oldKey);
-			if (key != oldKey) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__KEY, oldKey, key));
-			}
-		}
-		return key;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationTarget<?> basicGetTypedKey() {
-		return key;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedKey(ExplorationTarget<?> newKey) {
-		ExplorationTarget<?> oldKey = key;
-		key = newKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__KEY, oldKey, key));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationResult<?> getTypedValue() {
-		if (value != null && value.eIsProxy()) {
-			InternalEObject oldValue = (InternalEObject)value;
-			value = (ExplorationResult<?>)eResolveProxy(oldValue);
-			if (value != oldValue) {
-				InternalEObject newValue = (InternalEObject)value;
-				NotificationChain msgs = oldValue.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE, null, null);
-				if (newValue.eInternalContainer() == null) {
-					msgs = newValue.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE, oldValue, value));
-			}
-		}
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationResult<?> basicGetTypedValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTypedValue(ExplorationResult<?> newValue, NotificationChain msgs) {
-		ExplorationResult<?> oldValue = value;
-		value = newValue;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE, oldValue, newValue);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedValue(ExplorationResult<?> newValue) {
-		if (newValue != value) {
-			NotificationChain msgs = null;
-			if (value != null)
-				msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE, null, msgs);
-			if (newValue != null)
-				msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE, null, msgs);
-			msgs = basicSetTypedValue(newValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE, newValue, newValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE:
-				return basicSetTypedValue(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__KEY:
-				if (resolve) return getTypedKey();
-				return basicGetTypedKey();
-			case SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE:
-				if (resolve) return getTypedValue();
-				return basicGetTypedValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__KEY:
-				setTypedKey((ExplorationTarget<?>)newValue);
-				return;
-			case SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE:
-				setTypedValue((ExplorationResult<?>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__KEY:
-				setTypedKey((ExplorationTarget<?>)null);
-				return;
-			case SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE:
-				setTypedValue((ExplorationResult<?>)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__KEY:
-				return key != null;
-			case SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE:
-				return value != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int hash = -1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHash() {
-		if (hash == -1) {
-			Object theKey = getKey();
-			hash = (theKey == null ? 0 : theKey.hashCode());
-		}
-		return hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHash(int hash) {
-		this.hash = hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationTarget<?> getKey() {
-		return getTypedKey();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKey(ExplorationTarget<?> key) {
-		setTypedKey(key);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationResult<?> getValue() {
-		return getTypedValue();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationResult<?> setValue(ExplorationResult<?> value) {
-		ExplorationResult<?> oldValue = getValue();
-		setTypedValue(value);
-		return oldValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public EMap<ExplorationTarget<?>, ExplorationResult<?>> getEMap() {
-		EObject container = eContainer();
-		return container == null ? null : (EMap<ExplorationTarget<?>, ExplorationResult<?>>)container.eGet(eContainmentFeature());
-	}
-
-} //ExplorationTargetToExplorationResultMapImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SingleExplorationSolutionMapImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SingleExplorationSolutionMapImpl.java
deleted file mode 100644
index 4fb54695..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SingleExplorationSolutionMapImpl.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions.impl;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-import org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult;
-import org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap;
-import org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Single Exploration Solution Map</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.impl.SingleExplorationSolutionMapImpl#getSolutionMap <em>Solution Map</em>}</li>
- *   <li>{@link org.fortiss.af3.exploration.moea.model.solutions.impl.SingleExplorationSolutionMapImpl#getSolutionModelMap <em>Solution Model Map</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SingleExplorationSolutionMapImpl extends EObjectImpl implements SingleExplorationSolutionMap {
-	/**
-	 * The cached value of the '{@link #getSolutionMap() <em>Solution Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSolutionMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap<ExplorationTarget<?>, ExplorationResult<?>> solutionMap;
-
-	/**
-	 * The cached value of the '{@link #getSolutionModelMap() <em>Solution Model Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSolutionModelMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap<Class<?>, Object> solutionModelMap;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SingleExplorationSolutionMapImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SolutionsPackage.Literals.SINGLE_EXPLORATION_SOLUTION_MAP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap<ExplorationTarget<?>, ExplorationResult<?>> getSolutionMap() {
-		if (solutionMap == null) {
-			solutionMap = new EcoreEMap<ExplorationTarget<?>,ExplorationResult<?>>(SolutionsPackage.Literals.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP, ExplorationTargetToExplorationResultMapImpl.class, this, SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MAP);
-		}
-		return solutionMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap<Class<?>, Object> getSolutionModelMap() {
-		if (solutionModelMap == null) {
-			solutionModelMap = new EcoreEMap<Class<?>,Object>(SolutionsPackage.Literals.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP, EJavaClassToEJavaObjectMapImpl.class, this, SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MODEL_MAP);
-		}
-		return solutionModelMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean containsKey(final ExplorationTarget<?> key) {
-		return solutionMap.containsKey(key);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean containsValue(final ExplorationResult<?> value) {
-		return solutionMap.containsValue(value);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> ExplorationResult<T> get(final ExplorationTarget<T> key) {
-		return (ExplorationResult<T>)solutionMap.get(key);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ExplorationTarget<?>> keySet() {
-		return new BasicEList<ExplorationTarget<?>>(solutionMap.keySet());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> ExplorationResult<T> put(final ExplorationTarget<T> key, final ExplorationResult<T> value) {
-		return (ExplorationResult<T>)solutionMap.put(key, value);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> ExplorationResult<T> removeKey(final ExplorationTarget<T> key) {
-		return (ExplorationResult<T>)solutionMap.get(key);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ExplorationResult<?>> values() {
-		return new BasicEList<ExplorationResult<?>>(solutionMap.values());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> T getSolutionModel(final Class<T> modelType) {
-		return SingleExplorationSolutionMapStaticImpl.getModel(this, modelType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> void putSolutionModel(final Class<T> modelType, final T solutionModel) {
-		SingleExplorationSolutionMapStaticImpl.putSolutionModel(this, modelType, solutionModel);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MAP:
-				return ((InternalEList<?>)getSolutionMap()).basicRemove(otherEnd, msgs);
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MODEL_MAP:
-				return ((InternalEList<?>)getSolutionModelMap()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MAP:
-				if (coreType) return getSolutionMap();
-				else return getSolutionMap().map();
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MODEL_MAP:
-				if (coreType) return getSolutionModelMap();
-				else return getSolutionModelMap().map();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MAP:
-				((EStructuralFeature.Setting)getSolutionMap()).set(newValue);
-				return;
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MODEL_MAP:
-				((EStructuralFeature.Setting)getSolutionModelMap()).set(newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MAP:
-				getSolutionMap().clear();
-				return;
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MODEL_MAP:
-				getSolutionModelMap().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MAP:
-				return solutionMap != null && !solutionMap.isEmpty();
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MODEL_MAP:
-				return solutionModelMap != null && !solutionModelMap.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //SingleExplorationSolutionMapImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SolutionsFactoryImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SolutionsFactoryImpl.java
deleted file mode 100644
index 8be2a866..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SolutionsFactoryImpl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions.impl;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-import org.fortiss.af3.exploration.moea.model.solutions.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SolutionsFactoryImpl extends EFactoryImpl implements SolutionsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SolutionsFactory init() {
-		try {
-			SolutionsFactory theSolutionsFactory = (SolutionsFactory)EPackage.Registry.INSTANCE.getEFactory(SolutionsPackage.eNS_URI);
-			if (theSolutionsFactory != null) {
-				return theSolutionsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new SolutionsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SolutionsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case SolutionsPackage.EXPLORATION_RESULT: return createExplorationResult();
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET: return createExplorationSolutionSet();
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP: return createSingleExplorationSolutionMap();
-			case SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP: return (EObject)createExplorationTargetToExplorationResultMap();
-			case SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP: return (EObject)createEJavaClassToEJavaObjectMap();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <T> ExplorationResult<T> createExplorationResult() {
-		ExplorationResultImpl<T> explorationResult = new ExplorationResultImpl<T>();
-		return explorationResult;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplorationSolutionSet createExplorationSolutionSet() {
-		ExplorationSolutionSetImpl explorationSolutionSet = new ExplorationSolutionSetImpl();
-		return explorationSolutionSet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SingleExplorationSolutionMap createSingleExplorationSolutionMap() {
-		SingleExplorationSolutionMapImpl singleExplorationSolutionMap = new SingleExplorationSolutionMapImpl();
-		return singleExplorationSolutionMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map.Entry<ExplorationTarget<?>, ExplorationResult<?>> createExplorationTargetToExplorationResultMap() {
-		ExplorationTargetToExplorationResultMapImpl explorationTargetToExplorationResultMap = new ExplorationTargetToExplorationResultMapImpl();
-		return explorationTargetToExplorationResultMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map.Entry<Class<?>, Object> createEJavaClassToEJavaObjectMap() {
-		EJavaClassToEJavaObjectMapImpl eJavaClassToEJavaObjectMap = new EJavaClassToEJavaObjectMapImpl();
-		return eJavaClassToEJavaObjectMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SolutionsPackage getSolutionsPackage() {
-		return (SolutionsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static SolutionsPackage getPackage() {
-		return SolutionsPackage.eINSTANCE;
-	}
-
-} //SolutionsFactoryImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SolutionsPackageImpl.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SolutionsPackageImpl.java
deleted file mode 100644
index 8fb4373c..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/impl/SolutionsPackageImpl.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions.impl;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.ETypeParameter;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.fortiss.af3.exploration.model.CommonPackage;
-import org.fortiss.af3.exploration.model.DimensionsPackage;
-import org.fortiss.af3.exploration.model.ExplorationPackage;
-
-import org.fortiss.af3.exploration.moea.model.MoeaPackage;
-
-import org.fortiss.af3.exploration.moea.model.feature.FeaturePackage;
-
-import org.fortiss.af3.exploration.moea.model.feature.impl.FeaturePackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.impl.MoeaPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.parameters.ParametersPackage;
-
-import org.fortiss.af3.exploration.moea.model.parameters.impl.ParametersPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.predefined.PredefinedPackage;
-
-import org.fortiss.af3.exploration.moea.model.predefined.impl.PredefinedPackageImpl;
-
-import org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult;
-import org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet;
-import org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap;
-import org.fortiss.af3.exploration.moea.model.solutions.SolutionsFactory;
-import org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SolutionsPackageImpl extends EPackageImpl implements SolutionsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass explorationResultEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass explorationSolutionSetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass singleExplorationSolutionMapEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass explorationTargetToExplorationResultMapEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass eJavaClassToEJavaObjectMapEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private SolutionsPackageImpl() {
-		super(eNS_URI, SolutionsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link SolutionsPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static SolutionsPackage init() {
-		if (isInited) return (SolutionsPackage)EPackage.Registry.INSTANCE.getEPackage(SolutionsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		SolutionsPackageImpl theSolutionsPackage = (SolutionsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SolutionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SolutionsPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		CommonPackage.eINSTANCE.eClass();
-		DimensionsPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		MoeaPackageImpl theMoeaPackage = (MoeaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(MoeaPackage.eNS_URI) instanceof MoeaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(MoeaPackage.eNS_URI) : MoeaPackage.eINSTANCE);
-		FeaturePackageImpl theFeaturePackage = (FeaturePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(FeaturePackage.eNS_URI) instanceof FeaturePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(FeaturePackage.eNS_URI) : FeaturePackage.eINSTANCE);
-		ParametersPackageImpl theParametersPackage = (ParametersPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ParametersPackage.eNS_URI) instanceof ParametersPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ParametersPackage.eNS_URI) : ParametersPackage.eINSTANCE);
-		PredefinedPackageImpl thePredefinedPackage = (PredefinedPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PredefinedPackage.eNS_URI) instanceof PredefinedPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PredefinedPackage.eNS_URI) : PredefinedPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theSolutionsPackage.createPackageContents();
-		theMoeaPackage.createPackageContents();
-		theFeaturePackage.createPackageContents();
-		theParametersPackage.createPackageContents();
-		thePredefinedPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theSolutionsPackage.initializePackageContents();
-		theMoeaPackage.initializePackageContents();
-		theFeaturePackage.initializePackageContents();
-		theParametersPackage.initializePackageContents();
-		thePredefinedPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theSolutionsPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(SolutionsPackage.eNS_URI, theSolutionsPackage);
-		return theSolutionsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExplorationResult() {
-		return explorationResultEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExplorationResult_Result() {
-		return (EAttribute)explorationResultEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExplorationSolutionSet() {
-		return explorationSolutionSetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExplorationSolutionSet_InputModelAdapter() {
-		return (EAttribute)explorationSolutionSetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExplorationSolutionSet_TargetSpecification() {
-		return (EReference)explorationSolutionSetEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExplorationSolutionSet_Solutions() {
-		return (EReference)explorationSolutionSetEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSingleExplorationSolutionMap() {
-		return singleExplorationSolutionMapEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSingleExplorationSolutionMap_SolutionMap() {
-		return (EReference)singleExplorationSolutionMapEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSingleExplorationSolutionMap_SolutionModelMap() {
-		return (EReference)singleExplorationSolutionMapEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExplorationTargetToExplorationResultMap() {
-		return explorationTargetToExplorationResultMapEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExplorationTargetToExplorationResultMap_Key() {
-		return (EReference)explorationTargetToExplorationResultMapEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExplorationTargetToExplorationResultMap_Value() {
-		return (EReference)explorationTargetToExplorationResultMapEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEJavaClassToEJavaObjectMap() {
-		return eJavaClassToEJavaObjectMapEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJavaClassToEJavaObjectMap_Key() {
-		return (EAttribute)eJavaClassToEJavaObjectMapEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJavaClassToEJavaObjectMap_Value() {
-		return (EAttribute)eJavaClassToEJavaObjectMapEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SolutionsFactory getSolutionsFactory() {
-		return (SolutionsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		explorationResultEClass = createEClass(EXPLORATION_RESULT);
-		createEAttribute(explorationResultEClass, EXPLORATION_RESULT__RESULT);
-
-		explorationSolutionSetEClass = createEClass(EXPLORATION_SOLUTION_SET);
-		createEAttribute(explorationSolutionSetEClass, EXPLORATION_SOLUTION_SET__INPUT_MODEL_ADAPTER);
-		createEReference(explorationSolutionSetEClass, EXPLORATION_SOLUTION_SET__TARGET_SPECIFICATION);
-		createEReference(explorationSolutionSetEClass, EXPLORATION_SOLUTION_SET__SOLUTIONS);
-
-		singleExplorationSolutionMapEClass = createEClass(SINGLE_EXPLORATION_SOLUTION_MAP);
-		createEReference(singleExplorationSolutionMapEClass, SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MAP);
-		createEReference(singleExplorationSolutionMapEClass, SINGLE_EXPLORATION_SOLUTION_MAP__SOLUTION_MODEL_MAP);
-
-		explorationTargetToExplorationResultMapEClass = createEClass(EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP);
-		createEReference(explorationTargetToExplorationResultMapEClass, EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__KEY);
-		createEReference(explorationTargetToExplorationResultMapEClass, EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP__VALUE);
-
-		eJavaClassToEJavaObjectMapEClass = createEClass(EJAVA_CLASS_TO_EJAVA_OBJECT_MAP);
-		createEAttribute(eJavaClassToEJavaObjectMapEClass, EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__KEY);
-		createEAttribute(eJavaClassToEJavaObjectMapEClass, EJAVA_CLASS_TO_EJAVA_OBJECT_MAP__VALUE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ExplorationPackage theExplorationPackage = (ExplorationPackage)EPackage.Registry.INSTANCE.getEPackage(ExplorationPackage.eNS_URI);
-
-		// Create type parameters
-		ETypeParameter explorationResultEClass_T = addETypeParameter(explorationResultEClass, "T");
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		explorationSolutionSetEClass.getESuperTypes().add(theExplorationPackage.getExplorationSolution());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(explorationResultEClass, ExplorationResult.class, "ExplorationResult", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		EGenericType g1 = createEGenericType(explorationResultEClass_T);
-		initEAttribute(getExplorationResult_Result(), g1, "result", null, 1, 1, ExplorationResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(explorationSolutionSetEClass, ExplorationSolutionSet.class, "ExplorationSolutionSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getExplorationSolutionSet_InputModelAdapter(), ecorePackage.getEJavaObject(), "inputModelAdapter", null, 1, 1, ExplorationSolutionSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExplorationSolutionSet_TargetSpecification(), theExplorationPackage.getExplorationSpecification(), null, "targetSpecification", null, 1, 1, ExplorationSolutionSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExplorationSolutionSet_Solutions(), this.getSingleExplorationSolutionMap(), null, "solutions", null, 0, -1, ExplorationSolutionSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(singleExplorationSolutionMapEClass, SingleExplorationSolutionMap.class, "SingleExplorationSolutionMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSingleExplorationSolutionMap_SolutionMap(), this.getExplorationTargetToExplorationResultMap(), null, "solutionMap", null, 1, -1, SingleExplorationSolutionMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSingleExplorationSolutionMap_SolutionModelMap(), this.getEJavaClassToEJavaObjectMap(), null, "solutionModelMap", null, 1, -1, SingleExplorationSolutionMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		EOperation op = addEOperation(singleExplorationSolutionMapEClass, ecorePackage.getEBoolean(), "containsKey", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(theExplorationPackage.getExplorationTarget());
-		EGenericType g2 = createEGenericType();
-		g1.getETypeArguments().add(g2);
-		addEParameter(op, g1, "key", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		op = addEOperation(singleExplorationSolutionMapEClass, ecorePackage.getEBoolean(), "containsValue", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(this.getExplorationResult());
-		g2 = createEGenericType();
-		g1.getETypeArguments().add(g2);
-		addEParameter(op, g1, "value", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		op = addEOperation(singleExplorationSolutionMapEClass, null, "get", 1, 1, IS_UNIQUE, IS_ORDERED);
-		ETypeParameter t1 = addETypeParameter(op, "T");
-		g1 = createEGenericType(theExplorationPackage.getExplorationTarget());
-		g2 = createEGenericType(t1);
-		g1.getETypeArguments().add(g2);
-		addEParameter(op, g1, "key", 0, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(this.getExplorationResult());
-		g2 = createEGenericType(t1);
-		g1.getETypeArguments().add(g2);
-		initEOperation(op, g1);
-
-		op = addEOperation(singleExplorationSolutionMapEClass, null, "keySet", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(ecorePackage.getEEList());
-		g2 = createEGenericType(theExplorationPackage.getExplorationTarget());
-		g1.getETypeArguments().add(g2);
-		EGenericType g3 = createEGenericType();
-		g2.getETypeArguments().add(g3);
-		initEOperation(op, g1);
-
-		op = addEOperation(singleExplorationSolutionMapEClass, null, "put", 1, 1, IS_UNIQUE, IS_ORDERED);
-		t1 = addETypeParameter(op, "T");
-		g1 = createEGenericType(theExplorationPackage.getExplorationTarget());
-		g2 = createEGenericType(t1);
-		g1.getETypeArguments().add(g2);
-		addEParameter(op, g1, "key", 0, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(this.getExplorationResult());
-		g2 = createEGenericType(t1);
-		g1.getETypeArguments().add(g2);
-		addEParameter(op, g1, "value", 0, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(this.getExplorationResult());
-		g2 = createEGenericType(t1);
-		g1.getETypeArguments().add(g2);
-		initEOperation(op, g1);
-
-		op = addEOperation(singleExplorationSolutionMapEClass, null, "removeKey", 1, 1, IS_UNIQUE, IS_ORDERED);
-		t1 = addETypeParameter(op, "T");
-		g1 = createEGenericType(theExplorationPackage.getExplorationTarget());
-		g2 = createEGenericType(t1);
-		g1.getETypeArguments().add(g2);
-		addEParameter(op, g1, "key", 0, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(this.getExplorationResult());
-		g2 = createEGenericType(t1);
-		g1.getETypeArguments().add(g2);
-		initEOperation(op, g1);
-
-		op = addEOperation(singleExplorationSolutionMapEClass, null, "values", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(ecorePackage.getEEList());
-		g2 = createEGenericType(this.getExplorationResult());
-		g1.getETypeArguments().add(g2);
-		g3 = createEGenericType();
-		g2.getETypeArguments().add(g3);
-		initEOperation(op, g1);
-
-		op = addEOperation(singleExplorationSolutionMapEClass, null, "getSolutionModel", 1, 1, IS_UNIQUE, IS_ORDERED);
-		t1 = addETypeParameter(op, "T");
-		g1 = createEGenericType(ecorePackage.getEJavaClass());
-		g2 = createEGenericType(t1);
-		g1.getETypeArguments().add(g2);
-		addEParameter(op, g1, "modelType", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(t1);
-		initEOperation(op, g1);
-
-		op = addEOperation(singleExplorationSolutionMapEClass, null, "putSolutionModel", 1, 1, IS_UNIQUE, IS_ORDERED);
-		t1 = addETypeParameter(op, "T");
-		g1 = createEGenericType(ecorePackage.getEJavaClass());
-		g2 = createEGenericType(t1);
-		g1.getETypeArguments().add(g2);
-		addEParameter(op, g1, "modelType", 1, 1, IS_UNIQUE, IS_ORDERED);
-		g1 = createEGenericType(t1);
-		addEParameter(op, g1, "solutionModel", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(explorationTargetToExplorationResultMapEClass, Map.Entry.class, "ExplorationTargetToExplorationResultMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-		g1 = createEGenericType(theExplorationPackage.getExplorationTarget());
-		g2 = createEGenericType();
-		g1.getETypeArguments().add(g2);
-		initEReference(getExplorationTargetToExplorationResultMap_Key(), g1, null, "key", null, 1, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		g1 = createEGenericType(this.getExplorationResult());
-		g2 = createEGenericType();
-		g1.getETypeArguments().add(g2);
-		initEReference(getExplorationTargetToExplorationResultMap_Value(), g1, null, "value", null, 1, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(eJavaClassToEJavaObjectMapEClass, Map.Entry.class, "EJavaClassToEJavaObjectMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-		g1 = createEGenericType(ecorePackage.getEJavaClass());
-		g2 = createEGenericType();
-		g1.getETypeArguments().add(g2);
-		initEAttribute(getEJavaClassToEJavaObjectMap_Key(), g1, "key", null, 1, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEJavaClassToEJavaObjectMap_Value(), ecorePackage.getEJavaObject(), "value", null, 1, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-	}
-
-} //SolutionsPackageImpl
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/util/SolutionsAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/util/SolutionsAdapterFactory.java
deleted file mode 100644
index c3c36fbb..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/util/SolutionsAdapterFactory.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.model.ExplorationSolution;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-import org.fortiss.af3.exploration.moea.model.solutions.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage
- * @generated
- */
-public class SolutionsAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static SolutionsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SolutionsAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = SolutionsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SolutionsSwitch<Adapter> modelSwitch =
-		new SolutionsSwitch<Adapter>() {
-			@Override
-			public <T> Adapter caseExplorationResult(ExplorationResult<T> object) {
-				return createExplorationResultAdapter();
-			}
-			@Override
-			public Adapter caseExplorationSolutionSet(ExplorationSolutionSet object) {
-				return createExplorationSolutionSetAdapter();
-			}
-			@Override
-			public Adapter caseSingleExplorationSolutionMap(SingleExplorationSolutionMap object) {
-				return createSingleExplorationSolutionMapAdapter();
-			}
-			@Override
-			public Adapter caseExplorationTargetToExplorationResultMap(Map.Entry<ExplorationTarget<?>, ExplorationResult<?>> object) {
-				return createExplorationTargetToExplorationResultMapAdapter();
-			}
-			@Override
-			public Adapter caseEJavaClassToEJavaObjectMap(Map.Entry<Class<?>, Object> object) {
-				return createEJavaClassToEJavaObjectMapAdapter();
-			}
-			@Override
-			public Adapter caseExplorationSolution(ExplorationSolution object) {
-				return createExplorationSolutionAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult <em>Exploration Result</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.ExplorationResult
-	 * @generated
-	 */
-	public Adapter createExplorationResultAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet <em>Exploration Solution Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.ExplorationSolutionSet
-	 * @generated
-	 */
-	public Adapter createExplorationSolutionSetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap <em>Single Exploration Solution Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.solutions.SingleExplorationSolutionMap
-	 * @generated
-	 */
-	public Adapter createSingleExplorationSolutionMapAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Exploration Target To Exploration Result Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see java.util.Map.Entry
-	 * @generated
-	 */
-	public Adapter createExplorationTargetToExplorationResultMapAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>EJava Class To EJava Object Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see java.util.Map.Entry
-	 * @generated
-	 */
-	public Adapter createEJavaClassToEJavaObjectMapAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.model.ExplorationSolution <em>Solution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.model.ExplorationSolution
-	 * @generated
-	 */
-	public Adapter createExplorationSolutionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //SolutionsAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/util/SolutionsSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/util/SolutionsSwitch.java
deleted file mode 100644
index 6a090519..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/solutions/util/SolutionsSwitch.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.solutions.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.model.ExplorationSolution;
-import org.fortiss.af3.exploration.model.ExplorationTarget;
-
-import org.fortiss.af3.exploration.moea.model.solutions.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.solutions.SolutionsPackage
- * @generated
- */
-public class SolutionsSwitch<T1> extends Switch<T1> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static SolutionsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SolutionsSwitch() {
-		if (modelPackage == null) {
-			modelPackage = SolutionsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T1 doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case SolutionsPackage.EXPLORATION_RESULT: {
-				ExplorationResult<?> explorationResult = (ExplorationResult<?>)theEObject;
-				T1 result = caseExplorationResult(explorationResult);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SolutionsPackage.EXPLORATION_SOLUTION_SET: {
-				ExplorationSolutionSet explorationSolutionSet = (ExplorationSolutionSet)theEObject;
-				T1 result = caseExplorationSolutionSet(explorationSolutionSet);
-				if (result == null) result = caseExplorationSolution(explorationSolutionSet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SolutionsPackage.SINGLE_EXPLORATION_SOLUTION_MAP: {
-				SingleExplorationSolutionMap singleExplorationSolutionMap = (SingleExplorationSolutionMap)theEObject;
-				T1 result = caseSingleExplorationSolutionMap(singleExplorationSolutionMap);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SolutionsPackage.EXPLORATION_TARGET_TO_EXPLORATION_RESULT_MAP: {
-				@SuppressWarnings("unchecked") Map.Entry<ExplorationTarget<?>, ExplorationResult<?>> explorationTargetToExplorationResultMap = (Map.Entry<ExplorationTarget<?>, ExplorationResult<?>>)theEObject;
-				T1 result = caseExplorationTargetToExplorationResultMap(explorationTargetToExplorationResultMap);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SolutionsPackage.EJAVA_CLASS_TO_EJAVA_OBJECT_MAP: {
-				@SuppressWarnings("unchecked") Map.Entry<Class<?>, Object> eJavaClassToEJavaObjectMap = (Map.Entry<Class<?>, Object>)theEObject;
-				T1 result = caseEJavaClassToEJavaObjectMap(eJavaClassToEJavaObjectMap);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Exploration Result</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Exploration Result</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public <T> T1 caseExplorationResult(ExplorationResult<T> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Exploration Solution Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Exploration Solution Set</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseExplorationSolutionSet(ExplorationSolutionSet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Single Exploration Solution Map</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Single Exploration Solution Map</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseSingleExplorationSolutionMap(SingleExplorationSolutionMap object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Exploration Target To Exploration Result Map</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Exploration Target To Exploration Result Map</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseExplorationTargetToExplorationResultMap(Map.Entry<ExplorationTarget<?>, ExplorationResult<?>> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EJava Class To EJava Object Map</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EJava Class To EJava Object Map</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseEJavaClassToEJavaObjectMap(Map.Entry<Class<?>, Object> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Solution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Solution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T1 caseExplorationSolution(ExplorationSolution object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T1 defaultCase(EObject object) {
-		return null;
-	}
-
-} //SolutionsSwitch
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/util/MoeaAdapterFactory.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/util/MoeaAdapterFactory.java
deleted file mode 100644
index fbe0126d..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/util/MoeaAdapterFactory.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.fortiss.af3.exploration.moea.model.*;
-
-import org.fortiss.tooling.base.model.element.IHiddenSpecification;
-import org.fortiss.tooling.base.model.element.IModelElementSpecification;
-
-import org.fortiss.tooling.kernel.model.IIdLabeled;
-import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.model.INamedElement;
-import org.fortiss.tooling.kernel.model.IProjectRootElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.MoeaPackage
- * @generated
- */
-public class MoeaAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static MoeaPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MoeaAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = MoeaPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MoeaSwitch<Adapter> modelSwitch =
-		new MoeaSwitch<Adapter>() {
-			@Override
-			public Adapter caseExplorationManager(ExplorationManager object) {
-				return createExplorationManagerAdapter();
-			}
-			@Override
-			public Adapter caseDseSpecification(DseSpecification object) {
-				return createDseSpecificationAdapter();
-			}
-			@Override
-			public Adapter caseImplementsComponentRef(ImplementsComponentRef object) {
-				return createImplementsComponentRefAdapter();
-			}
-			@Override
-			public Adapter caseVoterType(VoterType object) {
-				return createVoterTypeAdapter();
-			}
-			@Override
-			public Adapter caseIIdLabeled(IIdLabeled object) {
-				return createIIdLabeledAdapter();
-			}
-			@Override
-			public Adapter caseINamedElement(INamedElement object) {
-				return createINamedElementAdapter();
-			}
-			@Override
-			public Adapter caseINamedCommentedElement(INamedCommentedElement object) {
-				return createINamedCommentedElementAdapter();
-			}
-			@Override
-			public Adapter caseIProjectRootElement(IProjectRootElement object) {
-				return createIProjectRootElementAdapter();
-			}
-			@Override
-			public Adapter caseIModelElementSpecification(IModelElementSpecification object) {
-				return createIModelElementSpecificationAdapter();
-			}
-			@Override
-			public Adapter caseIHiddenSpecification(IHiddenSpecification object) {
-				return createIHiddenSpecificationAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.ExplorationManager <em>Exploration Manager</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.ExplorationManager
-	 * @generated
-	 */
-	public Adapter createExplorationManagerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.DseSpecification <em>Dse Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.DseSpecification
-	 * @generated
-	 */
-	public Adapter createDseSpecificationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.ImplementsComponentRef <em>Implements Component Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.ImplementsComponentRef
-	 * @generated
-	 */
-	public Adapter createImplementsComponentRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.af3.exploration.moea.model.VoterType <em>Voter Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.af3.exploration.moea.model.VoterType
-	 * @generated
-	 */
-	public Adapter createVoterTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.IIdLabeled <em>IId Labeled</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.IIdLabeled
-	 * @generated
-	 */
-	public Adapter createIIdLabeledAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.INamedElement <em>INamed Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.INamedElement
-	 * @generated
-	 */
-	public Adapter createINamedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.INamedCommentedElement <em>INamed Commented Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.INamedCommentedElement
-	 * @generated
-	 */
-	public Adapter createINamedCommentedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.kernel.model.IProjectRootElement <em>IProject Root Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.kernel.model.IProjectRootElement
-	 * @generated
-	 */
-	public Adapter createIProjectRootElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.base.model.element.IModelElementSpecification <em>IModel Element Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.base.model.element.IModelElementSpecification
-	 * @generated
-	 */
-	public Adapter createIModelElementSpecificationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.fortiss.tooling.base.model.element.IHiddenSpecification <em>IHidden Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.fortiss.tooling.base.model.element.IHiddenSpecification
-	 * @generated
-	 */
-	public Adapter createIHiddenSpecificationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //MoeaAdapterFactory
diff --git a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/util/MoeaSwitch.java b/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/util/MoeaSwitch.java
deleted file mode 100644
index ad58f1cc..00000000
--- a/org.fortiss.af3.exploration.alg/trunk/generated-src/org/fortiss/af3/exploration/moea/model/util/MoeaSwitch.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- */
-package org.fortiss.af3.exploration.moea.model.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.fortiss.af3.exploration.moea.model.*;
-
-import org.fortiss.tooling.base.model.element.IHiddenSpecification;
-import org.fortiss.tooling.base.model.element.IModelElementSpecification;
-
-import org.fortiss.tooling.kernel.model.IIdLabeled;
-import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.model.INamedElement;
-import org.fortiss.tooling.kernel.model.IProjectRootElement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.fortiss.af3.exploration.moea.model.MoeaPackage
- * @generated
- */
-public class MoeaSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static MoeaPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MoeaSwitch() {
-		if (modelPackage == null) {
-			modelPackage = MoeaPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case MoeaPackage.EXPLORATION_MANAGER: {
-				ExplorationManager explorationManager = (ExplorationManager)theEObject;
-				T result = caseExplorationManager(explorationManager);
-				if (result == null) result = caseIProjectRootElement(explorationManager);
-				if (result == null) result = caseINamedCommentedElement(explorationManager);
-				if (result == null) result = caseINamedElement(explorationManager);
-				if (result == null) result = caseIIdLabeled(explorationManager);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MoeaPackage.DSE_SPECIFICATION: {
-				DseSpecification dseSpecification = (DseSpecification)theEObject;
-				T result = caseDseSpecification(dseSpecification);
-				if (result == null) result = caseINamedCommentedElement(dseSpecification);
-				if (result == null) result = caseINamedElement(dseSpecification);
-				if (result == null) result = caseIIdLabeled(dseSpecification);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MoeaPackage.IMPLEMENTS_COMPONENT_REF: {
-				ImplementsComponentRef implementsComponentRef = (ImplementsComponentRef)theEObject;
-				T result = caseImplementsComponentRef(implementsComponentRef);
-				if (result == null) result = caseIHiddenSpecification(implementsComponentRef);
-				if (result == null) result = caseIModelElementSpecification(implementsComponentRef);
-				if (result == null) result = caseIIdLabeled(implementsComponentRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MoeaPackage.VOTER_TYPE: {
-				VoterType voterType = (VoterType)theEObject;
-				T result = caseVoterType(voterType);
-				if (result == null) result = caseIHiddenSpecification(voterType);
-				if (result == null) result = caseIModelElementSpecification(voterType);
-				if (result == null) result = caseIIdLabeled(voterType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Exploration Manager</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Exploration Manager</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseExplorationManager(ExplorationManager object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dse Specification</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Dse Specification</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDseSpecification(DseSpecification object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Implements Component Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Implements Component Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseImplementsComponentRef(ImplementsComponentRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Voter Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Voter Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseVoterType(VoterType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IId Labeled</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IId Labeled</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIIdLabeled(IIdLabeled object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseINamedElement(INamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>INamed Commented Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>INamed Commented Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseINamedCommentedElement(INamedCommentedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IProject Root Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IProject Root Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIProjectRootElement(IProjectRootElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IModel Element Specification</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IModel Element Specification</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIModelElementSpecification(IModelElementSpecification object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IHidden Specification</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IHidden Specification</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIHiddenSpecification(IHiddenSpecification object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //MoeaSwitch
-- 
GitLab