Skeleton for report, small solver changes

[co1314.git] / LubbersSolver.java

diff --git a/LubbersSolver.java b/LubbersSolver.java
index bdb4ded..571bb26 100755 (executable)
--- a/LubbersSolver.java
+++ b/LubbersSolver.java
@@ -77,27 +77,15 @@ public class LubbersSolver implements IPetproblemSolver {
                for(int i = 0; i<n; i++){
                        possibilities[i] = i>=m ? -1 : i;
                }
-               if(m<=n){
-                       System.out.println("Wierd shizzleeee");
-                       List<int[]> ps = new LinkedList<int[]>();
-                       permute(possibilities, 0, ps);
-                       for(int[] i : ps){
-                               System.out.println(computeCompatibility(compatibility, i) + ": " + Arrays.toString(i));
-                       }
-                       System.exit(0);
 
-                       return Collections.max(ps, new Comparator<int[]>(){
-                               @Override
-                               public int compare(int[] a, int[] b){
-                                       return computeCompatibility(compatibility, a) - computeCompatibility(compatibility, b);
-                               }
-                       });
-               }
-               else {
-                       System.out.println("not equal...");
-                       return new int[n];
-                       //return null;
-               }
-               
+               List<int[]> ps = new LinkedList<int[]>();
+               permute(possibilities, 0, ps);
+
+               return Collections.max(ps, new Comparator<int[]>(){
+                       @Override
+                       public int compare(int[] a, int[] b){
+                               return computeCompatibility(compatibility, a) - computeCompatibility(compatibility, b);
+                       }
+               });
        }
 }