Reactivated PESA2 and PAES in MoeaOptimisationAlgorithmProvider

SoSyM2021info.txt

@@ -0,0 +1,2 @@
+This branch represents the MDEO version used to perform experiments for the following SoSyM2021 paper:
+https://github.com/Leative/SoSyM21-MDO-framework-evaluation-extended

build/maven/build.xml

@@ -7,7 +7,9 @@
     <target name="dist" depends="render.maven.properties.template, maven.build"/>
 
     <target name="maven.build">
-        <exec dir="." executable="mvn" failifexecutionfails="true" failonerror="true">
+        <exec dir="." executable="cmd" failifexecutionfails="true" failonerror="true">
+			<arg value="/c"/>
+			<arg value="mvn"/>
             <arg value="clean" />
             <arg value="deploy" />
             <arg value="--quiet" />
@@ -20,8 +22,10 @@
     <target name="load-build-version">
 
       <echo message="Updating version string from Git"/>
-      <exec executable="git" outputproperty="ant.build.branch"
+      <exec executable="cmd" outputproperty="ant.build.branch"
               failifexecutionfails="true">
+			  <arg value="/c"/>
+			  <arg value="git"/>
               <arg value="rev-parse"/>
               <arg value="--short"/>
               <arg value="HEAD" />

build/maven/template/pom.xml.template

@@ -147,6 +147,23 @@
     								<ignore></ignore>
     							</action>
     						</pluginExecution>
+							<pluginExecution>
+    							<pluginExecutionFilter>
+    								<groupId>
+    									com.coveo
+    								</groupId>
+    								<artifactId>
+    									fmt-maven-plugin
+    								</artifactId>
+    								<versionRange>[2.8,)</versionRange>
+    								<goals>
+    									<goal>format</goal>
+    								</goals>
+    							</pluginExecutionFilter>
+    							<action>
+    								<ignore></ignore>
+    							</action>
+    						</pluginExecution>
     					</pluginExecutions>
     				</lifecycleMappingMetadata>
     			</configuration>

dependencies.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project name="dependencies" default="depend.all">
-    <dirname property="dependencies.basedir" file="${ant.file.dependencies}"/>
+    <!--<dirname property="dependencies.basedir" file="${ant.file.dependencies}"/>-->
+	<dirname property="dependencies.basedir.raw" file="${ant.file.dependencies}"/>
+	<path id="dependencies.basedir.path">
+		<pathelement path="${dependencies.basedir.raw}" />
+	</path>
+	<pathconvert targetos="unix" property="dependencies.basedir" refid="dependencies.basedir.path"/>
 
     <!-- ================================================================== -->
     <target name="depend.all" depends="depend.maven, depend.eclipse">

interfaces/eclipse/build.xml

@@ -7,7 +7,9 @@
     <target name="dist" depends="maven.build"/>
 
     <target name="maven.build" depends="render.target.template">
-        <exec dir="." executable="mvn" failifexecutionfails="true" failonerror="true">
+        <exec dir="." executable="cmd" failifexecutionfails="true" failonerror="true">
+			<arg value="/c"/>
+			<arg value="mvn"/>
             <arg value="-f" />
             <arg value="src/pom.xml"/>
             <arg value="clean" />

languages/mopt/xtext/pom.xml

@@ -167,9 +167,7 @@
 										</versionRange>
 										<goals>
 											<goal>add-resource</goal>
-											<goal>add-source</goal>
 											<goal>add-test-resource</goal>
-											<goal>add-test-source</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>

libraries/core/src/main/java/uk/ac/kcl/inf/mdeoptimiser/libraries/core/optimisation/moea/MoeaFrameworkAlgorithmConfiguration.java

@@ -65,9 +65,9 @@ public Properties loadProperties() {
                   .getNumeric()));
     }
 
-    populateNumericParameter(
+    populateIntegerParameter(
         properties, this.solverSpec.getAlgorithm().getParameters(), "archive.size");
-    populateNumericParameter(
+    populateIntegerParameter(
         properties, this.solverSpec.getAlgorithm().getParameters(), "bisections");
 
     properties.put("solutionGenerator", solutionGenerator);
@@ -89,10 +89,11 @@ public Properties loadProperties() {
    * @param parameters
    * @param parameterKey
    */
-  private void populateNumericParameter(
+  private void populateIntegerParameter(
       Properties properties, EList<Parameter> parameters, String parameterKey) {
     var parameter = parameters.stream().filter(p -> p.getName().equals(parameterKey)).findFirst();
-    parameter.ifPresent(p -> properties.put(parameterKey, p.getValue().getNumeric()));
+    parameter.ifPresent(
+        p -> properties.put(parameterKey, Integer.parseInt(p.getValue().getNumeric())));
   }
 
   /**

libraries/core/src/main/java/uk/ac/kcl/inf/mdeoptimiser/libraries/core/optimisation/moea/algorithms/MoeaOptimisationAlgorithmProvider.java

@@ -25,6 +25,7 @@ public Algorithm getAlgorithm(String algorithm, Properties properties, Problem p
         break;
       case "SMSMOEA":
         this.algorithm = createSMSMOEA(problem, properties);
+        break;
       case "IBEA":
         this.algorithm = createIBEA(problem, properties);
         break;
@@ -33,10 +34,13 @@ public Algorithm getAlgorithm(String algorithm, Properties properties, Problem p
         break;
       case "VEGA":
         this.algorithm = createVEGA(problem, properties);
+        break;
       case "PESA2":
         this.algorithm = createPESA2(problem, properties);
+        break;
       case "PAES":
         this.algorithm = createPAES(problem, properties);
+        break;
       case "RANDOM":
         this.algorithm = createRandom(problem, properties);
       default:
@@ -175,9 +179,8 @@ public Algorithm createIBEA(Problem problem, Properties properties) {
   }
 
   public Algorithm createPESA2(Problem problem, Properties properties) {
-
-    var bisections = 0;
-    var archiveSize = 0;
+    var bisections = (Integer) properties.get("bisections");
+    var archiveSize = (Integer) properties.get("archive.size");
 
     return new PESA2(
         problem,
@@ -192,12 +195,7 @@ public Algorithm createPAES(Problem problem, Properties properties) {
     var bisections = (Integer) properties.get("bisections");
     var archiveSize = (Integer) properties.get("archive.size");
 
-    return new PESA2(
-        problem,
-        getVariation(properties),
-        getRandomInitialization(problem, properties),
-        bisections,
-        archiveSize);
+    return new PAES(problem, getVariation(properties), bisections, archiveSize);
   }
 
   public Algorithm createRandom(Problem problem, Properties properties) {

libraries/core/src/main/java/uk/ac/kcl/inf/mdeoptimiser/libraries/core/optimisation/output/descriptors/SystemInformationDescriptor.java

@@ -35,7 +35,7 @@ public void generateDescription(
       batchWriter.println();
       batchWriter.write(getJavaVersion());
       batchWriter.println();
-      batchWriter.write(getHardwareInfo());
+      //   batchWriter.write(getHardwareInfo());
       batchWriter.close();
 
     } catch (IOException e) {