Merge branch 'master' of https://git.fortiss.org/af3/exploration-alg

into 3337

Conflicts:
	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/comparch/.ratings
	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/.ratings
	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/DeploymentFinalizer.java
	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings
	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3SystemModelAdapter.java
	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/.ratings
	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/.ratings
	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/TransformationUtils.java


Signed-off-by: Simon Barner <barner@fortiss.org>

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

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-core-SNAPSHOT-20190111.jar" sourcepath="lib/opt4j/opt4j-core-SNAPSHOT-20190111-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.af3.exploration.alg/lib/opt4j/opt4j-core-SNAPSHOT-20190111-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-operators-SNAPSHOT-20190111.jar" sourcepath="lib/opt4j/opt4j-operators-SNAPSHOT-20190111-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.af3.exploration.alg/lib/opt4j/opt4j-operators-SNAPSHOT-20190111-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-optimizers-SNAPSHOT-20190111.jar" sourcepath="lib/opt4j/opt4j-optimizers-SNAPSHOT-20190111-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.af3.exploration.alg/lib/opt4j/opt4j-optimizers-SNAPSHOT-20190111-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-core-v3.2-36-g53be465-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-operators-v3.2-36-g53be465-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-optimizers-v3.2-36-g53be465-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/guava-25.1-jre.jar" sourcepath="lib/guava-25.1-jre-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/byte-buddy-1.8.17.jar" sourcepath="lib/byte-buddy-1.8.17-sources.jar"/>
 	<classpathentry kind="lib" path="lib/commons-collections4-4.1.jar">
@@ -25,7 +13,11 @@
 			<accessrule kind="nonaccessible" pattern="*"/>
 		</accessrules>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="generated-src"/>

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

@@ -16,9 +16,9 @@ Bundle-ClassPath: .,
  lib/jfreechart-1.0.19.jar,
  lib/jcommon-1.0.23.jar,
  lib/guava-25.1-jre.jar,
- lib/opt4j/opt4j-core-SNAPSHOT-20190111.jar,
- lib/opt4j/opt4j-operators-SNAPSHOT-20190111.jar,
- lib/opt4j/opt4j-optimizers-SNAPSHOT-20190111.jar
+ lib/opt4j/opt4j-core-v3.2-36-g53be465-SNAPSHOT.jar,
+ lib/opt4j/opt4j-operators-v3.2-36-g53be465-SNAPSHOT.jar,
+ lib/opt4j/opt4j-optimizers-v3.2-36-g53be465-SNAPSHOT.jar
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

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

@@ -16,9 +16,9 @@ bin.includes = .,\
                lib/jfreechart-1.0.19.jar,\
                lib/jcommon-1.0.23.jar,\
                lib/guava-25.1-jre.jar,\
-               lib/opt4j/opt4j-core-SNAPSHOT-20190111.jar,\
-               lib/opt4j/opt4j-operators-SNAPSHOT-20190111.jar,\
-               lib/opt4j/opt4j-optimizers-SNAPSHOT-20190111.jar
+               lib/opt4j/opt4j-core-v3.2-36-g53be465-SNAPSHOT.jar,\
+               lib/opt4j/opt4j-operators-v3.2-36-g53be465-SNAPSHOT.jar,\
+               lib/opt4j/opt4j-optimizers-v3.2-36-g53be465-SNAPSHOT.jar
 source.. = src/, \
            generated-src
 output.. = build/

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

-Opt4JDseTask.java b5cb9e664e7a8fc2b5157bcdcaca740c2fa85336 YELLOW
-Opt4JDseTaskProvider.java b331b9b75b8893f8baf9f0326f0dfd7c1e57175a YELLOW
-Opt4JExplorationSolutionTransformer.java 9c5124210fff60c833c2d390bb4a09b9ace639ff RED
-Opt4JExplorerBackend.java e9b27d72a1c680a7db1043d00c66ed9f4a6aea5a RED
+Opt4JDseTask.java b5cb9e664e7a8fc2b5157bcdcaca740c2fa85336 YELLOW
+Opt4JDseTaskProvider.java b331b9b75b8893f8baf9f0326f0dfd7c1e57175a YELLOW
+Opt4JExplorationSolutionTransformer.java 9c5124210fff60c833c2d390bb4a09b9ace639ff RED
+Opt4JExplorerBackend.java 8d74894b1f0c5f8646fad069168acb801a3ea685 RED

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

@@ -209,20 +209,20 @@ public class Opt4JExplorerBackend extends ExplorerBackendBase<EAOptimizer> {
 		EvolutionaryAlgorithmModule eaModule = new EvolutionaryAlgorithmModule();
 		// Fix values.
 		eaModule.setGenerations(eaParameters.getIterations());
-		eaModule.setAlpha(eaParameters.getAlpha());
+		eaModule.setPopulationSize(eaParameters.getAlpha());
 		eaModule.setCrossoverRate(0.3);
 		// Derived values if not set by a user.
 		if(eaParameters.getLambda() != null) {
-			eaModule.setLambda(eaParameters.getLambda());
+			eaModule.setOffspringsPerGeneration(eaParameters.getLambda());
 		} else {
 			// First five iterations using only created (non-modified) genotypes.
-			eaModule.setLambda(eaModule.getAlpha() / 5);
+			eaModule.setOffspringsPerGeneration(eaModule.getPopulationSize() / 5);
 		}
 		if(eaParameters.getMu() != null) {
-			eaModule.setMu(eaParameters.getMu());
+			eaModule.setParentsPerGeneration(eaParameters.getMu());
 		} else {
 			// Support Elitism.
-			eaModule.setMu(eaModule.getLambda() / 2);
+			eaModule.setParentsPerGeneration(eaModule.getOffspringsPerGeneration() / 2);
 		}
 		return eaModule;
 	}

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

-ArchExpSubEncoding.java 0cd944e97251e7e37e06400b104bc3158f5ee30e RED
-ArchitectureExplorationEncoding.java 46a75df5748cbc671944bbe3b31ddf20c9248ff8 RED
 MappingEncoding.java 6dfb92ac9910ab6c6e112abbc6973411e44f0c4e YELLOW
-MappingEntryBase.java 6c8e8c59126d3d381fc98284f2ce2bef469b0b4d RED
+MappingEntryBase.java 5f825298d21edaac213c7fe7aaf632a6de5b0d1c RED