diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 17:46:54 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 17:46:54 -0700 |
| commit | 3aab7245738a69f1dd4d898493d5dabf6596ea61 (patch) | |
| tree | 16a23107ca27a250e82c492dcdd1a2bea640cff6 /src/bdd/cudd | |
| parent | 16d96fcf533fb77ff4a45992991e38ac7ea74bb3 (diff) | |
| download | abc-3aab7245738a69f1dd4d898493d5dabf6596ea61.tar.gz abc-3aab7245738a69f1dd4d898493d5dabf6596ea61.tar.bz2 abc-3aab7245738a69f1dd4d898493d5dabf6596ea61.zip | |
Fixing time primtouts throughout the code.
Diffstat (limited to 'src/bdd/cudd')
| -rw-r--r-- | src/bdd/cudd/cuddAndAbs.c | 2 | ||||
| -rw-r--r-- | src/bdd/cudd/cuddBddIte.c | 2 | ||||
| -rw-r--r-- | src/bdd/cudd/cuddBridge.c | 4 | ||||
| -rw-r--r-- | src/bdd/cudd/cuddCompose.c | 2 | ||||
| -rw-r--r-- | src/bdd/cudd/cuddInt.h | 2 | ||||
| -rw-r--r-- | src/bdd/cudd/cuddSymmetry.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/bdd/cudd/cuddAndAbs.c b/src/bdd/cudd/cuddAndAbs.c index 00ba67b4..0db3e4e4 100644 --- a/src/bdd/cudd/cuddAndAbs.c +++ b/src/bdd/cudd/cuddAndAbs.c @@ -259,7 +259,7 @@ cuddBddAndAbstractRecur( } } - if ( manager->TimeStop && manager->TimeStop < time(NULL) ) + if ( manager->TimeStop && clock() > manager->TimeStop ) return NULL; if (topf == top) { diff --git a/src/bdd/cudd/cuddBddIte.c b/src/bdd/cudd/cuddBddIte.c index 18ebee20..43dbcd60 100644 --- a/src/bdd/cudd/cuddBddIte.c +++ b/src/bdd/cudd/cuddBddIte.c @@ -926,7 +926,7 @@ cuddBddAndRecur( if (r != NULL) return(r); } - if ( manager->TimeStop && manager->TimeStop < time(NULL) ) + if ( manager->TimeStop && clock() > manager->TimeStop ) return NULL; /* Here we can skip the use of cuddI, because the operands are known diff --git a/src/bdd/cudd/cuddBridge.c b/src/bdd/cudd/cuddBridge.c index 75a5fa2a..cedf920b 100644 --- a/src/bdd/cudd/cuddBridge.c +++ b/src/bdd/cudd/cuddBridge.c @@ -976,9 +976,9 @@ cuddBddTransferRecur( if (st_lookup(table, (const char *)f, (char **)&res)) return(Cudd_NotCond(res,comple)); - if ( ddS->TimeStop && ddS->TimeStop < time(NULL) ) + if ( ddS->TimeStop && clock() > ddS->TimeStop ) return NULL; - if ( ddD->TimeStop && ddD->TimeStop < time(NULL) ) + if ( ddD->TimeStop && clock() > ddD->TimeStop ) return NULL; /* Recursive step. */ diff --git a/src/bdd/cudd/cuddCompose.c b/src/bdd/cudd/cuddCompose.c index 6264513f..d88491b0 100644 --- a/src/bdd/cudd/cuddCompose.c +++ b/src/bdd/cudd/cuddCompose.c @@ -1251,7 +1251,7 @@ cuddBddVarMapRecur( return(Cudd_NotCond(res,F != f)); } - if ( manager->TimeStop && manager->TimeStop < time(NULL) ) + if ( manager->TimeStop && clock() > manager->TimeStop ) return NULL; /* Split and recur on children of this node. */ diff --git a/src/bdd/cudd/cuddInt.h b/src/bdd/cudd/cuddInt.h index 3d4b3db9..6e32acd2 100644 --- a/src/bdd/cudd/cuddInt.h +++ b/src/bdd/cudd/cuddInt.h @@ -481,7 +481,7 @@ struct DdManager { /* specialized DD symbol table */ #endif DdNode * bFunc; DdNode * bFunc2; - int TimeStop; /* timeout for reordering */ + clock_t TimeStop; /* timeout for reordering */ }; typedef struct Move { diff --git a/src/bdd/cudd/cuddSymmetry.c b/src/bdd/cudd/cuddSymmetry.c index dfdc6c85..d2269a36 100644 --- a/src/bdd/cudd/cuddSymmetry.c +++ b/src/bdd/cudd/cuddSymmetry.c @@ -367,7 +367,7 @@ cuddSymmSifting( if (ddTotalNumberSwapping >= table->siftMaxSwap) break; // enable timeout during variable reodering - alanmi 2/13/11 - if ( table->TimeStop && table->TimeStop < time(NULL) ) + if ( table->TimeStop && clock() > table->TimeStop ) break; x = table->perm[var[i]]; #ifdef DD_STATS |