trim outputs for benchmarking

diff --git a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
index 2b9606421f7f83ef599e3568b49abd9bcd658f75..7efe5853c57eb04cc6955b3f9e43c06fa9747fb4 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
@@ -249,6 +249,8 @@ public class OwnershipAnalysis {
                            boolean writeAllDOTs,
                            String aliasFile) throws java.io.IOException {
 
+    double timeStartAnalysis = (double) System.nanoTime();
+
     this.state           = state;
     this.typeUtil        = tu;
     this.callGraph       = callGraph;
@@ -309,19 +311,24 @@ public class OwnershipAnalysis {
       s.add( mc );
       mapDescriptorToAllMethodContexts.put( d, s );
 
-      System.out.println("Previsiting " + mc);
+      //System.out.println("Previsiting " + mc);
 
       og = analyzeFlatNode(mc, fm, null, og);
       setGraphForMethodContext(mc, og);
     }
 
-    System.out.println("");
+    //System.out.println("");
 
     // as mentioned above, analyze methods one-by-one, possibly revisiting
     // a method if the methods that it calls are updated
     analyzeMethods();
 
-    System.out.println("");
+    //System.out.println("");
+
+    double timeEndAnalysis = (double) System.nanoTime();
+    double dt = (timeEndAnalysis - timeStartAnalysis)/(Math.pow( 10.0, 9.0 ) );
+    String treport = String.format( "The analysis took %.3f sec.", dt );
+    System.out.println( treport );
 
     if( aliasFile != null ) {
       writeAllAliases(aliasFile);
@@ -385,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 7c6e1803d2ca83ca00594321e6e919da761b4325..792e4aad39776104de564ee932c58e0134835849 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

diff --git a/Robust/src/Benchmarks/Ownership/summary.txt b/Robust/src/Benchmarks/Ownership/summary.txt
index 8f9d808fc690e74099373331d339dcf683fe2239..1ffd26732338454126b902f681f3589125acf5df 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/summary.txt
+++ b/Robust/src/Benchmarks/Ownership/summary.txt
@@ -1,3 +1,6 @@
+This file is out of date!
+
+
 No reported aliases in:
 -BankApp                  (7.1s) *
 -Conglomerator            (7.4s) *