Merge branch '3478-smt_exploration_router' into 'master'

3478 smt exploration router

See merge request !1

org.fortiss.af3.exploration.alg/.classpath

@@ -14,13 +14,11 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="generated-src"/>
-	<classpathentry kind="lib" path="lib/jgrapht-core-0.9.0.jar" sourcepath="lib/jgrapht-0.9.0-src.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/opt4j-core-3.1.3.jar" sourcepath="lib/opt4j-source-3.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/opt4j-operators-3.1.3.jar" sourcepath="lib/opt4j-source-3.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/apfloat.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jgrapht-ext-0.9.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jgraphx-2.0.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jgraphx-3.9.8.jar" sourcepath="lib/jgraphx-3.9.8-sources.jar"/>
 	<classpathentry kind="lib" path="lib/guice-assistedinject-4.0.jar" sourcepath="lib/guice-assistedinject-4.0-sources.jar"/>
 	<classpathentry kind="lib" path="lib/guice-4.0.jar" sourcepath="lib/guice-4.0-sources.jar"/>
 	<classpathentry kind="lib" path="lib/guice-multibindings-4.0.jar" sourcepath="lib/guice-multibindings-4.0-sources.jar"/>

org.fortiss.af3.exploration.alg/META-INF/MANIFEST.MF

@@ -4,13 +4,11 @@ Bundle-Name: Exploration Algorithms
 Bundle-SymbolicName: org.fortiss.af3.exploration.alg;singleton:=true
 Bundle-Version: 2.13.0.qualifier
 Bundle-ClassPath: .,
- lib/jgrapht-core-0.9.0.jar,
  lib/opt4j-core-3.1.3.jar,
  lib/opt4j-operators-3.1.3.jar,
  lib/aopalliance-1.0.jar,
  lib/apfloat.jar,
- lib/jgrapht-ext-0.9.0.jar,
- lib/jgraphx-2.0.0.1.jar,
+ lib/jgraphx-3.9.8.jar,
  lib/guice-assistedinject-4.0.jar,
  lib/guice-4.0.jar,
  lib/guice-multibindings-4.0.jar,

org.fortiss.af3.exploration.alg/build.properties

@@ -6,14 +6,12 @@ bin.includes = .,\
                plugin.properties,\
                lib/aopalliance-1.0.jar,\
                lib/apfloat.jar,\
-               lib/jgrapht-core-0.9.0.jar,\
                lib/licenses/,\
                lib/opt4j-core-3.1.3.jar,\
                lib/opt4j-operators-3.1.3.jar,\
                lib/opt4j-satdecoding-3.1.3.jar,\
                lib/opt4j-viewer-3.1.3.jar,\
-               lib/jgrapht-ext-0.9.0.jar,\
-               lib/jgraphx-2.0.0.1.jar,\
+               lib/jgraphx-3.9.8.jar,\
                lib/guice-assistedinject-4.0.jar,\
                lib/guice-4.0.jar,\
                lib/guice-multibindings-4.0.jar,\

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/.ratings

-CompositeExplorationSolution.java 88849af9f8a52684cc523f89e235599e16dd9ac3 RED
-DSEFactory.java 0a2f2cc6a197e760c1f8223339ffa5f16856b184 RED
-Explorer.java 2194a74cbe51ca9e7dafb008dcefb51a54064dc8 RED
-ImplicitExplorationTargetFactory.java 6c16c6712886b549dda0a73aef4a4c3fe18c1850 RED
-SolutionQuantification.java efd31f192c3adbf1a4434452a19eb836a17390e2 RED
-TaskMappingFactory.java 5e41df9d45e338dbcfa95bc3818ca17774951893 RED
+CompositeExplorationSolution.java 88849af9f8a52684cc523f89e235599e16dd9ac3 RED
+DSEFactory.java 9058870515a9162b0ec14685fc19bf6d1dfed0c2 RED
+Explorer.java 2194a74cbe51ca9e7dafb008dcefb51a54064dc8 RED
+ImplicitExplorationTargetFactory.java 6c16c6712886b549dda0a73aef4a4c3fe18c1850 RED
+SolutionQuantification.java efd31f192c3adbf1a4434452a19eb836a17390e2 RED
+TaskMappingFactory.java 5e41df9d45e338dbcfa95bc3818ca17774951893 RED

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/DSEFactory.java

