just a little change to print the full names of methods being analyzed

diff --git a/Robust/src/Analysis/OwnershipAnalysis/MethodContext.java b/Robust/src/Analysis/OwnershipAnalysis/MethodContext.java
index 19d799224910dd63b8894afd56200552689ea80c..d4833e6a3f306be4daf8b3a864eec275bef4e56a 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/MethodContext.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/MethodContext.java
@@ -67,8 +67,13 @@ public class MethodContext {
   }
 
   public String toString() {
-    return descMethodOrTask.getSymbol()+
-           descMethodOrTask.getNum()+
-           getAliasString();
+    if( descMethodOrTask instanceof TaskDescriptor ) {
+      return descMethodOrTask.getSymbol()+
+       descMethodOrTask.getNum()+
+       getAliasString();
+    } else {
+      MethodDescriptor md = (MethodDescriptor) descMethodOrTask;
+      return md.getClassMethodName();
+    }
   }
 }

diff --git a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
index 7efe5853c57eb04cc6955b3f9e43c06fa9747fb4..68ec11d11676832de3d7e8e16bcfbee44dc659fb 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
@@ -392,7 +392,7 @@ public class OwnershipAnalysis {
       // If there is a change detected, add any methods/tasks
       // that depend on this one to the "to visit" set.
 
-      //System.out.println("Analyzing " + mc);
+      System.out.println("Analyzing " + mc);
 
       Descriptor d = mc.getDescriptor();
       FlatMethod fm;

diff --git a/Robust/src/Benchmarks/Ownership/makefile b/Robust/src/Benchmarks/Ownership/makefile
index 792e4aad39776104de564ee932c58e0134835849..7c6e1803d2ca83ca00594321e6e919da761b4325 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/makefile
+++ b/Robust/src/Benchmarks/Ownership/makefile
@@ -1,5 +1,5 @@
 BUILDSCRIPT=~/research/Robust/src/buildscript
-BSFLAGS= -recover -ownership -ownaliasfile aliases.txt #-enable-assertions #-ownwritedots final #-flatirtasks
+BSFLAGS= -recover -ownership -ownaliasfile aliases.txt -enable-assertions -ownwritedots final #-flatirtasks
 AD1= -ownallocdepth 1
 AD3= -ownallocdepth 3
 AD5= -ownallocdepth 5