fixed missing bounds in JSSPMakespanObjectiveFunction2

Author: thomasWeise

README.md

@@ -44,15 +44,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.73` is the current version of `aitoa-code`.
+Here, `0.8.74` 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.73</version>
+    <version>0.8.74</version>
   </dependency>
 </dependencies>
 ```

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>aitoa</groupId>
 	<artifactId>aitoa-code</artifactId>
-	<version>0.8.73</version>
+	<version>0.8.74</version>
 	<packaging>jar</packaging>
 	<name>aitoa-code</name>
 	<description>Example Source Codes from the Book "Introduction to Optimization Algorithms"</description>

src/main/java/aitoa/examples/jssp/JSSPMakespanObjectiveFunction.java

@@ -75,12 +75,11 @@ public double evaluate(final JSSPCandidateSolution y) {
    * Journal of Operational Research, 64.2: 278-285, 1993. doi:
    * 10.1016/0377-2217(93)90182-M
    *
+   * @param inst
+   *          the instance
    * @return the lower bound
    */
-  @Override
-  public double lowerBound() {
-    final JSSPInstance inst = this.instance;
-
+  static int lowerBound(final JSSPInstance inst) {
     final int[] a = new int[inst.m]; // lb inactive time at start
     final int[] b = new int[inst.m]; // lb inactive time at end
     final int[] T = new int[inst.m]; // time of machine
@@ -134,15 +133,29 @@ public double lowerBound() {
   }
 
   /**
-   * Compute the upper bound of the instance in a very sloppy
-   * way. This is just a placeholder for now. The idea is that I
-   * can use this in unit tests to check whether results are
-   * sane.
+   * Compute the lower bound of the objective value. See E. D.
+   * Taillard. Benchmarks for basic scheduling problems. European
+   * Journal of Operational Research, 64.2: 278-285, 1993. doi:
+   * 10.1016/0377-2217(93)90182-M
+   *
+   * @return the lower bound
    */
   @Override
-  public double upperBound() {
+  public double lowerBound() {
+    return JSSPMakespanObjectiveFunction.lowerBound(//
+        this.instance);
+  }
+
+  /**
+   * Compute the upper bound for the instance
+   *
+   * @param inst
+   *          the instance
+   * @return the upper bound
+   */
+  static int upperBound(final JSSPInstance inst) {
     int sum = 0;
-    for (final int[] job : this.instance.jobs) {
+    for (final int[] job : inst.jobs) {
       for (int i = job.length - 1; i > 0; i -= 2) {
         sum = Math.addExact(sum, job[i]);
       }
@@ -155,6 +168,18 @@ public double upperBound() {
     return sum;
   }
 
+  /**
+   * Compute the upper bound of the instance in a very sloppy
+   * way. This is just a placeholder for now. The idea is that I
+   * can use this in unit tests to check whether results are
+   * sane.
+   */
+  @Override
+  public double upperBound() {
+    return JSSPMakespanObjectiveFunction.upperBound(//
+        this.instance);
+  }
+
 // start relevant
 }
 // end relevant

src/main/java/aitoa/examples/jssp/JSSPMakespanObjectiveFunction2.java

@@ -102,4 +102,31 @@ public double evaluate(final int[] y) {
     }
     return end;
   }
+
+  /**
+   * Compute the lower bound of the objective value. See E. D.
+   * Taillard. Benchmarks for basic scheduling problems. European
+   * Journal of Operational Research, 64.2: 278-285, 1993. doi:
+   * 10.1016/0377-2217(93)90182-M
+   *
+   * @return the lower bound
+   */
+  @Override
+  public double lowerBound() {
+    return JSSPMakespanObjectiveFunction.lowerBound(//
+        this.instance);
+  }
+
+  /**
+   * Compute the upper bound of the instance in a very sloppy
+   * way. This is just a placeholder for now. The idea is that I
+   * can use this in unit tests to check whether results are
+   * sane.
+   */
+  @Override
+  public double upperBound() {
+    return JSSPMakespanObjectiveFunction.upperBound(//
+        this.instance);
+  }
+
 }