Extract XLSX common code from conference scheduling example

kiegroup · May 25, 2018 · 9d68792 · 9d68792
1 parent 3bba38d
commit 9d68792
Show file tree

Hide file tree

Showing 18 changed files with 517 additions and 363 deletions.
diff --git a/optaplanner-examples/data/conferencescheduling/unsolved/108talks-18timeslots-10rooms.xlsx b/optaplanner-examples/data/conferencescheduling/unsolved/108talks-18timeslots-10rooms.xlsx
diff --git a/optaplanner-examples/data/conferencescheduling/unsolved/18talks-6timeslots-5rooms.xlsx b/optaplanner-examples/data/conferencescheduling/unsolved/18talks-6timeslots-5rooms.xlsx
diff --git a/optaplanner-examples/data/conferencescheduling/unsolved/216talks-18timeslots-20rooms.xlsx b/optaplanner-examples/data/conferencescheduling/unsolved/216talks-18timeslots-20rooms.xlsx
diff --git a/optaplanner-examples/data/conferencescheduling/unsolved/36talks-12timeslots-5rooms.xlsx b/optaplanner-examples/data/conferencescheduling/unsolved/36talks-12timeslots-5rooms.xlsx
diff --git a/optaplanner-examples/data/conferencescheduling/unsolved/72talks-12timeslots-10rooms.xlsx b/optaplanner-examples/data/conferencescheduling/unsolved/72talks-12timeslots-10rooms.xlsx
diff --git a/...s/src/main/java/org/optaplanner/examples/common/persistence/AbstractSolutionImporter.java b/...s/src/main/java/org/optaplanner/examples/common/persistence/AbstractSolutionImporter.java
@@ -19,13 +19,10 @@
 import java.io.File;
 import java.math.BigInteger;
 import java.math.RoundingMode;
-import java.util.Arrays;
 
 import com.google.common.math.BigIntegerMath;
 import org.optaplanner.core.api.domain.solution.PlanningSolution;
 import org.optaplanner.examples.common.app.LoggingMain;
-import org.optaplanner.examples.common.business.ProblemFileComparator;
-import org.optaplanner.persistence.common.api.domain.solution.SolutionFileIO;
 
 /**
  * @param <Solution_> the solution type, the class with the {@link PlanningSolution} annotation
@@ -49,18 +46,18 @@ public boolean isInputFileDirectory() {
 
     public static abstract class InputBuilder extends LoggingMain {
 
-        public static BigInteger factorial(int base) {
+    }
-            if (base > 100000) {
-                // Calculation takes too long
-                return null;
-            }
-            BigInteger value = BigInteger.ONE;
-            for (int i = 1; i <= base; i++) {
-                value = value.multiply(BigInteger.valueOf(i));
-            }
-            return value;
-        }
 
+    public static BigInteger factorial(int base) {
+        if (base > 100000) {
+            // Calculation takes too long
+            return null;
+        }
+        BigInteger value = BigInteger.ONE;
+        for (int i = 1; i <= base; i++) {
+            value = value.multiply(BigInteger.valueOf(i));
+        }
+        return value;
     }
 
     public static String getFlooredPossibleSolutionSize(BigInteger possibleSolutionSize) {