Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19940/net/sf/javabdd
Modified Files:
TryVarOrder.java
Log Message:
Added parameterized waiting factors.
Index: TryVarOrder.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/TryVarOrder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TryVarOrder.java 19 Oct 2004 04:34:48 -0000 1.2
--- TryVarOrder.java 13 Oct 2005 05:37:07 -0000 1.3
***************
*** 240,244 ****
/** How long to delay for loading, in ms. */
! long DELAY_TIME = 20000;
/** Best calc time so far. */
--- 240,247 ----
/** How long to delay for loading, in ms. */
! long DELAY_TIME = Long.parseLong(System.getProperty("fbo.delaytime", "20000"));
!
! /** Factor how long to wait beyond the best time. */
! float FACTOR = Float.parseFloat(System.getProperty("fbo.waitfactor", "1.1"));
/** Best calc time so far. */
***************
*** 355,363 ****
TryThread t = new TryThread(reverse, varOrder);
t.start();
- boolean stopped;
try {
t.join(DELAY_TIME);
if (t.initTime >= 0L) {
! t.join(bestCalcTime);
}
} catch (InterruptedException x) {
--- 358,365 ----
TryThread t = new TryThread(reverse, varOrder);
t.start();
try {
t.join(DELAY_TIME);
if (t.initTime >= 0L) {
! t.join((long)(bestCalcTime*FACTOR));
}
} catch (InterruptedException x) {
***************
*** 416,420 ****
computeTime = doIt();
free();
! System.out.println("Ordering: "+varOrderToTry+" time: "+time);
} catch (Exception x) {
System.err.println("Exception occurred while trying order: "+x.getLocalizedMessage());
--- 418,422 ----
computeTime = doIt();
free();
! System.out.println("Ordering: "+varOrderToTry+" init: "+initTime+" compute: "+computeTime);
} catch (Exception x) {
System.err.println("Exception occurred while trying order: "+x.getLocalizedMessage());
|
