tinkering with debug stuff for barnes-hut

diff --git a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
index a47426d8cf5c0deab1f3de7870ebdb2b12477435..6e002bbd7ac36a5f9a69e7066d6de0b5555427bf 100644 (file)
--- a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
+++ b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
@@ -3027,8 +3027,8 @@ public class DisjointAnalysis implements HeapAnalysis {
                     true,    // selectively hide intermediate temp vars
                     true,    // prune unreachable heap regions
                     false,   // hide reachability
-                    false,   // hide subset reachability states
-                    false,    // hide predicates
+                    true,   // hide subset reachability states
+                    true,    // hide predicates
                     true);   // hide edge taints
     }
   }

diff --git a/Robust/src/Analysis/Disjoint/ReachGraph.java b/Robust/src/Analysis/Disjoint/ReachGraph.java
index b397af059f50d6def646f02a40de1d2022e79e92..7a9e9f023f640389cd2eb4cf9fdaac10cc1f0589 100644 (file)
--- a/Robust/src/Analysis/Disjoint/ReachGraph.java
+++ b/Robust/src/Analysis/Disjoint/ReachGraph.java
@@ -2261,7 +2261,7 @@ public class ReachGraph {
   private static boolean resolveMethodDebugDOTselectTemps     = true;
   private static boolean resolveMethodDebugDOTpruneGarbage    = true;
   private static boolean resolveMethodDebugDOThideReach       = false;
-  private static boolean resolveMethodDebugDOThideSubsetReach = false;
+  private static boolean resolveMethodDebugDOThideSubsetReach = true;
   private static boolean resolveMethodDebugDOThidePreds       = false;
   private static boolean resolveMethodDebugDOThideEdgeTaints  = true;
 

diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile
index 014d367c280a33c884d718abb50868964e6370ee..c4dbbd39690dad89a0fc3fbabb57ea7c3b6887fe 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/master-makefile
+++ b/Robust/src/Benchmarks/oooJava/master-makefile
@@ -76,9 +76,9 @@ DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-
 # EX: (skip first 10 visits, capture the next 3, then halt)
 # -disjoint-debug-snap-method Remove 10 3 true
 
-DISJOINTDEBUG= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE)
+DISJOINTDEBUG= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) \
+       -disjoint-debug-callsite Barneshut.Insert Barneshut.run 50 500 true
 #      -disjoint-debug-snap-method ArrayIndexedGraph.createNode 1 100 true \
-#      -disjoint-debug-callsite ArrayIndexedGraph.createNode Barneshut.run 1 100 true
 #      -disjoint-write-dots final \
 #      -flatirusermethods \
 #      -disjoint-write-ihms \