@@ -68,7 +68,6 @@ import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.SystemModelAdapter;
 import org.fortiss.af3.exploration.moea.model.DseSpecification;
 import org.fortiss.af3.exploration.moea.model.feature.SafetyExploration;
 import org.fortiss.af3.exploration.moea.model.parameters.ExecutionModel;
-import org.jgrapht.experimental.dag.DirectedAcyclicGraph.CycleFoundException;
 
 /**
  * Factory to create exploration problems solved by the DSE. It is used to create the single parts
@@ -118,7 +117,8 @@ public class DSEFactory {
 	 *             if (one of) the sub problem(s) cannot be registered.
 	 */
 	@SuppressWarnings("unchecked")
-	public <C, S extends InstantiatedTaskMappingEntry, T extends InstantiatedTaskMappingEncoding<S>>
+	public
+			<C, S extends InstantiatedTaskMappingEntry, T extends InstantiatedTaskMappingEncoding<S>>
 			void createSubProblems(ArchitectureExplorationProblemModule archExpProblemModule,
 					DseSpecification dse, DecoderDependencyGraph execDepGraph) throws Exception {
 		// Java-limitation: it is not possible to pass the generic to the static methods.
@@ -194,18 +194,19 @@ public class DSEFactory {
 	 *            The design space exploration description.
 	 * @param execDepGraph
 	 *            Dependency graph defining the execution order.
-	 * @throws CycleFoundException
+	 * @throws IllegalArgumentException
 	 *             if a cyclic dependency is discovered when registering the problem.
 	 */
 	@SuppressWarnings("unchecked")
 	private void createPartitionMappingProblem(
 			ArchitectureExplorationProblemModule archExpProblemModule, DseSpecification dse,
-			DecoderDependencyGraph execDepGraph) throws CycleFoundException {
+			DecoderDependencyGraph execDepGraph) throws IllegalArgumentException {
 		Class<PartitionMappingEncoding> pmEnodingClass = PartitionMappingEncoding.class;
-		PartitionMappingCreator pmCreator = new PartitionMappingCreator(execDepGraph,
-				(Collection<IExecutionUnitAdapter<?>>)(Collection<?>)systemModelAdapter
-						.getDeploymentTargets(),
-				systemModelAdapter.getDeployableComponents().size());
+		PartitionMappingCreator pmCreator =
+				new PartitionMappingCreator(execDepGraph,
+						(Collection<IExecutionUnitAdapter<?>>)(Collection<?>)systemModelAdapter
+								.getDeploymentTargets(), systemModelAdapter
+								.getDeployableComponents().size());
 
 		@SuppressWarnings("rawtypes") List<ComposableDecoder> pmDecoders = new ArrayList<>();
 		PartitionMappingIdentityDecoder pmDecoder = new PartitionMappingIdentityDecoder();
@@ -226,20 +227,19 @@ public class DSEFactory {
 	@SuppressWarnings("unchecked")
 	private void createPlatformCommunicationGraphProblem(
 			ArchitectureExplorationProblemModule archExpProblemModule,
-			DecoderDependencyGraph execDepGraph) throws CycleFoundException {
+			DecoderDependencyGraph execDepGraph) throws IllegalArgumentException {
 		Class<PlatformCommunicationGraphEncoding> pmEnodingClass =
 				PlatformCommunicationGraphEncoding.class;
-		PlatformCommunicationGraphCreator pmCreator = new PlatformCommunicationGraphCreator(
-				execDepGraph,
-				(Collection<IExecutionUnitAdapter<?>>)(Collection<?>)systemModelAdapter
-						.getDeploymentTargets(),
-				(Collection<IMemoryUnitAdapter<?>>)(Collection<?>)systemModelAdapter
-						.getMemoryUnits(),
-				(Collection<IGatewayUnitAdapter<?>>)(Collection<?>)systemModelAdapter
-						.getGatewayUnits(),
-				(Collection<ITransmissionUnitAdapter<?>>)(Collection<?>)systemModelAdapter
-						.getTransmissionUnits(),
-				systemModelAdapter.getResouceConnections());
+		PlatformCommunicationGraphCreator pmCreator =
+				new PlatformCommunicationGraphCreator(execDepGraph,
+						(Collection<IExecutionUnitAdapter<?>>)(Collection<?>)systemModelAdapter
+								.getDeploymentTargets(),
+						(Collection<IMemoryUnitAdapter<?>>)(Collection<?>)systemModelAdapter
+								.getMemoryUnits(),
+						(Collection<IGatewayUnitAdapter<?>>)(Collection<?>)systemModelAdapter
+								.getGatewayUnits(),
+						(Collection<ITransmissionUnitAdapter<?>>)(Collection<?>)systemModelAdapter
+								.getTransmissionUnits(), systemModelAdapter.getResouceConnections());
 
 		@SuppressWarnings("rawtypes") List<ComposableDecoder> pmDecoders = new ArrayList<>();
 		PartitionMappingDecoderGraph pmgDecoder = new PartitionMappingDecoderGraph();
@@ -269,8 +269,8 @@ public class DSEFactory {
 	@SuppressWarnings("unchecked")
 	private <S extends InstantiatedTaskMappingEntry, T extends InstantiatedTaskMappingEncoding<S>>
 			void createAbstractTaskMappingProblem(TaskMappingFactory<S, T> tmFactory,
-					ArchitectureExplorationProblemModule archExpProblemModule, DseSpecification dse,
-					DecoderDependencyGraph execDepGraph) throws Exception {
+					ArchitectureExplorationProblemModule archExpProblemModule,
+					DseSpecification dse, DecoderDependencyGraph execDepGraph) throws Exception {
 		Class<AbstractTaskMappingEncoding> tmEnodingClass = AbstractTaskMappingEncoding.class;
 		AbstractTaskMappingCreator tmCreator =
 				tmFactory.createAbstractTaskMappingCreator(dse, execDepGraph);
@@ -310,8 +310,8 @@ public class DSEFactory {
 	@SuppressWarnings("unchecked")
 	private <S extends InstantiatedTaskMappingEntry, T extends InstantiatedTaskMappingEncoding<S>>
 			void createTaskMappingInstantiationProblem(TaskMappingFactory<S, T> tmFactory,
-					ArchitectureExplorationProblemModule archExpProblemModule, DseSpecification dse,
-					DecoderDependencyGraph execDepGraph) throws Exception {
+					ArchitectureExplorationProblemModule archExpProblemModule,
+					DseSpecification dse, DecoderDependencyGraph execDepGraph) throws Exception {
 		// These suppress warnings are required since type erasure in Java does not allow to pass
 		// XY<Z>.class.
 		StrictTTDecoder<S, T> tmDecoder = tmFactory.createStrictTTDecoder(dse);
@@ -352,8 +352,8 @@ public class DSEFactory {
 	 */
 	@SuppressWarnings("unchecked")
 	public <S extends TaskMappingEntry<?, Partition>>
-			TaskMappingFactory<?, ? extends TaskMappingEncoding<?, S>>
-			createTaskMappingFactory(ExecutionModel execModel) throws UnsupportedDataTypeException {
+			TaskMappingFactory<?, ? extends TaskMappingEncoding<?, S>> createTaskMappingFactory(
+					ExecutionModel execModel) throws UnsupportedDataTypeException {
 		// TODO: Remove the error-prone casting. Remove the differentiation between the failure
 		// modes here as well?
 		switch(execModel) {

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/create/platform/.ratings

-PlatformCommunicationGraphCreator.java fd016186eea8e716f9f6699b46c5d386acf2db8a RED
+PlatformCommunicationGraphCreator.java 8646b13de703d33b83b0729820cc747cf1b28fb8 RED

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/create/platform/PlatformCommunicationGraphCreator.java

@@ -31,7 +31,6 @@ import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.IResourceConnectionAdap
 import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.IResourceConnectionAdapter.ConnectionType;
 import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ITransmissionUnitAdapter;
 import org.fortiss.af3.exploration.alg.service.IExplorationEncoding;
-import org.jgrapht.DirectedGraph;
 import org.jgrapht.Graphs;
 import org.jgrapht.graph.DefaultDirectedGraph;
 import org.jgrapht.graph.DefaultEdge;
@@ -40,8 +39,8 @@ import org.jgrapht.graph.DefaultEdge;
  * 
  * @author diewald
  */
-public class PlatformCommunicationGraphCreator
-		extends ComposableCreatorBase<PlatformCommunicationGraphEncoding> {
+public class PlatformCommunicationGraphCreator extends
+		ComposableCreatorBase<PlatformCommunicationGraphEncoding> {
 	/** Execution Units present in the input models. */
 	private Collection<IExecutionUnitAdapter<?>> execUnits;
 	/** Memories present in the input models. */
@@ -72,9 +71,9 @@ public class PlatformCommunicationGraphCreator
 	@Override
 	public PlatformCommunicationGraphEncoding createComposable(FlatGenotypeMap createdGenotypes,
 			FlatPhenotypeMap<Phenotype> decodedPhenotypes) {
-		DirectedGraph<IResourceAdapter<?>, DefaultEdge> tempPlatformCommGraph =
+		DefaultDirectedGraph<IResourceAdapter<?>, DefaultEdge> tempPlatformCommGraph =
 				new DefaultDirectedGraph<IResourceAdapter<?>, DefaultEdge>(DefaultEdge.class);
-		DirectedGraph<IResourceAdapter<?>, DefaultEdge> platformGraph =
+		DefaultDirectedGraph<IResourceAdapter<?>, DefaultEdge> platformGraph =
 				new DefaultDirectedGraph<IResourceAdapter<?>, DefaultEdge>(DefaultEdge.class);
 
 		// Add all resources present in the platform as vertices to the "connection graph"
@@ -91,12 +90,10 @@ public class PlatformCommunicationGraphCreator
 				// If the current resource is a child of a {@link TransmissionUnit} (like a NoC
 				// router), respect the direction of connections such that complex networks are
 				// correctly reflected.
-				if(connection
-						.getConnectionType(currentReceiverResource) == ConnectionType.OUTGOING) {
+				if(connection.getConnectionType(currentReceiverResource) == ConnectionType.OUTGOING) {
 					Graphs.addEdgeWithVertices(platformGraph, connection.getSourceResource(),
 							currentReceiverResource);
-				} else if(connection
-						.getConnectionType(currentReceiverResource) == ConnectionType.INCOMING) {
+				} else if(connection.getConnectionType(currentReceiverResource) == ConnectionType.INCOMING) {
 					Graphs.addEdgeWithVertices(platformGraph, currentReceiverResource,
 							connection.getSourceResource());
 				} else {

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/encoding/platform/.ratings

-PlatformCommunicationGraphEncoding.java 69cdf4968c8572f70b4360b0c027cf6cbfd28a92 RED
+PlatformCommunicationGraphEncoding.java a7a3d7b1e05ea0ab4350042693eda3ad8bf6b76e RED

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/encoding/platform/PlatformCommunicationGraphEncoding.java

@@ -15,6 +15,7 @@
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.platform;
 
+import org.eclipse.draw2d.graph.DirectedGraph;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.partitionmapping.PartitionMappingEncoding;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.genotype.ComposableGenotype;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype.ComposablePhenotype;
@@ -22,7 +23,7 @@ import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.IResourceAdapter;
 import org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ITaskAdapter;
 import org.fortiss.af3.exploration.alg.graph.display.JGraphTVisualizer;
 import org.fortiss.af3.exploration.alg.service.IExplorationEncoding;
-import org.jgrapht.DirectedGraph;
+import org.jgrapht.graph.DefaultDirectedGraph;
 import org.jgrapht.graph.DefaultEdge;
 
 /**
@@ -33,14 +34,14 @@ import org.jgrapht.graph.DefaultEdge;
  * 
  * @author diewald
  */
-public class PlatformCommunicationGraphEncoding implements IExplorationEncoding, ComposableGenotype,
-		ComposablePhenotype<PartitionMappingEncoding>, Cloneable {
+public class PlatformCommunicationGraphEncoding implements IExplorationEncoding,
+		ComposableGenotype, ComposablePhenotype<PartitionMappingEncoding>, Cloneable {
 	/** The graph representing the communication structure of a platform. */
-	protected DirectedGraph<IResourceAdapter<?>, DefaultEdge> platformGraph;
+	protected DefaultDirectedGraph<IResourceAdapter<?>, DefaultEdge> platformGraph;
 
 	/** Constructor for the initial version of the Graph w/o available Partitions. */
 	public PlatformCommunicationGraphEncoding(
-			DirectedGraph<IResourceAdapter<?>, DefaultEdge> platformGraph) {
+			DefaultDirectedGraph<IResourceAdapter<?>, DefaultEdge> platformGraph) {
 		this.platformGraph = platformGraph;
 	}
 
@@ -59,7 +60,7 @@ public class PlatformCommunicationGraphEncoding implements IExplorationEncoding,
 	 * Returns the actual graph that contains information about the {@link IResourceAdapter}s and
 	 * their connections.
 	 */
-	public DirectedGraph<IResourceAdapter<?>, DefaultEdge> getActualGraph() {
+	public DefaultDirectedGraph<IResourceAdapter<?>, DefaultEdge> getActualGraph() {
 		return platformGraph;
 	}
 

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/extensions/compositegene/decode/.ratings

-ComposableDecoder.java 197abec80b880e25fccfc66d61b471b0b5d7e10f RED
-ComposableDecoderBase.java 96e7e4b9f24902b2699e04401225935108cc0d29 YELLOW
-CompositeDecoder.java 9d34dd0b342e6433ab894974f9430531ce2de39a RED
-CompositeDecoderBase.java 1bc1860ed616010f7f459ed6579989f155f607c2 RED
-PhenotypeDecoder.java 44079e8545aaf8b8729919f0b07c774c3ca0df06 RED
+ComposableDecoder.java 197abec80b880e25fccfc66d61b471b0b5d7e10f RED
+ComposableDecoderBase.java 96e7e4b9f24902b2699e04401225935108cc0d29 YELLOW
+CompositeDecoder.java 0e49de95488e00a96fc5c37b68f2ff65aeb35680 RED
+CompositeDecoderBase.java e290933d9adfdde85acfb635118b326651472e12 RED
+PhenotypeDecoder.java 44079e8545aaf8b8729919f0b07c774c3ca0df06 RED

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/extensions/compositegene/decode/CompositeDecoder.java

@@ -20,7 +20,6 @@ import java.util.Map;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.genotype.ComposableGenotype;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype.ComposablePhenotype;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype.CompositePhenotype;
-import org.jgrapht.experimental.dag.DirectedAcyclicGraph.CycleFoundException;
 import org.opt4j.core.Genotype;
 import org.opt4j.core.genotype.CompositeGenotype;
 import org.opt4j.core.problem.Decoder;
@@ -43,18 +42,18 @@ public interface CompositeDecoder<C extends CompositeGenotype<Class<? extends Co
 	 *            Map relating the sub-{@link Genotype}s with their decoding result (aka phenotype).
 	 * @return The {@link CompositeGenotype} {#link P} or {@code null} if the merge fails.
 	 */
-	<CP extends ComposablePhenotype<? extends Genotype>> P
-			mergeSubPhenotypes(Map<Class<CP>, CP> subPhenotypes);
+	<CP extends ComposablePhenotype<? extends Genotype>> P mergeSubPhenotypes(
+			Map<Class<CP>, CP> subPhenotypes);
 
 	/**
 	 * Adds a {@link ComposableDecoder} for the given {@link ComposablePhenotype}. The decoding
 	 * will triggered automatically and user defined merge function will consider the resulting
 	 * {@link ComposablePhenotype} of this {@link ComposableDecoder}.
 	 * 
-	 * @throws CycleFoundException
+	 * @throws IllegalArgumentException
 	 *             if a circular dependency between decoders exist.
 	 */
-	// TODO: add doc for exception.
-	<G extends ComposableGenotype, CP extends ComposablePhenotype<G>, D extends ComposableDecoder<G, CP>>
-			void registerSubDecoder(Class<G> subGenotype, D subDecoder) throws CycleFoundException;
+			<G extends ComposableGenotype, CP extends ComposablePhenotype<G>, D extends ComposableDecoder<G, CP>>
+			void registerSubDecoder(Class<G> subGenotype, D subDecoder)
+					throws IllegalArgumentException;
 }

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/extensions/compositegene/decode/CompositeDecoderBase.java

@@ -33,7 +33,6 @@ import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegen
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype.FlatPhenotypeMap;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype.Phenotype;
 import org.fortiss.af3.exploration.alg.service.IExplorationEncoding;
-import org.jgrapht.experimental.dag.DirectedAcyclicGraph.CycleFoundException;
 import org.opt4j.core.Genotype;
 import org.opt4j.core.genotype.CompositeGenotype;
 import org.opt4j.core.problem.Decoder;
@@ -119,9 +118,12 @@ public abstract class CompositeDecoderBase<C extends CompositeGenotype<Class<? e
 							(ComposableDecoder<ComposableGenotype, ComposablePhenotype<?>>)decoder;
 					subDecoders.put(castedDecoder, registeredSubDecoders.get(decoder));
 				} else {
-					throw new DecodingException(genotype, decoder, "The sub-decoder " +
-							decoder.getClass().getSimpleName() +
-							" has been found in the dependency graph but it has not been regirstered at this composite decoder.");
+					throw new DecodingException(
+							genotype,
+							decoder,
+							"The sub-decoder " +
+									decoder.getClass().getSimpleName() +
+									" has been found in the dependency graph but it has not been regirstered at this composite decoder.");
 				}
 			}
 		}
@@ -142,8 +144,9 @@ public abstract class CompositeDecoderBase<C extends CompositeGenotype<Class<? e
 			// shall not be just overridden.
 			if(Genotype.class.isAssignableFrom(decType)) {
 				CP oldGenotype = genotype.get(decType);
-				curPhenotype = castedDecoder.updateComposable(decodeableGenotype, oldGenotype,
-						decodedPhenotypes);
+				curPhenotype =
+						castedDecoder.updateComposable(decodeableGenotype, oldGenotype,
+								decodedPhenotypes);
 			} else {
 				curPhenotype =
 						castedDecoder.decodeComposable(decodeableGenotype, decodedPhenotypes);
@@ -223,12 +226,14 @@ public abstract class CompositeDecoderBase<C extends CompositeGenotype<Class<? e
 	/**
 	 * {@inheritDoc}
 	 * 
-	 * @throws CycleFoundException
+	 * @throws IllegalArgumentException
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
-	public <G extends ComposableGenotype, CP extends ComposablePhenotype<G>, D extends ComposableDecoder<G, CP>>
-			void registerSubDecoder(Class<G> subGenotype, D subDecoder) throws CycleFoundException {
+	public
+			<G extends ComposableGenotype, CP extends ComposablePhenotype<G>, D extends ComposableDecoder<G, CP>>
+			void registerSubDecoder(Class<G> subGenotype, D subDecoder)
+					throws IllegalArgumentException {
 		if(subGenotype == null || subDecoder == null) {
 			return;
 		}

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/extensions/compositegene/problem/.ratings

-CompositeProblemModuleBase.java 6a94bd41f5c78a9559878c05b6fa881de2c70d24 RED
+CompositeProblemModuleBase.java 91129f8e0fe83c7c858f1255a86d5e924baf316d RED