diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/.ratings b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/.ratings
index 9cb0a1f3ed5e90ec0da7ae5d3fb405aaeb8579ed..df685a90f52871443cebfcdb3602290d1df73a7f 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/.ratings
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/.ratings
@@ -1,6 +1,6 @@
CompositeExplorationSolution.java 528283a3dd57500539b2e11dd3d3eb35512de9b8 RED
DSEFactory.java 0a2f2cc6a197e760c1f8223339ffa5f16856b184 RED
-Explorer.java 9e0020b6a55bb035a41fb1bf4a1b709a7d6353f6 RED
+Explorer.java 4e23a668d0b0ad236e77eec2634efe2a0a6d0a23 RED
ImplicitExplorationTargetFactory.java 0b10dc4e8385bbdee0217dac783203080eb723f0 RED
SolutionQuantification.java efd31f192c3adbf1a4434452a19eb836a17390e2 RED
TaskMappingFactory.java 5e41df9d45e338dbcfa95bc3818ca17774951893 RED
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/Explorer.java b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/Explorer.java
index ca337e8dc13f299de0b27b4629f2afe54279cfc1..123465dd6c3a02ed4715189a38b14e4f09e60d59 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/Explorer.java
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/Explorer.java
@@ -16,9 +16,9 @@
package org.fortiss.af3.exploration.alg.dse;
import static org.fortiss.af3.exploration.alg.service.ExplorationService.getService;
-import static org.fortiss.tooling.common.util.LambdaUtils.filterByType;
+import static org.fortiss.tooling.common.util.LambdaUtils.filter;
+import static org.fortiss.tooling.common.util.LambdaUtils.filterType;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -35,7 +35,6 @@ import org.fortiss.af3.exploration.model.ExplorationConstraint;
import org.fortiss.af3.exploration.model.ExplorationSpecification;
import org.fortiss.af3.exploration.model.ExplorationTarget;
import org.fortiss.af3.exploration.model.ExternalModelTarget;
-import org.fortiss.af3.exploration.model.GenericConstraint;
import org.fortiss.af3.exploration.moea.model.DseSpecification;
import org.fortiss.af3.exploration.moea.model.parameters.EAOptimizer;
import org.fortiss.af3.exploration.moea.model.parameters.IOptimizer;
@@ -102,8 +101,9 @@ public class Explorer {
// Execute the Constraint Transformation.
IExplorationConstraintTransformationService constrService =
getService(IExplorationConstraintTransformationService.class);
- Collection<GenericConstraint<?>> genConstrs = filterByType(expSpec.getTargets(),
- new ArrayList<GenericConstraint<?>>(), GenericConstraint.class);
+ Collection<ExplorationConstraint<?>> genConstrs =
+ filter(filterType(expSpec.getTargets(), ExplorationConstraint.class),
+ t -> (t.getExpression() == null));
Collection<ExplorationConstraint<?>> transformedConstrs =
constrService.getTransformedConstraints(systemModelAdapter, genConstrs);
expSpec.getTargets().addAll(transformedConstrs);
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/extensions/compositegene/decode/.ratings b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/extensions/compositegene/decode/.ratings
index ef7217931b5809b512a32ff648f8a81442c0f29c..54494430d3f2c35962d0c6107e14e470dd0e3dfb 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/extensions/compositegene/decode/.ratings
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/extensions/compositegene/decode/.ratings
@@ -1,5 +1,5 @@
ComposableDecoder.java 197abec80b880e25fccfc66d61b471b0b5d7e10f RED
-ComposableDecoderBase.java 9b6114516ea001aeceb00f894d61336994097465 RED
+ComposableDecoderBase.java 6c2368511fede062e017d76e6be8e5a22132d97f RED
CompositeDecoder.java 9d34dd0b342e6433ab894974f9430531ce2de39a RED
CompositeDecoderBase.java 1bc1860ed616010f7f459ed6579989f155f607c2 RED
PhenotypeDecoder.java 44079e8545aaf8b8729919f0b07c774c3ca0df06 RED
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/problem/taskmapping/instantiate/.ratings b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/problem/taskmapping/instantiate/.ratings
index 5ad329f6ef94e61f132c7662257568298540db56..85f637ba47d58544f24dc430283e19c7c50cdd91 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/problem/taskmapping/instantiate/.ratings
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/problem/taskmapping/instantiate/.ratings
@@ -1,4 +1,4 @@
AbstractTaskMappingDecoder.java 2f3aa1860a3f10224bd8f5eab4ee07f136f44065 RED
FailSilentAbstractTaskMappingDecoder.java 5e93b07f400d697f318d029d00c674c715513422 RED
FaultDetectionVotingAbstractTaskMappingDecoder.java 8d3613f856787bf667ef2bcdae441375cdb9e989 RED
-TaskInstanceResourceAlignmentDecoder.java 116f72a16a02c9aac617cc4c9684cd583b87e1b6 RED
+TaskInstanceResourceAlignmentDecoder.java 4e9e61817df2e869ef84b67943c4e9874bbd4f37 RED
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/evaluator/.ratings b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/evaluator/.ratings
index 673026aebd8e1338416e2466ef663f5b4e5b9b2b..9965c4df06af2834ab894c328a084fefb7c6b791 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/evaluator/.ratings
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/evaluator/.ratings
@@ -1,6 +1,6 @@
ArchExpSubEvaluator.java 3516cc5a58514e47f965920012cf0cd738ddbaa4 RED
ArchitectureEvaluator.java b0c504d4b75bd7286c22713282a5ae38f27db231 RED
ExplorationTargetEvaluatorBase.java 1b45c04cb27a911806682b9f5ee18bcaa5f0ee0d RED
-ExpressionEvaluatorBase.java 920ee255df1861cbad8db5e94e6365d1d69d5fa4 RED
+ExpressionEvaluatorBase.java 600d61496b9f8cb818cb68e275d8f4260ea8cea7 RED
ITopLevelEvaluator.java 032ec6375efff2234664690f271cec98816abcc5 RED
TaskMappingEvaluator.java 742dd84439cfc62186a2799a1293248e2def32e2 RED
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/evaluator/ExpressionEvaluatorBase.java b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/evaluator/ExpressionEvaluatorBase.java
index 29a366b926edf434ae92f9a72fabcca076d0e98b..0bed25d2128390c1705929d594b7a5746a635200 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/evaluator/ExpressionEvaluatorBase.java
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/evaluator/ExpressionEvaluatorBase.java
@@ -26,7 +26,6 @@ import org.fortiss.af3.exploration.alg.service.IExplorationTargetEvaluator;
import org.fortiss.af3.exploration.dsl_v2.model.expression.IExpression;
import org.fortiss.af3.exploration.lang.ExplorationExpressionEvaluator;
import org.fortiss.af3.exploration.model.ExplorationTarget;
-import org.fortiss.af3.exploration.model.ExplorationTargetExpression;
import org.fortiss.tooling.kernel.introspection.IIntrospectionDetailsItem;
import org.fortiss.tooling.kernel.introspection.IIntrospectionItem;
import org.opt4j.core.DoubleValue;
@@ -63,7 +62,7 @@ public abstract class ExpressionEvaluatorBase<P extends Phenotype, RT, T extends
*/
protected ExpressionEvaluatorBase(SystemModelAdapter<?, ?, ?, ?, ?, ?, ?> systemModelAdapter,
T explorationTarget) throws Exception {
- if(!(explorationTarget instanceof ExplorationTargetExpression<?>)) {
+ if(explorationTarget.getExpression() == null) {
throw new Exception("The exploration target " + explorationTarget.getName() + " is" +
" not of the ExplorationTargetExpression. Thus, it cannot be evaluated by " +
getClass().getSimpleName() + ".");
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/.ratings b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/.ratings
index 08bc0aa04e471089ee43335d15e93bf077258b7a..3ec1bafbd9708378cd14a8819864d08d19f50a2b 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/.ratings
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/.ratings
@@ -1,7 +1,7 @@
ExplorationEncodingMap.java 061b6c18f34c3584890ec0630ec40bac1eee7c1c RED
ExplorationService.java f5067724b280208d9a7f59f417a068cbc7a20416 RED
-IExplorationConstraintTransformationService.java 6c3c34b527d526674e6474b42131b6948bdb8937 RED
-IExplorationContraintTransformationModule.java a7ab4345519341a13ec2de1879c7efbd9cb0dbb2 RED
+IExplorationConstraintTransformationService.java 3f90632a2747970f35e653a236c9c1286a7cd637 RED
+IExplorationContraintTransformationModule.java d20eeca8e0d7c5948fb8abbd5d7cf267fc502fba RED
IExplorationEncoding.java 510843700127afb540eda56934dbac3726b63529 RED
IExplorationEvaluatationService.java 0b4af374a83386f3ac0e7fa8ba47b571da6fe58a RED
IExplorationModule.java 8990c654e649f043fa9813b8bf9113ac7bd42d27 RED
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/IExplorationConstraintTransformationService.java b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/IExplorationConstraintTransformationService.java
index 162af6156b3ccc8220ce129143fa9a70d48f122c..06c5e34e4c9e5b752b7747f5ac853f7b8f756867 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/IExplorationConstraintTransformationService.java
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/IExplorationConstraintTransformationService.java
@@ -20,7 +20,6 @@ import java.util.Collection;
import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.SystemModelAdapter;
import org.fortiss.af3.exploration.alg.exception.ExplorationException;
import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.GenericConstraint;
/**
* This service transforms a collection of given {@link GenericConstraint}s to
@@ -49,5 +48,5 @@ public interface IExplorationConstraintTransformationService
*/
Collection<ExplorationConstraint<?>> getTransformedConstraints(
SystemModelAdapter<?, ?, ?, ?, ?, ?, ?> systemModelAdapter,
- Collection<GenericConstraint<?>> genericConstraints) throws ExplorationException;
+ Collection<ExplorationConstraint<?>> genericConstraints) throws ExplorationException;
}
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/IExplorationContraintTransformationModule.java b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/IExplorationContraintTransformationModule.java
index e0a511d95a1e291da330fa3a31470ac28caffccd..3fad662f1740ca2e8d050d1854dd8b381674f758 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/IExplorationContraintTransformationModule.java
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/IExplorationContraintTransformationModule.java
@@ -20,7 +20,6 @@ import java.util.Collection;
import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.SystemModelAdapter;
import org.fortiss.af3.exploration.alg.exception.ExplorationException;
import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.GenericConstraint;
import org.fortiss.tooling.kernel.service.base.IEObjectAware;
/**
@@ -29,7 +28,7 @@ import org.fortiss.tooling.kernel.service.base.IEObjectAware;
*
* @author diewald
*/
-public interface IExplorationContraintTransformationModule<T extends GenericConstraint<?>>
+public interface IExplorationContraintTransformationModule<T extends ExplorationConstraint<?>>
extends IEObjectAware<T>, IExplorationModule {
/**
@@ -47,5 +46,5 @@ public interface IExplorationContraintTransformationModule<T extends GenericCons
*/
Collection<ExplorationConstraint<?>> transformConstraint(
SystemModelAdapter<?, ?, ?, ?, ?, ?, ?> systemModelAdapter,
- GenericConstraint<?> currentConstraint) throws ExplorationException;
+ ExplorationConstraint<?> currentConstraint) throws ExplorationException;
}
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/internal/.ratings b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/internal/.ratings
index b3e401f2504dad5bdd358bca72d5594e77327b7e..9fef57ae8a7260d3dfdd7fb4fd034880a2e02ee1 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/internal/.ratings
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/internal/.ratings
@@ -1,4 +1,4 @@
-ExplorationConstraintTransformationService.java 865f1aba5538370e5855cc46cbe854b0340549e6 RED
+ExplorationConstraintTransformationService.java 80031ad626c327df10bc00859a4036844544553b RED
ExplorationEvaluationService.java 259ace09d86990428fb2ff9cfbff552cb4a69be8 RED
ExplorationRepairService.java ac50a5e53792c6793ff4b8ad5aa9812141990f5c RED
ExplorationTransformationService.java 96640353f12abd867378b84b5437811ca7996d8f RED
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/internal/ExplorationConstraintTransformationService.java b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/internal/ExplorationConstraintTransformationService.java
index 9dcc641e300b3ea73a16f57c3ec9c8736ac6949b..5e7117398827ae129b3c9a8a16457d816ba665a7 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/internal/ExplorationConstraintTransformationService.java
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/service/internal/ExplorationConstraintTransformationService.java
@@ -23,7 +23,6 @@ import org.fortiss.af3.exploration.alg.exception.ExplorationException;
import org.fortiss.af3.exploration.alg.service.IExplorationConstraintTransformationService;
import org.fortiss.af3.exploration.alg.service.IExplorationContraintTransformationModule;
import org.fortiss.af3.exploration.model.ExplorationConstraint;
-import org.fortiss.af3.exploration.model.GenericConstraint;
import org.fortiss.tooling.kernel.service.base.EObjectAwareServiceBase;
/**
@@ -83,9 +82,9 @@ public class ExplorationConstraintTransformationService
@Override
public Collection<ExplorationConstraint<?>> getTransformedConstraints(
SystemModelAdapter<?, ?, ?, ?, ?, ?, ?> systemModelAdapter,
- Collection<GenericConstraint<?>> genericConstraints) throws ExplorationException {
+ Collection<ExplorationConstraint<?>> genericConstraints) throws ExplorationException {
Collection<ExplorationConstraint<?>> transformedConstraints = new ArrayList<>();
- for(GenericConstraint<?> currentConstraint : genericConstraints) {
+ for(ExplorationConstraint<?> currentConstraint : genericConstraints) {
for(IExplorationContraintTransformationModule<?> module : getRegisteredHandlers(
currentConstraint.getClass())) {
transformedConstraints