[Javabdd-checkins] JavaBDD/net/sf/javabdd FindBestOrder.java,1.1,1.2

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

Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24428/net/sf/javabdd

Modified Files:
	FindBestOrder.java 
Log Message:
Added parameterized waiting factors.

Index: FindBestOrder.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/FindBestOrder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FindBestOrder.java	16 Oct 2004 02:58:57 -0000	1.1
--- FindBestOrder.java	13 Oct 2005 05:59:47 -0000	1.2
***************
*** 32,36 ****
      String filename3 = "fbo.3";
      
!     long DELAY_TIME = 30000;
      
      BDDFactory.BDDOp op;
--- 32,40 ----
      String filename3 = "fbo.3";
      
!     /** How long to delay for loading, in ms. */
!     long DELAY_TIME = Long.parseLong(System.getProperty("fbo.delaytime", "30000"));
!     
!     /** Factor how long to wait beyond the best time. */
!     float FACTOR = Float.parseFloat(System.getProperty("fbo.waitfactor", "1.1"));
      
      BDDFactory.BDDOp op;
***************
*** 109,113 ****
          t.start();
          try {
!             long waitTime = bestTotalTime + DELAY_TIME;
              if (waitTime < 0L) waitTime = Long.MAX_VALUE;
              t.join(waitTime);
--- 113,117 ----
          t.start();
          try {
!             long waitTime = (long)(bestTotalTime*FACTOR) + DELAY_TIME;
              if (waitTime < 0L) waitTime = Long.MAX_VALUE;
              t.join(waitTime);