From 17d5d4a6a537deb902653ac53cdfb36d1d1e5d29 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Wed, 2 May 2007 19:55:22 +0000
Subject: [PATCH] changes to give flagstates a machine readable name

---
 .../Analysis/TaskStateAnalysis/FlagState.java |  8 +++--
 .../TaskStateAnalysis/TaskAnalysis.java       | 33 ++-----------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/Robust/src/Analysis/TaskStateAnalysis/FlagState.java b/Robust/src/Analysis/TaskStateAnalysis/FlagState.java
index 74dab1cb..b7921443 100644
--- a/Robust/src/Analysis/TaskStateAnalysis/FlagState.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/FlagState.java
@@ -30,6 +30,8 @@ public class FlagState {
     protected String dotnodeparams = new String();
     boolean merge=false;
     String nodeoption="";
+    private int uid;
+    private static int nodeid=0;
 
     private final HashSet flagstate;
     private final ClassDescriptor cd;
@@ -45,11 +47,13 @@ public class FlagState {
     public FlagState(ClassDescriptor cd) {
 	this.flagstate=new HashSet();
 	this.cd=cd;
+	this.uid=FlagState.nodeid++;
     }
 
     private FlagState(HashSet flagstate, ClassDescriptor cd) {
 	this.flagstate=flagstate;
 	this.cd=cd;
+	this.uid=FlagState.nodeid++;
     }
     
     public boolean get(FlagDescriptor fd) {
@@ -169,7 +173,7 @@ public class FlagState {
     }
 
     public String getLabel() {
-        return getTextLabel();
+	return "N"+uid;
     }
 
     public String getTextLabel() {
@@ -277,8 +281,6 @@ public class FlagState {
         }
 
        private void traverse() {
-	    Set cycleset=FlagState.findcycles(nodes);
-
             Iterator i = nodes.iterator();
             while (i.hasNext()) {
                 FlagState gn = (FlagState) i.next();
diff --git a/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java b/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
index c64622ec..98addab0 100644
--- a/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
@@ -432,39 +432,10 @@ public class TaskAnalysis {
 	   
 	File dotfile= new File("graph"+cd.getSymbol()+".dot");
 
-	/*FileOutputStream dotstream=new FileOutputStream(dotfile,true);
+	FileOutputStream dotstream=new FileOutputStream(dotfile,true);
 	
 	FlagState.DOTVisitor.visit(dotstream,((Hashtable)flagstates.get(cd)).values());
-	*/
-	
-	FileWriter dotwriter=new FileWriter(dotfile,true);
-
-	dotwriter.write("digraph G{ \n");
-	dotwriter.write("center=true;\norientation=landscape;\n");
-	
-	//***debug***
-	FlagDescriptor[] flg=(FlagDescriptor [])flags.get(cd);
-	for(int i = 0; i < flg.length ; i++)
-	{
-		dotwriter.write(flg[i].toString()+"\n");
-	}
-
-	//*** debug***	
-	Iterator it_sourcenodes=((Hashtable)flagstates.get(cd)).values().iterator();
-	while(it_sourcenodes.hasNext()) {
-	    FlagState fsv = (FlagState)(it_sourcenodes.next());
-	    System.out.println(fsv.toString());
-	    
-	    for(Iterator it_edges=fsv.edges();it_edges.hasNext();) {
-		    Edge tonode=(Edge)it_edges.next();
-			dotwriter.write(fsv.toString(flg)+" -> "+tonode.getTarget().toString(flg)+"[label=\""+tonode.getLabel()+"\"];\n");
-	    }
-
-	}
-	dotwriter.write("}\n");
-	dotwriter.flush();
-	dotwriter.close();
-	}
+   }
 	
 
     private String getTaskName(TaskDescriptor td) {
-- 
2.34.1