allow some negative values, also increase penalty

Author: lewin

src/MaxWeightMatching/Matcher.java

@@ -37,6 +37,7 @@ public static void match(Data dat, Weighting waiter) {
     for (int r = 0; r < 2; r++) {
       assign();
     }
+    
     // one more time to make sure all tutors have enough slots
     // this will allow some slots to have more than one person
     // however now all slots can be used
@@ -82,7 +83,7 @@ private static void assign() {
           int j = perm2[k];
           // ignore used slots and any slots a tutor can not make
           double r = w.weight(t[i], s[j]);
-          if (!used[j] && !t[i].conflict(s[j]) && r > 0)
+          if (!used[j] && !t[i].conflict(s[j]) && r > -10)
             updateMatching(i, j + t.length, r);
           // note that this case naturally doesn't let us assign 2
           // of the same slot to one tutor.

src/Schedule/Schedule.java

@@ -116,14 +116,16 @@ public static void main(String[] args) {
       }
 
        double s = 0;
-       {
-       String assign = dat.readableFormattedAssignments();
-       double[] r = Evaluator.evaluate (dat, w, false);
-       double stdmin = r[0], maxhap = r[1];
-       s = r[1];
-       System.out.println(assign);
-       System.out.println(stdmin + " " + maxhap);
-       }
+       do {
+         dat.clearAssignments();
+         Matcher.match(dat, w);
+         String assign = dat.readableFormattedAssignments();
+         double[] r = Evaluator.evaluate (dat, w, false);
+         double stdmin = r[0], maxhap = r[1];
+         s = r[1];
+//         System.out.println(assign);
+         System.out.println(stdmin + " " + maxhap);
+       } while (s < 0);
 
       System.out.println("Swapping");
       // now do some random swapping to make it stable

src/Weighting/Evaluator.java

@@ -11,7 +11,7 @@
 import Items.Tutor;
 
 public class Evaluator {
-  public static final double PENALTY = 1000000;
+  public static final double PENALTY = 10000000;
   public static final double ADJACENT_PREF = 50;
   public static final double ADJACENT_DISPREF = 50;