Skip to content
Snippets Groups Projects
Commit 0ac78eeb authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Exploration(.*): Remove outdated EClasses.

* No migration needed due to the eClasses' abstract/interface nature.
* Removed ObectiveExpression
* Removed ConstraintExpression
* Removed ExplorationTargetExpression
* Removed GenericObjective
* Removed GenericConstraint
refs 3273
parent a11c67b4
No related branches found
No related tags found
No related merge requests found
Showing
with 18 additions and 22 deletions
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
......@@ -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);
......
ComposableDecoder.java 197abec80b880e25fccfc66d61b471b0b5d7e10f RED
ComposableDecoderBase.java 9b6114516ea001aeceb00f894d61336994097465 RED
ComposableDecoderBase.java 6c2368511fede062e017d76e6be8e5a22132d97f RED
CompositeDecoder.java 9d34dd0b342e6433ab894974f9430531ce2de39a RED
CompositeDecoderBase.java 1bc1860ed616010f7f459ed6579989f155f607c2 RED
PhenotypeDecoder.java 44079e8545aaf8b8729919f0b07c774c3ca0df06 RED
AbstractTaskMappingDecoder.java 2f3aa1860a3f10224bd8f5eab4ee07f136f44065 RED
FailSilentAbstractTaskMappingDecoder.java 5e93b07f400d697f318d029d00c674c715513422 RED
FaultDetectionVotingAbstractTaskMappingDecoder.java 8d3613f856787bf667ef2bcdae441375cdb9e989 RED
TaskInstanceResourceAlignmentDecoder.java 116f72a16a02c9aac617cc4c9684cd583b87e1b6 RED
TaskInstanceResourceAlignmentDecoder.java 4e9e61817df2e869ef84b67943c4e9874bbd4f37 RED
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
......@@ -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() + ".");
......
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
......
......@@ -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;
}
......@@ -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;
}
ExplorationConstraintTransformationService.java 865f1aba5538370e5855cc46cbe854b0340549e6 RED
ExplorationConstraintTransformationService.java 80031ad626c327df10bc00859a4036844544553b RED
ExplorationEvaluationService.java 259ace09d86990428fb2ff9cfbff552cb4a69be8 RED
ExplorationRepairService.java ac50a5e53792c6793ff4b8ad5aa9812141990f5c RED
ExplorationTransformationService.java 96640353f12abd867378b84b5437811ca7996d8f RED
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment