MM: Cleanup & restructuring

* Remove outdated classes.
* Improved package structure.

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/META-INF/MANIFEST.MF

@@ -126,14 +126,19 @@ Export-Package: org.fortiss.af3.exploration.alg,
  org.fortiss.af3.exploration.alg.service,
  org.fortiss.af3.exploration.alg.util,
  org.fortiss.af3.exploration.moea.model,
+ org.fortiss.af3.exploration.moea.model.adapter,
+ org.fortiss.af3.exploration.moea.model.adapter.impl,
+ org.fortiss.af3.exploration.moea.model.adapter.util,
  org.fortiss.af3.exploration.moea.model.annotation,
  org.fortiss.af3.exploration.moea.model.annotation.impl,
  org.fortiss.af3.exploration.moea.model.annotation.util,
+ org.fortiss.af3.exploration.moea.model.constraints,
  org.fortiss.af3.exploration.moea.model.constraints.impl,
- org.fortiss.af3.exploration.moea.model.feature,
- org.fortiss.af3.exploration.moea.model.feature.impl,
- org.fortiss.af3.exploration.moea.model.feature.util,
+ org.fortiss.af3.exploration.moea.model.constraints.util,
  org.fortiss.af3.exploration.moea.model.impl,
+ org.fortiss.af3.exploration.moea.model.objectives,
+ org.fortiss.af3.exploration.moea.model.objectives.impl,
+ org.fortiss.af3.exploration.moea.model.objectives.util,
  org.fortiss.af3.exploration.moea.model.parameters,
  org.fortiss.af3.exploration.moea.model.parameters.impl,
  org.fortiss.af3.exploration.moea.model.parameters.util,

org.fortiss.af3.exploration.alg/model/moea.ecore

@@ -7,9 +7,12 @@
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="features" lowerBound="1"
         upperBound="-1">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="List of {@link IExplorationFeature}s that define which explorations are executed by the DSE."/>
+      </eAnnotations>
       <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments>
-          <eUpperBound eClassifier="#//feature/IExplorationFeature"/>
+          <eUpperBound eClassifier="#//adapter/IExplorationFeature"/>
         </eTypeArguments>
       </eGenericType>
     </eStructuralFeatures>
@@ -32,27 +35,25 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplementsComponentRef" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="For {@link Component}s in a &quot;100% {@link ComponentArchitecture}&quot; this specification contains a reference to the {@link Component} in the &quot;150% / 125% {@link ComponentArchitecture}&quot; which they implement. Note that this specification only exists in {@link ComponentArchitecture}s that are actually generated from a &quot;150% / 125% {@link ComponentArchitecture}&quot;."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="refComponent" lowerBound="1"
-        eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="VoterType_t">
-    <eLiterals name="MajorityVoter"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VoterType" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="#//VoterType_t"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="IRequestAdapter" instanceTypeName="IRequestAdapter"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="IResourceAdapter" instanceTypeName="IResourceAdapter"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IRequesterSet">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="entries" lowerBound="1"
-        upperBound="-1" eType="#//IRequestAdapter"/>
-  </eClassifiers>
+  <eSubpackages name="adapter" nsURI="http://www.fortiss.org/af3/exploration/moea/adapter"
+      nsPrefix="org-fortiss-af3-exploration-moea-adapter">
+    <eClassifiers xsi:type="ecore:EDataType" name="IExplorationFeature" instanceClassName="org.fortiss.af3.exploration.alg.feature.IExplorationFeature"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="IRequestAdapter" instanceTypeName="IRequestAdapter"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="IResourceAdapter" instanceTypeName="IResourceAdapter"/>
+    <eClassifiers xsi:type="ecore:EClass" name="IRequesterSet">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="entries" lowerBound="1"
+          upperBound="-1" eType="#//adapter/IRequestAdapter"/>
+    </eClassifiers>
+  </eSubpackages>
   <eSubpackages name="annotation" nsURI="http://www.fortiss.org/af3/exploration/moea/annotation"
       nsPrefix="org-fortiss-af3-exploration-moea-annotation">
+    <eClassifiers xsi:type="ecore:EClass" name="ImplementsComponentRef" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="For {@link Component}s in a &quot;100% {@link ComponentArchitecture}&quot; this specification contains a reference to the {@link Component} in the &quot;150% / 125% {@link ComponentArchitecture}&quot; which they implement. Note that this specification only exists in {@link ComponentArchitecture}s that are actually generated from a &quot;150% / 125% {@link ComponentArchitecture}&quot;."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="refComponent" lowerBound="1"
+          eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component"/>
+    </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="ComponentDiverseImplRef" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IAnnotatedSpecification platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="{@link IAnnotatedSpecification} providing a reference to a set of differing implementations of the specified {@link Component}, hence providing diverse implementations."/>
@@ -70,18 +71,6 @@
           eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="1"/>
     </eClassifiers>
   </eSubpackages>
-  <eSubpackages name="feature" nsURI="http://www.fortiss.org/af3/exploration/moea/feature"
-      nsPrefix="org-fortiss-af3-exploration-moea-feature">
-    <eClassifiers xsi:type="ecore:EClass" name="SafetyExploration" eSuperTypes="platform:/resource/org.fortiss.af3.exploration/model/exploration.ecore#//IExplorationFeature">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="adapters" upperBound="-1"
-          eType="#//feature/ISafetyFunctionAdapter" transient="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TaskInstantiation" eSuperTypes="platform:/resource/org.fortiss.af3.exploration/model/exploration.ecore#//IExplorationFeature"/>
-    <eClassifiers xsi:type="ecore:EClass" name="TaskMapping" eSuperTypes="platform:/resource/org.fortiss.af3.exploration/model/exploration.ecore#//IExplorationFeature"/>
-    <eClassifiers xsi:type="ecore:EDataType" name="ISafetyFunctionAdapter" instanceClassName="org.fortiss.af3.exploration.alg.dse.sysmodel.arch.ISafetyFunctionAdapter"
-        serializable="false"/>
-    <eClassifiers xsi:type="ecore:EDataType" name="IExplorationFeature" instanceClassName="org.fortiss.af3.exploration.alg.feature.IExplorationFeature"/>
-  </eSubpackages>
   <eSubpackages name="parameters" nsURI="http://www.fortiss.org/af3/exploration/moea/parameters"
       nsPrefix="org-fortiss-af3-exploration-moea-parameters">
     <eClassifiers xsi:type="ecore:EEnum" name="ExecutionModel">
@@ -176,13 +165,13 @@
         </eAnnotations>
       </eStructuralFeatures>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="sources" lowerBound="1"
-          upperBound="-1" eType="#//IRequestAdapter">
+          upperBound="-1" eType="#//adapter/IRequestAdapter">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="TODO: write documentation (in the model!)"/>
         </eAnnotations>
       </eStructuralFeatures>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="targets" lowerBound="1"
-          upperBound="-1" eType="#//IResourceAdapter">
+          upperBound="-1" eType="#//adapter/IResourceAdapter">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="TODO: write documentation (in the model!)"/>
         </eAnnotations>
@@ -234,7 +223,7 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="min" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="max" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="requester" lowerBound="1"
-          eType="#//IRequestAdapter"/>
+          eType="#//adapter/IRequestAdapter"/>
       <eGenericSuperTypes eClassifier="#//constraints/InternalConstraint">
         <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
       </eGenericSuperTypes>
@@ -244,7 +233,7 @@
         <details key="documentation" value="{@link InternalConstraint} that defines which sets of {@link IRequestAdapter} may not be deployed together in a single Fault Containment Region."/>
       </eAnnotations>
       <eStructuralFeatures xsi:type="ecore:EReference" name="separatedSets" lowerBound="2"
-          upperBound="-1" eType="#//IRequesterSet"/>
+          upperBound="-1" eType="#//adapter/IRequesterSet"/>
       <eGenericSuperTypes eClassifier="#//constraints/InternalConstraint">
         <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
       </eGenericSuperTypes>
@@ -260,7 +249,7 @@
         </eAnnotations>
       </eOperations>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="requester" lowerBound="1"
-          eType="#//IRequestAdapter"/>
+          eType="#//adapter/IRequestAdapter"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="period" lowerBound="1"
           eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
       <eGenericSuperTypes eClassifier="ecore:EClass platform:/resource/org.fortiss.af3.exploration/model/exploration.ecore#//ExplorationConstraint">
@@ -277,8 +266,8 @@
         </eAnnotations>
       </eOperations>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" lowerBound="1"
