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

DI: Rename IExplorationModule --> IExplorationExtension.


* The existing IExplorationModule is a marker interface for DSE
  extensions. It conflicts with the naming of "ExplorationModules" that
  are intended to declare sub-problem descriptions of a DSE process.

Signed-off-by: default avatarAlexander Diewald <diewald@fortiss.org>
parent 0252f688
No related branches found
No related tags found
1 merge request!2Dependency injection
Showing
with 17 additions and 16 deletions
DeprecatedModelGeneratorBase.java be9e214555ee28a48d59ecd6856f7b12f5f57ecf RED
EMFModelConcurrencyHandler.java 7db7ba7548b9785863ce3c72533b5f65307bcac3 RED
ITransformationModule.java f995cf6c065fcac2df1f4492b33e9659e4b7d6d2 RED
ITransformationModule.java 051d7bd6ac0537f605c532c44cc780ebe1a7af27 RED
ITransformationStrategy.java 3e5dc1a41a13ccea617d598ff72bbb747deb452b RED
......@@ -26,7 +26,7 @@ import org.fortiss.af3.exploration.alg.guava.SubClassToInstanceMap;
import org.fortiss.af3.exploration.alg.guava.TypedBiMap;
import org.fortiss.af3.exploration.alg.service.ExplorationTransformationInputs;
import org.fortiss.af3.exploration.alg.service.IExplorationEncoding;
import org.fortiss.af3.exploration.alg.service.IExplorationModule;
import org.fortiss.af3.exploration.alg.service.IExplorationExtension;
import org.fortiss.af3.exploration.alg.service.IExplorationTransformationService.TransformationContext;
import org.fortiss.tooling.kernel.service.base.IEObjectAware;
......@@ -50,7 +50,7 @@ import com.google.common.collect.Multimap;
* @author diewald
*/
public interface ITransformationModule<T extends EObject>
extends IEObjectAware<T>, IExplorationModule, IDependencyModule<T, T> {
extends IEObjectAware<T>, IExplorationExtension, IDependencyModule<T, T> {
/** Defines the state of a Generation/Transformation module for single element types. */
enum TransformationState {
......
......@@ -2,12 +2,12 @@ ExplorationEncodingMap.java aaea06f5731018d159a04266c92f1a701e461323 RED
ExplorationService.java 013434bf2fd9ae6d97b2540874b2fa7d75e280e2 RED
ExplorationTransformationInputs.java 3374ce609b50e69c3c29f1eb79bee25cd06b181d RED
IExplorationConstraintTransformationService.java 06c5e34e4c9e5b752b7747f5ac853f7b8f756867 RED
IExplorationContraintTransformationModule.java 3fad662f1740ca2e8d050d1854dd8b381674f758 RED
IExplorationContraintTransformationModule.java 1d3560401275f719e2b9901d1639a6be6bd7c169 RED
IExplorationEncoding.java f58adbcf840af521333c2777f50041a60548bff3 RED
IExplorationEvaluatationService.java 045d9cc5e1a25d51762efe49fed1d705414c5507 RED
IExplorationModule.java d965e3a98447dcc46c803bd83a8eb449903c926d RED
IExplorationEvaluatationService.java b4d242fb3d16796e98db31dd8db50aa4d003d49f RED
IExplorationExtension.java c2a148e18c580d2432357e93da45e7bf7df8eb0c RED
IExplorationRepairService.java 9fdbc6c62436e32f1ebc7f3e6c43517199271f32 RED
IExplorationService.java 5d460284b816e77c496f35c13380e044cc18c689 RED
IExplorationTargetEvaluator.java 8fbebfdd30a4cb23758fc78600bdc8548a5452b9 RED
IExplorationService.java 29252f52f28fcd036272bbb05dcd48897ee33dfd RED
IExplorationTargetEvaluator.java 99c27a053a123462b8a4faadc9c3530fe6bc0c67 RED
IExplorationTransformationService.java b16fb771873374a3cfd31b8e942af030e689774e RED
IRepairModule.java 170c6556f6a4375ebf092a18f964d8ef306ce2b0 RED
IRepairModule.java 0cca5fea3835e4fccc151eec42232ad0e6c88e66 RED
......@@ -29,7 +29,7 @@ import org.fortiss.tooling.kernel.service.base.IEObjectAware;
* @author diewald
*/
public interface IExplorationContraintTransformationModule<T extends ExplorationConstraint<?>>
extends IEObjectAware<T>, IExplorationModule {
extends IEObjectAware<T>, IExplorationExtension {
/**
* Transforms constraints encoded in the given {@link GenericConstraint} to
......
......@@ -27,7 +27,7 @@ import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegen
*
* @author diewald
*/
public interface IExplorationEvaluatationService<T extends IExplorationModule>
public interface IExplorationEvaluatationService<T extends IExplorationExtension>
extends IExplorationService<T> {
/**
......
......@@ -18,9 +18,10 @@ package org.fortiss.af3.exploration.alg.service;
import org.fortiss.tooling.kernel.introspection.IIntrospectionItem;
/**
* Marker interface for extensions of the Opt4J-based DSE: Variable modules, decoders, evaluators...
*
* @author diewald
*/
public interface IExplorationModule extends IIntrospectionItem {
public interface IExplorationExtension extends IIntrospectionItem {
// Marker interface.
}
......@@ -24,7 +24,7 @@ import org.fortiss.tooling.kernel.introspection.IIntrospectiveKernelService;
*
* @author diewald
*/
public interface IExplorationService<T extends IExplorationModule> extends
public interface IExplorationService<T extends IExplorationExtension> extends
IIntrospectiveKernelService {
/**
......
......@@ -29,14 +29,14 @@ import org.opt4j.core.Value;
import com.google.common.collect.ClassToInstanceMap;
/**
* Interface to be implemented by {@link IExplorationModule}s that perform evaluations of
* Interface to be implemented by {@link IExplorationExtension}s that perform evaluations of
* individuals (= candidate solutions). These are generated during the execution of the DSE.
*
* @author diewald
*/
// TODO(AD): Extend the documentation: Use parameters! We have an interface here.
public interface IExplorationTargetEvaluator<P, RT, S extends ExplorationTarget<RT>>
extends IEObjectAware<S>, IExplorationModule {
extends IEObjectAware<S>, IExplorationExtension {
/** Evaluates a phenotype w.r.t. a given objective dimension. */
public Value<?> evaluateGoal(P phenotype, FlatPhenotypeMap<Phenotype> phenotypeTypeMap,
......
......@@ -34,7 +34,7 @@ import org.opt4j.core.Value;
*
* @author diewald
*/
public interface IRepairModule<T extends Genotype> extends IObjectAware<T>, IExplorationModule {
public interface IRepairModule<T extends Genotype> extends IObjectAware<T>, IExplorationExtension {
/**
* Indicates whether a given {@link Genotype} should be repaired based on an evaluation of the
......
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