*** empty log message ***

diff --git a/Robust/src/Benchmarks/SingleTM/Labyrinth/Grid.java b/Robust/src/Benchmarks/SingleTM/Labyrinth/Grid.java
index 09bd64f0301ea4f7551327ad6e3f6a123852fdf0..358055792e0e8034d62ce9519fd047ce5af300f8 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/Labyrinth/Grid.java
+++ b/Robust/src/Benchmarks/SingleTM/Labyrinth/Grid.java
@@ -288,7 +288,7 @@ void grid_addPath (grid_t* gridPtr, vector_t* pointVectorPtr);
         int i;
         int n = pointVectorPtr.vector_getSize();
 
-        for(i = 1; i < (n-1); i++) {
+        for(i = 0; i < n; i++) {
             Coordinate coordinatePtr = (Coordinate)pointVectorPtr.vector_at(i);
             int x = coordinatePtr.x;
             int y = coordinatePtr.y;
@@ -322,7 +322,7 @@ void grid_print (grid_t* gridPtr);
             for(x = 0; x < width; x++) {
                 int y;
                 for(y = 0; y < height; y++) {
-                    System.out.println(points_unaligned[getPointIndex(x,y,z)]);
+                    System.out.print(points_unaligned[getPointIndex(x,y,z)][0] + " ");
                 }
                 System.out.println("");
             }

diff --git a/Robust/src/Benchmarks/SingleTM/Labyrinth/Labyrinth.bin b/Robust/src/Benchmarks/SingleTM/Labyrinth/Labyrinth.bin
deleted file mode 100755 (executable)
index ffcc0b4..0000000
Binary files a/Robust/src/Benchmarks/SingleTM/Labyrinth/Labyrinth.bin and /dev/null differ

diff --git a/Robust/src/Benchmarks/SingleTM/Labyrinth/Labyrinth.java b/Robust/src/Benchmarks/SingleTM/Labyrinth/Labyrinth.java
index 89600961e69d8bbd0a1ea82f381385fa3f5b5ac3..74c2177584fbe065e0e046c7c6363bf487ff5ac0 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/Labyrinth/Labyrinth.java
+++ b/Robust/src/Benchmarks/SingleTM/Labyrinth/Labyrinth.java
@@ -100,39 +100,42 @@ public class Labyrinth extends Thread{
         String arg;
         boolean opterr = false;
 
-        setDefaultParams();
 
-        while (i < arg.length() && argv[i].charAt(0) == '-' ) {
-            arg = argv[i++];
+        setDefaultParams();
 
-            // check options
-            if(arg.equals("-b")) {
-                bendCost = Integer.parseInt(argv[i++]);
-            }
-            else if(arg.equals("-x")) {
-                xCost = Integer.parseInt(argv[i++]);
-            }
-            else if(arg.equals("-y")) {
-                yCost = Integer.parseInt(argv[i++]);
-            }
-            else if(arg.equals("-z")) {
-                zCost = Integer.parseInt(argv[i++]);
-            }
-            else if(arg.equals("-t")) {
-                numThread = Integer.parseInt(argv[i++]);
-            }
-            else if(arg.equals("-i")) {
-                global_inputFile = argv[i++];
-            }
-            else if(arg.equals("-p")) {
-                global_doPrint = true;
-            }
-            else {
-                System.out.println("Non-option argument: " + argv[i]);
-                opterr = true;
+        while (i < argv.length) {
+
+            if(argv[i].charAt(0) == '-' ) {
+                arg = argv[i++];
+                // check options
+                if(arg.equals("-b")) {
+                    bendCost = Integer.parseInt(argv[i++]);
+                }
+                else if(arg.equals("-x")) {
+                    xCost = Integer.parseInt(argv[i++]);
+                    }
+                else if(arg.equals("-y")) {
+                    yCost = Integer.parseInt(argv[i++]);
+                    }
+                else if(arg.equals("-z")) {
+                    zCost = Integer.parseInt(argv[i++]);
+                    }
+                else if(arg.equals("-t")) {
+                        numThread = Integer.parseInt(argv[i++]);
+                }
+                else if(arg.equals("-i")) {
+                    global_inputFile = argv[i++];
+                    }
+                else if(arg.equals("-p")) {
+                        global_doPrint = true;
+                }
+                else {
+                    System.out.println("Non-option argument: " + argv[i]);
+                    opterr = true;
+                }   
+            
             }
         }
-
         if(opterr) {
             displayUsage();
             System.exit(1);

diff --git a/Robust/src/Benchmarks/SingleTM/Labyrinth/Maze.java b/Robust/src/Benchmarks/SingleTM/Labyrinth/Maze.java
index c2ac425b3fd2b2b1f6f7dfe162d017a21326ff51..4006484dfce6d894a4b851f870eab1284a97e463 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/Labyrinth/Maze.java
+++ b/Robust/src/Benchmarks/SingleTM/Labyrinth/Maze.java
@@ -152,7 +152,7 @@ public class Maze {
             boolean isParseError = false;
             List_t workListPtr = List_t.alloc(1); // List.alloc(Coordinate.comparePair);
             String line;
-            
+
             while((line = in.readLine()) != null) {
                 
                 String code;
@@ -166,16 +166,16 @@ public class Maze {
                 }
 
                 code = tok.nextToken();
-               
+
+                if(code.equals("#")) {
+                    /* comment line */
+                    continue;
+                }
                 for(int i=0;i<numToken-1;i++) {
                     xy[i] = Integer.parseInt(tok.nextToken());
-                }                
-                
-                if(code.equals("#")) 
-                 { /* comment */
-                   /* ignore line */
-                
-                 }else if(code.equals("d")) {
+                }
+
+                if(code.equals("d")) {
                       /* dimensions (format: d x y z) */
                      if(numToken != 4) {
                         isParseError = true;
@@ -188,6 +188,7 @@ public class Maze {
                             isParseError = true;
                      }
                  }else if(code.equals("p")) { /* paths (format: p x1 y1 z1 x2 y2 z2) */
+                     System.out.println("You there??");
                     if(numToken != 7) {
                         isParseError = true;
                     }
@@ -201,6 +202,8 @@ public class Maze {
                         else { 
                             Pair coordinatePairPtr = Pair.alloc(srcPtr,dstPtr);
                             boolean status = workListPtr.insert((Object)coordinatePairPtr);
+                            if(!status)
+                                System.out.println("LIST_INSERT????");
                         }
                     }
                 }else if(code.equals("w")) {
@@ -242,15 +245,14 @@ public class Maze {
             /*
              * Initialize work queue
              */
-            Queue_t workQueuePtr = workQueuePtr;
             List_Iter it = new List_Iter();
             it.reset(workListPtr);
 
             while(it.hasNext(workListPtr)) {
                 Pair coordinatePairPtr = (Pair)it.next(workListPtr);
+
                 workQueuePtr.queue_push((Object)coordinatePairPtr);
             }
-
             List_t.free(workListPtr);
 
             return srcVectorPtr.vector_getSize();

diff --git a/Robust/src/Benchmarks/SingleTM/Labyrinth/makefile b/Robust/src/Benchmarks/SingleTM/Labyrinth/makefile
index e8c2f6d47ca78dc421735458cfef1b1ee12ba3d8..7fbb7f4dbf1917a930f1858fab4a4590ba507bf1 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/Labyrinth/makefile
+++ b/Robust/src/Benchmarks/SingleTM/Labyrinth/makefile
@@ -33,3 +33,18 @@ default:
 clean:
        rm -rf tmpbuilddirectory
        rm *.bin
+
+test:
+       cpp ${MAINCLASS}.java > tmp${MAINCLASS}.java
+       cpp Grid.java   > tmpGrid.java
+       cpp Router.java > tmpRouter.java
+       cpp Maze.java > tmpMaze.java
+       cpp Queue_t.java > tmpQueue_t.java
+       ./extractLines tmp${MAINCLASS}.java
+       ./extractLines tmpGrid.java
+       ./extractLines tmpRouter.java
+       ./extractLines tmpMaze.java
+       ./extractLines tmpQueue_t.java
+       ../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC}
+       rm ttt*.java tmp*.java
+       ./Labyrinth.bin -i inputs/random-x32-y32-z3-n64.txt