Cleanup: Remove outdated achitecture encodings

* These classes were initially required to resolve issues with generics
  and to register corresp. decoders.

Issue-Ref: 3279
Issue-Url: https://af3-developer.fortiss.org/issues/3279


Signed-off-by: Alexander Diewald <diewald@fortiss.org>

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

 CompositeExplorationSolution.java ba5e13f196038eb65f1d51211772d6e242cb1231 RED
-DSEFactory.java 465ae574d299686415ae081c824398fb72bc5cde RED
+DSEFactory.java fb3d5fbefb66ecd47d1693108c936a6322d17ce9 RED
 Explorer.java 4d3e504e28575027293a802116a02b03aa931fc2 RED
 ImplicitExplorationTargetFactory.java 25566c87a5d9742deb7ca4aa23bbfabd08296a5f RED
 InternalSpecificationProvider.java 68122b2a0bb8af6b5e10097c16898aea891d6e73 YELLOW

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

@@ -20,7 +20,6 @@ import java.util.List;
 
 import javax.activation.UnsupportedDataTypeException;
 
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.create.ArchitectureExplorationCreator;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.create.partitionmapping.PartitionMappingCreator;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.create.safetyfunctionarch.SafetyFunctionArchCreator;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.create.taskmapping.AbstractTaskMappingCreator;
@@ -262,15 +261,6 @@ public class DSEFactory {
 		// new ArrayList<>());
 	}
 
-	/**
-	 * Creates a new {@link ArchitectureExplorationCreator} which manages the creation of the
-	 * concrete architecture exploration problem, i.e. the {@link ArchitectureExplorationCreator}
-	 * calls the creators of the genotypes composing the architecture exploration problem.
-	 */
-	public ArchitectureExplorationCreator createArchitectureExplorationCreator() {
-		return new ArchitectureExplorationCreator();
-	}
-
 	/**
 	 * Returns the {@link TaskMappingFactory} that fits the given {@link ExecutionModel} from the
 	 * DSE.

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

-/*-------------------------------------------------------------------------+
-| Copyright 2015 fortiss GmbH                                              |
-|                                                                          |
-| Licensed under the Apache License, Version 2.0 (the "License");          |
-| you may not use this file except in compliance with the License.         |
-| You may obtain a copy of the License at                                  |
-|                                                                          |
-|    http://www.apache.org/licenses/LICENSE-2.0                            |
-|                                                                          |
-| Unless required by applicable law or agreed to in writing, software      |
-| distributed under the License is distributed on an "AS IS" BASIS,        |
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
-| See the License for the specific language governing permissions and      |
-| limitations under the License.                                           |
-+--------------------------------------------------------------------------*/
-package org.fortiss.af3.exploration.alg.dse.backend.opt4j.create;
-
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.ArchitectureExplorationEncoding;
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.create.CompositeCreatorBase;
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.genotype.ComposableGenotype;
-import org.opt4j.core.problem.Creator;
-
-/**
- * {@link Creator} of the {@link ArchitectureExplorationEncoding} of an architectural exploration
- * problem, that consists of sub encodings. Refer to {@link ComposableGenotype} for further
- * documentation.
- * 
- * @author diewald
- */
-public class ArchitectureExplorationCreator
-		extends CompositeCreatorBase<ArchitectureExplorationEncoding> {
-	/** {@inheritDoc} */
-	@Override
-	public ArchitectureExplorationEncoding createComposite() {
-		return new ArchitectureExplorationEncoding();
-	}
-}

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

-/*-------------------------------------------------------------------------+
-| Copyright 2015 fortiss GmbH                                              |
-|                                                                          |
-| Licensed under the Apache License, Version 2.0 (the "License");          |
-| you may not use this file except in compliance with the License.         |
-| You may obtain a copy of the License at                                  |
-|                                                                          |
-|    http://www.apache.org/licenses/LICENSE-2.0                            |
-|                                                                          |
-| Unless required by applicable law or agreed to in writing, software      |
-| distributed under the License is distributed on an "AS IS" BASIS,        |
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
-| See the License for the specific language governing permissions and      |
-| limitations under the License.                                           |
-+--------------------------------------------------------------------------*/
-package org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding;
-
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.genotype.ComposableGenotype;
-
-/**
- * Marker interface for encodings of sub problems of an architectural exploration problem solved by
- * the DSE. All sub encodings must inherit from this interface to be properly recognized.
- * 
- * @author diewald
- */
-
-public interface ArchExpSubEncoding extends ComposableGenotype {
-	// TODO: Check whether this interface can be removed.
-	// Marker interface.
-}

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

-/*-------------------------------------------------------------------------+
-| Copyright 2015 fortiss GmbH                                              |
-|                                                                          |
-| Licensed under the Apache License, Version 2.0 (the "License");          |
-| you may not use this file except in compliance with the License.         |
-| You may obtain a copy of the License at                                  |
-|                                                                          |
-|    http://www.apache.org/licenses/LICENSE-2.0                            |
-|                                                                          |
-| Unless required by applicable law or agreed to in writing, software      |
-| distributed under the License is distributed on an "AS IS" BASIS,        |
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
-| See the License for the specific language governing permissions and      |
-| limitations under the License.                                           |
-+--------------------------------------------------------------------------*/
-package org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding;
-
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.genotype.ComposableGenotype;
-import org.opt4j.core.genotype.CompositeGenotype;
-
-/**
- * Allows to instantiate an encoding of an {@link ArchitectureExplorationEncoding} used to describe
- * an architectural exloration problem.
- * 
- * @author diewald
- */
-public class ArchitectureExplorationEncoding
-		extends CompositeGenotype<Class<? extends ComposableGenotype>, ComposableGenotype> {
-	// "Marker" class.
-}

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

-TaskMappingEncoding.java 3e089d8d181399d43b41f8a7204390393f045ad5 RED
+TaskMappingEncoding.java 2d4b1fae6f59ee2fe7fd8e0b6db8322c95667eba RED
 TaskMappingEntry.java 407c9065007f8cd4adc8b64eea13a837bba581ae RED

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/encoding/taskmapping/TaskMappingEncoding.java

@@ -24,7 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.ArchExpSubEncoding;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.MappingEncoding;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.comm.constraint.InternalIsolatedCommunicationSet;
 import org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.partitionmapping.Partition;
@@ -59,8 +58,7 @@ import com.google.common.collect.Multimap;
 public abstract class TaskMappingEncoding<S extends ITaskAdapter<?>, T extends TaskMappingEntry<S, IExecutionUnitAdapter<?>>>
 		extends MappingEncoding<TaskMappingEncoding<S, T>, S, IExecutionUnitAdapter<?>, T>
 		implements IMappingEncoding<S, IExecutionUnitAdapter<?>, T>, ComposableGenotype,
-		ArchExpSubEncoding, IExplorationEncoding, ConstrainedEncoding,
-		Copyable<TaskMappingEncoding<S, T>> {
+		IExplorationEncoding, ConstrainedEncoding, Copyable<TaskMappingEncoding<S, T>> {
 	/** Random generator */
 	private RandomExploration rand = RandomExploration.getInstance();
 

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/problem/ArchitectureDecoder.java

-/*-------------------------------------------------------------------------+
-| Copyright 2015 fortiss GmbH                                              |
-|                                                                          |
-| Licensed under the Apache License, Version 2.0 (the "License");          |
-| you may not use this file except in compliance with the License.         |
-| You may obtain a copy of the License at                                  |
-|                                                                          |
-|    http://www.apache.org/licenses/LICENSE-2.0                            |
-|                                                                          |
-| Unless required by applicable law or agreed to in writing, software      |
-| distributed under the License is distributed on an "AS IS" BASIS,        |
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
-| See the License for the specific language governing permissions and      |
-| limitations under the License.                                           |
-+--------------------------------------------------------------------------*/
-package org.fortiss.af3.exploration.alg.dse.backend.opt4j.problem;
-
-import java.util.Map;
-
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.ArchExpSubEncoding;
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.ArchitectureExplorationEncoding;
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.decode.CompositeDecoderBase;
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.graph.DecoderDependencyGraph;
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype.Phenotype;
-import org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution.ArchitectureSolution;
-import org.opt4j.core.genotype.CompositeGenotype;
-import org.opt4j.core.problem.Decoder;
-
-import com.google.inject.Inject;
-
-/**
- * {@link Decoder} for {@link CompositeGenotype} {@link ArchExpSubEncoding} which encodes an
- * architectural exploration problem.
- * 
- * @author diewald
- */
-public class ArchitectureDecoder
-		extends CompositeDecoderBase<ArchitectureExplorationEncoding, ArchitectureSolution> {
-
-	/** Default constructor that makes the input models accessible for the decoders. */
-	@Inject
-	public ArchitectureDecoder(DecoderDependencyGraph execdepGraph) {
-		super(execdepGraph);
-	}
-
-	/** {@inheritDoc} */
-	@Override
-	public <CP extends Phenotype> ArchitectureSolution
-			mergeSubPhenotypes(Map<Class<CP>, CP> subPhenotypes) {
-		return new ArchitectureSolution();
-	}
-}