From: yeom <yeom>
Date: Wed, 20 Oct 2010 17:29:24 +0000 (+0000)
Subject: remove unnecessary conflict type and assign coarse conflict by default.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=71d8102c4a92549083e7a559b71717decc2e7c0f;p=IRC.git

remove unnecessary conflict type and assign coarse conflict by default.
---

diff --git a/Robust/src/Analysis/OoOJava/ConflictGraph.java b/Robust/src/Analysis/OoOJava/ConflictGraph.java
index 9d99c41f..d531c016 100644
--- a/Robust/src/Analysis/OoOJava/ConflictGraph.java
+++ b/Robust/src/Analysis/OoOJava/ConflictGraph.java
@@ -33,7 +33,7 @@ public class ConflictGraph {
   public static final int NON_WRITE_CONFLICT = 0;
   public static final int FINE_GRAIN_EDGE = 1;
   public static final int COARSE_GRAIN_EDGE = 2;
-  public static final int CONFLICT = 3;
+ 
   State state;
 
   public ConflictGraph(State state) {
@@ -321,7 +321,7 @@ public class ConflictGraph {
                   conflictType = updateConflictType(conflictType, ConflictGraph.COARSE_GRAIN_EDGE);
                 }
               } else {
-                return ConflictGraph.CONFLICT;
+                return ConflictGraph.COARSE_GRAIN_EDGE;
               }
 
             }
@@ -356,7 +356,7 @@ public class ConflictGraph {
                   conflictType = updateConflictType(conflictType, ConflictGraph.COARSE_GRAIN_EDGE);
                 }
               } else {
-                return ConflictGraph.CONFLICT;
+                return ConflictGraph.COARSE_GRAIN_EDGE;
               }
             }
 
@@ -432,7 +432,7 @@ public class ConflictGraph {
 		    addCoarseEffect(nodeB, asB, effectB);
 		  }
 		}
-                return ConflictGraph.CONFLICT;
+                return ConflictGraph.COARSE_GRAIN_EDGE;
               }
             }
           }