[Javabdd-checkins] JavaBDD_tests/trace TraceDriver.java,1.1,1.2

[John W. <joe...@us...>]

Update of /cvsroot/javabdd/JavaBDD_tests/trace
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16394/trace

Modified Files:
	TraceDriver.java 
Log Message:
Updated trace driver to support multiple files, gziped files.



Index: TraceDriver.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD_tests/trace/TraceDriver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TraceDriver.java	17 Nov 2004 09:56:03 -0000	1.1
--- TraceDriver.java	6 May 2005 07:02:53 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  import java.util.LinkedList;
  import java.util.Vector;
+ import java.util.zip.GZIPInputStream;
  import java.io.FileInputStream;
  import java.io.IOException;
***************
*** 298,302 ****
  
      // -----------------------------------------------
!     private static final int DEFAULT_NODES = 10000, MAX_NODES = 3000000;
      private BDDFactory bdd;
      private InputStream is;
--- 299,303 ----
  
      // -----------------------------------------------
!     private static final int DEFAULT_NODES = 500000, MAX_NODES = 3000000;
      private BDDFactory bdd;
      private InputStream is;
***************
*** 316,327 ****
  
      public TraceDriver(String file) throws IOException
!         { this(file, new FileInputStream(file),  DEFAULT_NODES); }
  
      public TraceDriver(String file, int nodes) throws IOException
!             { this(file, new FileInputStream(file), nodes); }
  
  
      public TraceDriver(String file, InputStream is) throws IOException
!         { this(file, is, DEFAULT_NODES); }
  
  
--- 317,338 ----
  
      public TraceDriver(String file) throws IOException
!     {
!         this(file, DEFAULT_NODES);
!     }
  
      public TraceDriver(String file, int nodes) throws IOException
!     {
!         this(file,
!              file.endsWith(".gz") ?
!                  (InputStream) new GZIPInputStream(new FileInputStream(file)) :
!                  (InputStream) new FileInputStream(file),
!              nodes);
!     }
  
  
      public TraceDriver(String file, InputStream is) throws IOException
!     {
!         this(file, is, DEFAULT_NODES);
!     }
  
  
***************
*** 405,409 ****
      private void setup_bdd(int vars) {
          this.vars = vars;
!         nodes = (int)Math.min( MAX_NODES, nodes * (1 + Math.log(1+vars)) );
  
          out.println();
--- 416,420 ----
      private void setup_bdd(int vars) {
          this.vars = vars;
!         //nodes = (int)Math.min( MAX_NODES, nodes * (1 + Math.log(1+vars)) );
  
          out.println();
***************
*** 826,835 ****
          //TraceDriver.verbose = true;
  
          try {
!             if(args.length == 2) {
!                 new TraceDriver(args[0], Integer.parseInt(args[1]) );
!             } else if(args.length == 1) new TraceDriver(args[0]);
!             else out.println("Usage:  java "+TraceDriver.class.getName()+" file.trace [initial node-base]");
!         } catch(IOException exx) {
              out.println("FAILED: " + exx.getMessage() );
              exx.printStackTrace();
--- 837,855 ----
          //TraceDriver.verbose = true;
  
+         if (args.length == 0) {
+             out.println("Usage:  java "+TraceDriver.class.getName()+" file.trace {file2.trace ...}");
+             return;
+         }
+         int bddnodes = Integer.parseInt(System.getProperty("bddnodes", Integer.toString(DEFAULT_NODES)));
+         long totalTime = 0;
          try {
!             for (int i = 0; i < args.length; ++i) {
!                 TraceDriver td = new TraceDriver(args[i], bddnodes);
!                 totalTime += td.time;
!             }
!             if (args.length > 1) {
!                 out.println("Total time for all traces: "+totalTime+" [ms]");
!             }
!         } catch (IOException exx) {
              out.println("FAILED: " + exx.getMessage() );
              exx.printStackTrace();