From: adash <adash>
Date: Tue, 7 Apr 2009 22:09:47 +0000 (+0000)
Subject: changes to makefile for debugging
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=35a99a2a759874b09340ef9d384a76ceb6496f28;p=IRC.git

changes to makefile for debugging
some compile errors still
---

diff --git a/Robust/src/Benchmarks/SingleTM/LeeRouting/Grid.java b/Robust/src/Benchmarks/SingleTM/LeeRouting/Grid.java
index 43ea7bc2..5fce2b96 100644
--- a/Robust/src/Benchmarks/SingleTM/LeeRouting/Grid.java
+++ b/Robust/src/Benchmarks/SingleTM/LeeRouting/Grid.java
@@ -50,6 +50,7 @@ public class Grid {
 
   LeeRouter lr;
 
+
   /** Creates a new instance of Grid */
   public Grid(int gridWidth, int gridHeight, int gridDepth, boolean rel, LeeRouter lr) {
     this.lr = lr;
@@ -71,9 +72,9 @@ public class Grid {
       instantiateGrid(debugGrid);
       resetGrid(debugGrid);
     } else {
-      debugGrid = new GridCell[width][height][depth];
+      //debugGrid = new GridCell[width][height][depth];
       //FIXME compiler error:Type of rside (null) not compatible with type of lside (GridCell)debugGrid = null
-      //debugGrid = null;
+      debugGrid = null;
     }
   }
 
diff --git a/Robust/src/Benchmarks/SingleTM/LeeRouting/LeeRouter.java b/Robust/src/Benchmarks/SingleTM/LeeRouting/LeeRouter.java
index 4754a63c..d4a2f44f 100644
--- a/Robust/src/Benchmarks/SingleTM/LeeRouting/LeeRouter.java
+++ b/Robust/src/Benchmarks/SingleTM/LeeRouting/LeeRouter.java
@@ -43,13 +43,7 @@
 
 //Simple Lee's Routing Algorithm
 public class LeeRouter {
-  int cyan;
   long MAX_SAMPLE_THRESHOLD;
-  int magenta;
-  int yellow;
-  int green;
-  int red;
-  int blue;
   int GRID_SIZE;
   int EMPTY;
   int TEMP_EMPTY;
@@ -78,15 +72,9 @@ public class LeeRouter {
   boolean DEBUG;
   boolean XML_REPORT;
 
-  //Constructor initializing
-  public LeeRouter() {
-    cyan = 0x00FFFF;
+  public LeeRouter(String file, boolean test, boolean debug, boolean rel) {
+    //Constructor initializing
     MAX_SAMPLE_THRESHOLD = 60000;
-    magenta = 0xFF00FF;
-    yellow = 0xFFFF00;
-    green = 0x00FF00;
-    red = 0xFF0000;
-    blue = 0x0000FF;
     EMPTY  = 0;
     TEMP_EMPTY = 10000;
     OCC = 5120;
@@ -97,6 +85,7 @@ public class LeeRouter {
     MAX_WEIGHT = 1;
     netNo = 0;
     // note these very useful arrays
+    int dx[][] = new int[2][4];
     dx[0][0] = -1;
     dx[0][1] = 1;
     dx[0][2] = 0;
@@ -106,6 +95,7 @@ public class LeeRouter {
     dx[1][2] = -1;
     dx[1][3] = 1;
     // to help look NSEW.
+    int dy[][] = new int[2][4];
     dy[0][0] = 0;
     dy[0][1] = 0;
     dy[0][2] = -1;
@@ -119,18 +109,14 @@ public class LeeRouter {
     num_vias = 0;
     forced_vias = 0;
     linepos = 0;
-    TEST = true;
-    DEBUG = false;
     XML_REPORT = true;
-  }
 
-
-  public LeeRouter(String file, boolean test, boolean debug, boolean rel) {
     TEST = test;
     DEBUG = debug;
     if (TEST) GRID_SIZE = 10;
     else GRID_SIZE = 600;
     if(DEBUG) System.out.println("Creating grid...");
+    //grid = new Grid(GRID_SIZE, GRID_SIZE, 2, rel, DEBUG, OCC, EMPTY, MAX_WEIGHT); //the Lee 3D Grid;
     grid = new Grid(GRID_SIZE, GRID_SIZE, 2, rel, this); //the Lee 3D Grid;
     if(DEBUG) System.out.println("Done creating grid");
     work = new WorkQueue(); // empty
@@ -642,7 +628,11 @@ public class LeeRouter {
     String filename = args[1];
     //LeeRouter lr = new LeeRouter(filename, false, false, false);
     //TODO remove after debugging
+    //Large Grid size
+    System.out.println("Starting main.......\n");
     LeeRouter lr = new LeeRouter(filename, false, true, false);
+    //Small grid size
+    //LeeRouter lr = new LeeRouter(filename, true, true, false);
 
     int numMillis = 600000;
 
diff --git a/Robust/src/Benchmarks/SingleTM/LeeRouting/makefile b/Robust/src/Benchmarks/SingleTM/LeeRouting/makefile
index 20d23eb9..eb00b053 100644
--- a/Robust/src/Benchmarks/SingleTM/LeeRouting/makefile
+++ b/Robust/src/Benchmarks/SingleTM/LeeRouting/makefile
@@ -5,7 +5,7 @@ SRC=${MAINCLASS}.java \
 	GridCell.java \
 	LeeThread.java \
 	WorkQueue.java 
-FLAGS=-singleTM -optimize -mainclass ${MAINCLASS}
+FLAGS=-singleTM -nooptimize -debug -mainclass ${MAINCLASS}
 default:
 	../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC}