playing around with some numbers

Author: lewin

src/Schedule/Schedule.java

@@ -115,15 +115,15 @@ public static void main(String[] args) {
         System.out.println(dat.tutors[i].name + " " + c / 2);
       }
 
-      // double s = 0;
-      // {
-      // String assign = dat.formattedAssignments();
-      // 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);
-      // }
+       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);
+       }
 
       System.out.println("Swapping");
       // now do some random swapping to make it stable
@@ -156,6 +156,8 @@ public static void main(String[] args) {
         // System.out.println (maxhap - s);
       }
       System.out.println("DONE");
+      System.out.println(dat.readableFormattedAssignments());
+      System.out.println (Arrays.toString(Evaluator.evaluate(dat, w, true)));
     } catch (IOException e) {
       e.printStackTrace();
     } catch (Exception e) {

src/Swapper/Swapper.java

@@ -14,7 +14,7 @@ public class Swapper {
   public static Random rand;
 
   public static void stabilize(Data dat, Weighting w) {
-    stabilize(dat, w, dat.tutors.length * 50000, 1e-10);
+    stabilize(dat, w, dat.tutors.length * 100000, 1e-10);
   }
 
   public static void stabilize(Data dat, Weighting w, int iter, double thresh) {

src/Weighting/Evaluator.java

@@ -44,7 +44,7 @@ public static double[] evaluate(Data assign, Weighting w, boolean print) {
       for (Slot s : temp) {
         d += w.weight(t, s);
         if (t.timeSlots[s.sid] == 0) {
-          score -= PENALTY * 100;
+          score -= PENALTY;
           // System.out.println ("A");
           continue outer;
         }
@@ -76,7 +76,7 @@ public static double[] evaluate(Data assign, Weighting w, boolean print) {
           ok = true;
       }
       if (!ok)
-        score -= PENALTY;
+        score -= 100 * PENALTY;
     }
     double ave = score / (double) scores.length;
     double std = 0;

test/o.json

@@ -1 +1 @@
-{"121":[1065],"122":[1099],"123":[939],"124":[1063],"125":[1225],"126":[1253],"127":[],"128":[939],"129":[1228],"130":[1065],"131":[1228],"132":[1054],"133":[],"134":[],"135":[1231],"136":[1253,1099],"137":[],"138":[1063],"139":[],"140":[1351],"141":[],"142":[1054],"143":[944],"144":[1074],"145":[1231],"146":[1227],"147":[944],"148":[1074],"149":[918],"150":[1237],"151":[1351],"152":[754],"153":[1215],"154":[768],"155":[754],"156":[1103],"157":[],"158":[908],"159":[918],"160":[1215],"161":[1072],"162":[923],"163":[],"164":[768],"165":[923],"166":[1103],"167":[1227],"168":[1071],"169":[],"170":[908],"171":[1072],"172":[1237],"173":[942],"174":[1071],"175":[],"176":[],"177":[942],"178":[1225],"179":[],"180":[]}
+{"121":[1074],"122":[754],"123":[944],"124":[1326],"125":[1264],"126":[1054],"127":[1071],"128":[1325],"129":[1099],"130":[1237],"131":[942],"132":[1215],"133":[944],"134":[942],"135":[1351],"136":[1215],"137":[1071],"138":[923],"139":[1072],"140":[1351],"141":[1065],"142":[1337],"143":[1224],"144":[1237],"145":[1228],"146":[1325],"147":[1224],"148":[939],"149":[1231],"150":[1225,1264],"151":[768],"152":[1337],"153":[918],"154":[1103],"155":[1361],"156":[1227,1103],"157":[1072],"158":[1361],"159":[1231],"160":[1227],"161":[768],"162":[939],"163":[918],"164":[1054],"165":[1065],"166":[923,1063],"167":[1323],"168":[1233],"169":[1228],"170":[754,1253],"171":[908],"172":[1063],"173":[1323],"174":[1225],"175":[1099],"176":[1074],"177":[1326],"178":[1233],"179":[908],"180":[1253]}