different JSSP Experiment setups

thomasWeise · Mar 11, 2020 · 2a11175 · 2a11175
1 parent 46e8cc3
commit 2a11175
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/main/java/aitoa/examples/jssp/EJSSPExperimentStage.java b/src/main/java/aitoa/examples/jssp/EJSSPExperimentStage.java
@@ -146,10 +146,15 @@ public void configureBuilder(final BlackBoxProcessBuilder<
         getAlgorithms(//
             final JSSPMakespanObjectiveFunction problem) {
       return Stream.concat(//
-          EJSSPExperimentStage._eas(new int[] { 128, 256, 512,
-              1024, 2048, 4096, 8192, 16384 },
-              new double[] { 0 }, false), //
-          EJSSPExperimentStage._eas(null, null, true));
+          EJSSPExperimentStage._eas(//
+              new int[] { 128, 256, 512, 1024, 2048, 4096,
+                  8192 }, //
+              new double[] { 0, 0.05, 0.3 }, //
+              false), //
+          EJSSPExperimentStage._eas(//
+              new int[] { 128, 256, 512, 1024, }, //
+              new double[] { 0, 0.05, 0.3 }, //
+              true));
     }
 
     /**
@@ -565,7 +570,9 @@ public void configureBuilderForProblem(
       for (final double cr : ((crossoverRates == null)
           ? new double[] { 0d, 0.05d, 0.3d } : crossoverRates)) {
         list.add(() -> new EA<>(cr, ps, ps));
-        list.add(() -> new EAWithPruning<>(cr, ps, ps));
+        if (withPruning) {
+          list.add(() -> new EAWithPruning<>(cr, ps, ps));
+        }
       }
     }
 
@@ -646,18 +653,12 @@ public void configureBuilderForProblem(
         () -> new MAWithPruning<>(64, 64, 100), //
         //
         () -> new MA<>(1024, 1024, Integer.MAX_VALUE), //
-        () -> new MAWithPruning<>(1024, 1024, Integer.MAX_VALUE), //
         () -> new MA<>(1024, 1024, 10), //
-        () -> new MAWithPruning<>(1024, 1024, 10), //
         () -> new MA<>(1024, 1024, 100), //
-        () -> new MAWithPruning<>(1024, 1024, 100), //
         //
         () -> new MA<>(4096, 4096, Integer.MAX_VALUE), //
-        () -> new MAWithPruning<>(4096, 4096, Integer.MAX_VALUE), //
         () -> new MA<>(4096, 4096, 10), //
-        () -> new MAWithPruning<>(4096, 4096, 10), //
-        () -> new MA<>(4096, 4096, 100), //
-        () -> new MAWithPruning<>(4096, 4096, 100) //
+        () -> new MA<>(4096, 4096, 100) //
     );
   }
 }