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/sat/msat | |
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/sat/msat')
-rw-r--r-- | src/sat/msat/msatInt.h | 1 | ||||
-rw-r--r-- | src/sat/msat/msatOrderH.c | 8 | ||||
-rw-r--r-- | src/sat/msat/msatOrderJ.c | 4 | ||||
-rw-r--r-- | src/sat/msat/msatSolverCore.c | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/src/sat/msat/msatInt.h b/src/sat/msat/msatInt.h index 58baa7b4..a1d9e14d 100644 --- a/src/sat/msat/msatInt.h +++ b/src/sat/msat/msatInt.h @@ -30,7 +30,6 @@ #include <stdlib.h> #include <string.h> #include <assert.h> -#include <time.h> #include <math.h> #include "src/misc/util/abc_global.h" diff --git a/src/sat/msat/msatOrderH.c b/src/sat/msat/msatOrderH.c index 4bdefc6d..d0c9c997 100644 --- a/src/sat/msat/msatOrderH.c +++ b/src/sat/msat/msatOrderH.c @@ -58,7 +58,7 @@ static void Msat_HeapIncrease( Msat_Order_t * p, int n ); static void Msat_HeapPercolateUp( Msat_Order_t * p, int i ); static void Msat_HeapPercolateDown( Msat_Order_t * p, int i ); -extern int timeSelect; +extern clock_t timeSelect; //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// @@ -191,7 +191,7 @@ int Msat_OrderVarSelect( Msat_Order_t * p ) // return var_Undef; int Var; - int clk = clock(); + clock_t clk = clock(); while ( !HEMPTY(p) ) { @@ -237,7 +237,7 @@ void Msat_OrderVarUnassigned( Msat_Order_t * p, int Var ) // if (!heap.inHeap(x)) // heap.insert(x); - int clk = clock(); + clock_t clk = clock(); if ( !HINHEAP(p,Var) ) Msat_HeapInsert( p, Var ); timeSelect += clock() - clk; @@ -259,7 +259,7 @@ void Msat_OrderUpdate( Msat_Order_t * p, int Var ) // if (heap.inHeap(x)) // heap.increase(x); - int clk = clock(); + clock_t clk = clock(); if ( HINHEAP(p,Var) ) Msat_HeapIncrease( p, Var ); timeSelect += clock() - clk; diff --git a/src/sat/msat/msatOrderJ.c b/src/sat/msat/msatOrderJ.c index 2be6b47b..a9c27bd0 100644 --- a/src/sat/msat/msatOrderJ.c +++ b/src/sat/msat/msatOrderJ.c @@ -81,8 +81,8 @@ struct Msat_Order_t_ static void Msat_OrderRingAddLast( Msat_OrderRing_t * pRing, Msat_OrderVar_t * pVar ); static void Msat_OrderRingRemove( Msat_OrderRing_t * pRing, Msat_OrderVar_t * pVar ); -extern int timeSelect; -extern int timeAssign; +extern clock_t timeSelect; +extern clock_t timeAssign; //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// diff --git a/src/sat/msat/msatSolverCore.c b/src/sat/msat/msatSolverCore.c index 4ef40ad0..eff1d6d7 100644 --- a/src/sat/msat/msatSolverCore.c +++ b/src/sat/msat/msatSolverCore.c @@ -140,7 +140,7 @@ int Msat_SolverSolve( Msat_Solver_t * p, Msat_IntVec_t * vAssumps, int nBackTra Msat_SearchParams_t Params = { 0.95, 0.999 }; double nConflictsLimit, nLearnedLimit; Msat_Type_t Status; - int timeStart = clock(); + clock_t timeStart = clock(); // p->pFreq = ABC_ALLOC( int, p->nVarsAlloc ); // memset( p->pFreq, 0, sizeof(int) * p->nVarsAlloc ); |