little bug in final reporting

diff --git a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
index 2dbe1862a744fff0ba4fe446a1a1c2c9f97fff58..2c3b4d7342d9e7416b645b988323e16abf2c9caf 100644 (file)
--- a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
+++ b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
@@ -238,7 +238,7 @@ public class DisjointAnalysis {
 
                BufferedWriter bw = new BufferedWriter(new FileWriter(outputFile));
 
-               bw.write("Conducting ownership analysis with allocation depth = "
+               bw.write("Conducting disjoint reachability analysis with allocation depth = "
                                + allocationDepth + "\n");
                bw.write(timeReport + "\n\n");
 
@@ -514,8 +514,7 @@ public class DisjointAnalysis {
 
     if( state.DISJOINTALIASFILE != null ) {
       if( state.TASK ) {
-        // not supporting tasks yet...
-         writeAllAliases(state.OWNERSHIPALIASFILE, treport, justtime, state.OWNERSHIPALIASTAB, state.lines);
+        writeAllAliases(state.DISJOINTALIASFILE, treport, justtime, state.DISJOINTALIASTAB, state.lines);
       } else {
         /*
         writeAllAliasesJava( aliasFile, 

diff --git a/Robust/src/Benchmarks/disjoint/makefile b/Robust/src/Benchmarks/disjoint/makefile
index 41ac071f0cd782ac1b5383cc76eb92d4d15f99a0..c6467d44377e5ebde072cc837aa5ae6281a3a0d4 100644 (file)
--- a/Robust/src/Benchmarks/disjoint/makefile
+++ b/Robust/src/Benchmarks/disjoint/makefile
@@ -1,7 +1,6 @@
 BUILDSCRIPT=~/research/Robust/src/buildscript
-BSFLAGS= -recover -justanalyze -ownership -ownaliasfiletab aliases.txt -enable-assertions #-ownwritedots final #-flatirtasks
 
-BSFLAGS= -recover -justanalyze -disjoint -disjoint-k 2 -disjoint-write-dots final -disjoint-write-ihms -disjoint-alias-file aliases.txt normal -enable-assertions
+BSFLAGS= -recover -justanalyze -disjoint -disjoint-k 1 -disjoint-write-dots final -disjoint-alias-file aliases.txt normal -enable-assertions
 
 all:
        $(BUILDSCRIPT) $(BSFLAGS) *.java