BugFix for Greedy2p1GAmod, new Main Program, Version stepping

thomasWeise · thomasWeise · commit 0238d5513021 · 2020-01-15T13:34:34.000+08:00
diff --git a/README.md b/README.md
@@ -43,15 +43,15 @@ First, you need to add the following repository, which is a repository that can
 ```
 
 Than you can add the dependency on our `aitoa-code` repository into your `dependencies` section.
-Here, `0.8.21` is the current version of  `aitoa-code`.
+Here, `0.8.22` is the current version of  `aitoa-code`.
 Notice that you may have more dependencies in your `dependencies` section, say on `junit`, but here I just put the one for `aitoa-code` as example.
 
 ```xml
 <dependencies>
   <dependency>
     <groupId>com.github.thomasWeise</groupId>
     <artifactId>aitoa-code</artifactId>
-    <version>0.8.21</version>
+    <version>0.8.22</version>
   </dependency>
 </dependencies>
 ```
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>aitoa</groupId>
 	<artifactId>aitoa-code</artifactId>
-	<version>0.8.21</version>
+	<version>0.8.22</version>
 	<packaging>jar</packaging>
 	<name>aitoa-code</name>
 	<description>Example Source Codes from the Book "Introduction to Optimization Algorithms"</description>
@@ -46,7 +46,7 @@
 		<junit.version>4.13</junit.version>
 		<oshi.version>4.3.0</oshi.version>
 		<slf4j.version>1.7.30</slf4j.version>
-		<project.mainClass>aitoa.examples.jssp.JSSPExperiment</project.mainClass>
+		<project.mainClass>aitoa.utils.logs.PostProcessor</project.mainClass>
 	</properties>
 
 	<licenses>
diff --git a/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmod.java b/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmod.java
@@ -74,8 +74,7 @@ public Greedy2p1GAmod(final int _m) {
 
     // allocate necessary data structures
     final BinomialDistribution binDist =
-        new BinomialDistribution(x.length,
-            ((double) (this.m)) / n);
+        new BinomialDistribution(n, ((double) (this.m)) / n);
     final DiscreteGreaterThanZero dgtzDist =
         new DiscreteGreaterThanZero(binDist);
 
@@ -118,7 +117,7 @@ public Greedy2p1GAmod(final int _m) {
           if (random.nextBoolean()) {
 // if we copy zprime from x, then zprime != y if, well, at least
 // one zprime[i] != y[i]
-            zIsNew = zIsNew | (zprime[i] != y[i]);
+            zIsNew = zIsNew || (zprime[i] != y[i]);
           } else {
 // if we copy zprime from y, then zprime != x if, well, at least
 // one zprime[i] != x[i] (which means it must be different from
@@ -196,25 +195,29 @@ public Greedy2p1GAmod(final int _m) {
 // No, we are unlucky: The bit sequences toggled now equal either
 // those in x or y, so we need to do a full compare.
           check: {
-            if (!zNEQx) { // maybe (element-wise) z==x, so
-                          // compare
-              for (int i = n; (--i) >= 0;) {
-                if (z[i] != x[i]) {
-                  break; // found mismatch
+            checkX: {
+              if (!zNEQx) {
+// maybe (element-wise) z==x, so compare
+                for (int i = n; (--i) >= 0;) {
+                  if (z[i] != x[i]) {
+                    break checkX; // found mismatch
+                  }
                 }
-              }
 // no mismatch, i.e., (element-wise) z==x, so we can stop here
-              break check;
+                break check;
+              }
             }
 // if we get here, z!=x (otherwise we would have done break)
-            if (!zNEQy) { // maybe z==y
-              for (int i = n; (--i) >= 0;) {
-                if (z[i] != y[i]) {
-                  break; // found mismatch
+            checkY: {
+              if (!zNEQy) { // maybe z==y
+                for (int i = n; (--i) >= 0;) {
+                  if (z[i] != y[i]) {
+                    break checkY; // found mismatch
+                  }
                 }
-              }
 // no mismatch, i.e., (element-wise) z==y, so we can stop here
-              break check;
+                break check;
+              }
             }
 // if we get here, z!=x and z!=y (element-wise)
             zIsNew = true;
diff --git a/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmodFFA.java b/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmodFFA.java
@@ -90,8 +90,7 @@ public Greedy2p1GAmodFFA(final int _m, final int _UB) {
 
     // allocate necessary data structures
     final BinomialDistribution binDist =
-        new BinomialDistribution(x.length,
-            ((double) (this.m)) / n);
+        new BinomialDistribution(n, ((double) (this.m)) / n);
     final DiscreteGreaterThanZero dgtzDist =
         new DiscreteGreaterThanZero(binDist);
 
@@ -136,7 +135,7 @@ public Greedy2p1GAmodFFA(final int _m, final int _UB) {
           if (random.nextBoolean()) {
 // if we copy zprime from x, then zprime != y if, well, at least
 // one zprime[i] != y[i]
-            zIsNew = zIsNew | (zprime[i] != y[i]);
+            zIsNew = zIsNew || (zprime[i] != y[i]);
           } else {
 // if we copy zprime from y, then zprime != x if, well, at least
 // one zprime[i] != x[i] (which means it must be different from
@@ -214,25 +213,29 @@ public Greedy2p1GAmodFFA(final int _m, final int _UB) {
 // No, we are unlucky: The bit sequences toggled now equal either
 // those in x or y, so we need to do a full compare.
           check: {
-            if (!zNEQx) { // maybe (element-wise) z==x, so
-                          // compare
-              for (int i = n; (--i) >= 0;) {
-                if (z[i] != x[i]) {
-                  break; // found mismatch
+            checkX: {
+              if (!zNEQx) {
+// maybe (element-wise) z==x, so compare
+                for (int i = n; (--i) >= 0;) {
+                  if (z[i] != x[i]) {
+                    break checkX; // found mismatch
+                  }
                 }
-              }
 // no mismatch, i.e., (element-wise) z==x, so we can stop here
-              break check;
+                break check;
+              }
             }
 // if we get here, z!=x (otherwise we would have done break)
-            if (!zNEQy) { // maybe z==y
-              for (int i = n; (--i) >= 0;) {
-                if (z[i] != y[i]) {
-                  break; // found mismatch
+            checkY: {
+              if (!zNEQy) { // maybe z==y
+                for (int i = n; (--i) >= 0;) {
+                  if (z[i] != y[i]) {
+                    break checkY; // found mismatch
+                  }
                 }
-              }
 // no mismatch, i.e., (element-wise) z==y, so we can stop here
-              break check;
+                break check;
+              }
             }
 // if we get here, z!=x and z!=y (element-wise)
             zIsNew = true;
diff --git a/src/main/java/aitoa/utils/logs/PostProcessor.java b/src/main/java/aitoa/utils/logs/PostProcessor.java
@@ -0,0 +1,68 @@
+package aitoa.utils.logs;
+
+import aitoa.utils.Configuration;
+import aitoa.utils.ConsoleIO;
+
+/** The entry point for post-processing the data */
+public class PostProcessor {
+
+  /**
+   * The main routine
+   *
+   * @param args
+   *          the command line arguments
+   */
+  public static final void main(final String[] args) {
+    final Class<?>[] classes = { //
+        EndResults.class, //
+        EndResultStatistics.class, //
+        ErtEcdf.class, //
+        IOHProfiler.class,//
+    };
+
+    final String[] choices = new String[classes.length];
+    for (int i = classes.length; (--i) >= 0;) {
+      choices[i] = classes[i].getSimpleName();
+    }
+
+    final String choice = "choice";//$NON-NLS-1$
+
+    ConsoleIO.stdout((s) -> {
+      s.println("Welcome to the AITOA Result Post-Processor"); //$NON-NLS-1$
+      for (final String c : choices) {
+        s.print(" -choice=");//$NON-NLS-1$
+        s.print(c);
+        s.print(": execute the ");//$NON-NLS-1$
+        s.print(c);
+        s.println(" utility.");//$NON-NLS-1$
+      }
+    });
+
+    Configuration.putCommandLine(args);
+    final String selected = Configuration.getString(choice);
+    if (selected != null) {
+      Class<?> taken = null;
+      for (int i = choices.length; (--i) >= 0;) {
+        if (choices[i].equalsIgnoreCase(selected)) {
+          taken = classes[i];
+          break;
+        }
+      }
+
+      if (taken == null) {
+        ConsoleIO.stdout(
+            '\'' + selected + "' is not a valid choice.");//$NON-NLS-1$
+        return;
+      }
+
+      try {
+        taken.getMethod("main", String[].class)//$NON-NLS-1$
+            .invoke(null, ((Object) (args)));
+      } catch (final Throwable error) {
+        ConsoleIO.stderr("Error when invoking the '"//$NON-NLS-1$
+            + selected + "' tool.", //$NON-NLS-1$
+            error);
+      }
+    }
+  }
+}
