some more updates

Author: lewin

src/Items/Data.java

@@ -85,6 +85,17 @@ public String formattedAssignments() {
       return jason.toString();
     }
 
+    public String readableFormattedAssignments() {
+      String ret = "";
+      for (Slot s : slots) {
+        ret += s.details();
+        for (int i = 0; i < s.tutors.size(); i++)
+          ret += " " + String.valueOf(s.tutors.get(i).name);
+        ret += "\n";
+      }
+      return ret.trim();
+    }
+    
     public void clearAssignments() {
         for (int i = 0; i < tutors.length; i++)
             tutors[i].slots = new ArrayList <Slot> ();

src/MaxWeightMatching/Matcher.java

@@ -47,6 +47,17 @@ public static void match(Data dat, Weighting waiter) {
         assign();
     }
 
+    private static void makeRandomPerm(int[] perm) {
+      for (int i = 0; i < perm.length; i++) {
+        perm [i] = i;
+        int j = (int)(Math.random() * (i + 1));
+        if (j == i) continue;
+        perm [i] ^= perm [j];
+        perm [j] ^= perm [i];
+        perm [i] ^= perm [j];
+    }
+    }
+    
     private static void assign() {
         // initialize graph
         g = new Graph(n);
@@ -56,24 +67,9 @@ private static void assign() {
         Arrays.fill(partner, -1);
 
         int [] perm = new int [t.length];
-        for (int i = 0; i < perm.length; i++) {
-            perm [i] = i;
-            int j = (int)(Math.random() * (i + 1));
-            if (j == i) continue;
-            perm [i] ^= perm [j];
-            perm [j] ^= perm [i];
-            perm [i] ^= perm [j];
-        }
-        
         int [] perm2 = new int [s.length];
-        for (int i = 0; i < perm2.length; i++) {
-            perm2 [i] = i;
-            int j = (int)(Math.random() * (i + 1));
-            if (j == i) continue;
-            perm2 [i] ^= perm2 [j];
-            perm2 [j] ^= perm2 [i];
-            perm2 [i] ^= perm2 [j];
-        }
+        makeRandomPerm(perm);
+        makeRandomPerm(perm2);
 
         for (int b = 0; b < t.length; b++) {
             int i = perm[b];

src/Schedule/Schedule.java

@@ -119,15 +119,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, true);
-                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.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);
+//            }
 
             System.out.println ("Swapping");
             // now do some random swapping to make it stable
@@ -149,17 +149,17 @@ public static void main(String[] args) {
 
             if (options.has("output")) {
                 PrintWriter fout = new PrintWriter(fileout.value(options));
-                fout.println(dat.assignments());
+                fout.println(dat.formattedAssignments());
                 fout.close();
             } else {
-                String assign = dat.formattedAssignments();
-                double[] r = Evaluator.evaluate (dat, w, true);
-                double stdmin = r[0], maxhap = r[1];
-                System.out.println(assign);
-                System.out.println(stdmin + " " + maxhap);
-                System.out.println (maxhap - s);
+//                String assign = dat.formattedAssignments();
+//                double[] r = Evaluator.evaluate (dat, w, true);
+//                double stdmin = r[0], maxhap = r[1];
+//                System.out.println(assign);
+//                System.out.println(stdmin + " " + maxhap);
+//                System.out.println (maxhap - s);
             }
-            
+            System.out.println ("DONE");
         } catch (IOException e) {
             e.printStackTrace();
         } catch (Exception e) {

test/o.json

@@ -0,0 +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":[]}