start of new file

[IRC.git] / Robust / src / Main / Main.java

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index be373de837c9eb99a358b3406af145d567923b95..e218d333aa46ea1060175e2276071f4dc2c8ff54 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -173,6 +173,7 @@ public class Main {
       } else if (state.DSM) {
          readSourceFile(state, ClassLibraryPrefix+"ThreadDSM.java");
          readSourceFile(state, ClassLibraryPrefix+"ObjectJavaDSM.java");
+         readSourceFile(state, ClassLibraryPrefix+"Barrier.java");
       } else {
          if (state.THREAD) {
              readSourceFile(state, ClassLibraryPrefix+"Thread.java");
@@ -306,13 +307,14 @@ public class Main {
                                          //int newRate = (j+1)%2+1;
                                          int newRate = 1;
                                          String cdname = cd.getSymbol();
-                                         if(cdname.equals("SeriesRunner")) {
-                                             newRate = 10;
-                                         } else if(cdname.equals("MapWorker")) {
-                                             newRate = 6;
-                                         } else if(cdname.equals("ReduceWorker")) {
+                                         if((cdname.equals("SeriesRunner")) || 
+                                                 (cdname.equals("MDRunner"))) {
+                                             newRate = 16;
+                                         } else if(cdname.equals("SentenceParser")) {
+                                             newRate = 4;
+                                         } /*else if(cdname.equals("ReduceWorker")) {
                                              newRate = 3;
-                                         }
+                                         }*/
                                          /*do {
                                              tint = r.nextInt()%100;
                                          } while(tint <= 0);
@@ -332,7 +334,7 @@ public class Main {
                              /*do {
                                  tint = r.nextInt()%10;
                              } while(tint <= 0);*/
-                             tint = 1;
+                             tint = 3;
                              ((FEdge)it_edges.next()).setExeTime(tint);
                          }
                      }
@@ -368,7 +370,7 @@ public class Main {
              }
              System.out.print("Selected schedulings with least exectution time " + processTime + ": \n\t");
              for(int i = 0; i < selectedScheduling.size(); i++) {
-                 System.out.print(selectedScheduling.elementAt(i) + ", ");
+                 System.out.print((selectedScheduling.elementAt(i) + 1) + ", ");
              }
              System.out.println();