-          eType="#//IRequestAdapter"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="end" lowerBound="1" eType="#//IRequestAdapter"/>
+          eType="#//adapter/IRequestAdapter"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="end" lowerBound="1" eType="#//adapter/IRequestAdapter"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="deadline" lowerBound="1"
           eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
       <eGenericSuperTypes eClassifier="ecore:EClass platform:/resource/org.fortiss.af3.exploration/model/exploration.ecore#//ExplorationConstraint">

org.fortiss.af3.exploration.alg/model/moea.genmodel

@@ -11,28 +11,27 @@
   <foreignModel>moea.ecore</foreignModel>
   <genPackages prefix="Moea" basePackage="org.fortiss.af3.exploration.moea" disposableProviderFactory="true"
       ecorePackage="moea.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="moea.ecore#//VoterType_t">
-      <genEnumLiterals ecoreEnumLiteral="moea.ecore#//VoterType_t/MajorityVoter"/>
-    </genEnums>
-    <genDataTypes ecoreDataType="moea.ecore#//IRequestAdapter"/>
-    <genDataTypes ecoreDataType="moea.ecore#//IResourceAdapter"/>
     <genClasses ecoreClass="moea.ecore#//DseSpecification">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute moea.ecore#//DseSpecification/features"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moea.ecore#//DseSpecification/features"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference moea.ecore#//DseSpecification/optimizer"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference moea.ecore#//DseSpecification/parameters"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference moea.ecore#//DseSpecification/targetSpecification"/>
     </genClasses>
-    <genClasses ecoreClass="moea.ecore#//ImplementsComponentRef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference moea.ecore#//ImplementsComponentRef/refComponent"/>
-    </genClasses>
-    <genClasses ecoreClass="moea.ecore#//VoterType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moea.ecore#//VoterType/type"/>
-    </genClasses>
-    <genClasses ecoreClass="moea.ecore#//IRequesterSet">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moea.ecore#//IRequesterSet/entries"/>
-    </genClasses>
+    <nestedGenPackages prefix="Adapter" basePackage="org.fortiss.af3.exploration.moea.model"
+        disposableProviderFactory="true" ecorePackage="moea.ecore#//adapter">
+      <genDataTypes ecoreDataType="moea.ecore#//adapter/IExplorationFeature"/>
+      <genDataTypes ecoreDataType="moea.ecore#//adapter/IRequestAdapter"/>
+      <genDataTypes ecoreDataType="moea.ecore#//adapter/IResourceAdapter"/>
+      <genClasses ecoreClass="moea.ecore#//adapter/IRequesterSet">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moea.ecore#//adapter/IRequesterSet/entries"/>
+      </genClasses>
+    </nestedGenPackages>
     <nestedGenPackages prefix="Annotation" basePackage="org.fortiss.af3.exploration.moea.model"
         disposableProviderFactory="true" ecorePackage="moea.ecore#//annotation">
+      <genClasses ecoreClass="moea.ecore#//annotation/ImplementsComponentRef">
+        <genFeatures notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference moea.ecore#//annotation/ImplementsComponentRef/refComponent"/>
+      </genClasses>
       <genClasses ecoreClass="moea.ecore#//annotation/ComponentDiverseImplRef">
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference moea.ecore#//annotation/ComponentDiverseImplRef/componentRef"/>
@@ -42,17 +41,6 @@
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moea.ecore#//annotation/ReplicationBounds/maxReplication"/>
       </genClasses>
     </nestedGenPackages>
-    <nestedGenPackages prefix="Feature" basePackage="org.fortiss.af3.exploration.moea.model"
-        disposableProviderFactory="true" ecorePackage="moea.ecore#//feature">
-      <genDataTypes ecoreDataType="moea.ecore#//feature/ISafetyFunctionAdapter"/>
-      <genDataTypes ecoreDataType="moea.ecore#//feature/IExplorationFeature"/>
-      <genClasses ecoreClass="moea.ecore#//feature/SafetyExploration">
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EAttribute moea.ecore#//feature/SafetyExploration/adapters"/>
-      </genClasses>
-      <genClasses ecoreClass="moea.ecore#//feature/TaskInstantiation"/>
-      <genClasses ecoreClass="moea.ecore#//feature/TaskMapping"/>
-    </nestedGenPackages>
     <nestedGenPackages prefix="Parameters" basePackage="org.fortiss.af3.exploration.moea.model"
         disposableProviderFactory="true" ecorePackage="moea.ecore#//parameters">
       <genEnums typeSafeEnumCompatible="false" ecoreEnum="moea.ecore#//parameters/ExecutionModel">

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

-ComponentArchitectureFinalizer.java f5c2c4ac9c2cbcf2ed255af93df4e6a2ddb5949d RED
+ComponentArchitectureFinalizer.java c31521bf3c4c2d8703d78ecf2098c562e86e5b93 RED
 ComponentArchitectureInitializer.java 5a005c23b05705e8fac4bd923ec6cae5a1a9feed RED
 ComponentArchitectureInserter.java 847948a7d76a5ddebdc2abc63562e9c0d8cfa1f5 RED
 ComponentArchitectureInstantiator.java 15a4c9ca75fd66fec93714b6626ccc1eb134984d RED

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/comparch/ComponentArchitectureFinalizer.java

@@ -33,8 +33,8 @@ import org.fortiss.af3.exploration.alg.exception.TransformationModuleException;
 import org.fortiss.af3.exploration.alg.guava.SubClassToInstanceMap;
 import org.fortiss.af3.exploration.alg.service.ExplorationTransformationInputs;
 import org.fortiss.af3.exploration.alg.service.IExplorationTransformationService.TransformationContext;
-import org.fortiss.af3.exploration.moea.model.ImplementsComponentRef;
-import org.fortiss.af3.exploration.moea.model.MoeaFactory;
+import org.fortiss.af3.exploration.moea.model.annotation.AnnotationFactory;
+import org.fortiss.af3.exploration.moea.model.annotation.ImplementsComponentRef;
 import org.fortiss.tooling.base.model.element.IModelElementSpecification;
 
 /**
@@ -147,7 +147,7 @@ public class ComponentArchitectureFinalizer
 	private void addImplementsComponentRefSpec(Component element, Component referencedComponent) {
 		List<IModelElementSpecification> specList = element.getSpecifications();
 
-		ImplementsComponentRef refSpec = MoeaFactory.eINSTANCE.createImplementsComponentRef();
+		ImplementsComponentRef refSpec = AnnotationFactory.eINSTANCE.createImplementsComponentRef();
 		refSpec.setRefComponent(referencedComponent);
 
 		specList.add(refSpec);

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

 AF3Utils.java a313de12c1c7f8063e5d01175d543a3bb3039ae3 RED
-DesignSpaceExplorationModelElementFactory.java d44739d13f0858ae20a353c628a415344a0c6dd2 YELLOW
+DesignSpaceExplorationModelElementFactory.java 5f4d886b1d0157650a3c86d2d9975e08d833819f YELLOW
 ExplorationAlgUtils.java e11de79456859d72964fd1f34505b9082d13c979 RED
 ExplorationEcoreUtils.java d816b750378d2bcbd307ff86e121c8d38ef5c28b RED
 ExplorationFeatureUtils.java 83e72806e47f0aa30db9b5dab3fe94f312b288e4 YELLOW

org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/DesignSpaceExplorationModelElementFactory.java

@@ -27,8 +27,9 @@ import org.fortiss.af3.exploration.dsl_v2.model.booleanp.allocation.ILocationExp
 import org.fortiss.af3.exploration.model.ExplorationFactory;
 import org.fortiss.af3.exploration.model.ExplorationSpecification;
 import org.fortiss.af3.exploration.moea.model.DseSpecification;
-import org.fortiss.af3.exploration.moea.model.IRequesterSet;
 import org.fortiss.af3.exploration.moea.model.MoeaFactory;
+import org.fortiss.af3.exploration.moea.model.adapter.AdapterFactory;
+import org.fortiss.af3.exploration.moea.model.adapter.IRequesterSet;
 import org.fortiss.af3.exploration.moea.model.constraints.AssignmentConstraint;
 import org.fortiss.af3.exploration.moea.model.constraints.ConstraintsFactory;
 import org.fortiss.af3.exploration.moea.model.constraints.InternalConstraint;
@@ -231,7 +232,7 @@ public class DesignSpaceExplorationModelElementFactory {
 
 	/** Returns a {@link IRequesterSet} of the given collection of {@link IRequestAdapter}s. */
 	public static IRequesterSet createIRequesterSet(Collection<IRequestAdapter<?>> isoSet) {
-		IRequesterSet retSet = MoeaFactory.eINSTANCE.createIRequesterSet();
+		IRequesterSet retSet = AdapterFactory.eINSTANCE.createIRequesterSet();
 		retSet.getEntries().addAll(isoSet);
 		return retSet;
 	}