summaryrefslogtreecommitdiffstats
path: root/src/opt/rwt
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2012-07-07 17:46:54 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2012-07-07 17:46:54 -0700
commit3aab7245738a69f1dd4d898493d5dabf6596ea61 (patch)
tree16a23107ca27a250e82c492dcdd1a2bea640cff6 /src/opt/rwt
parent16d96fcf533fb77ff4a45992991e38ac7ea74bb3 (diff)
downloadabc-3aab7245738a69f1dd4d898493d5dabf6596ea61.tar.gz
abc-3aab7245738a69f1dd4d898493d5dabf6596ea61.tar.bz2
abc-3aab7245738a69f1dd4d898493d5dabf6596ea61.zip
Fixing time primtouts throughout the code.
Diffstat (limited to 'src/opt/rwt')
-rw-r--r--src/opt/rwt/rwt.h22
-rw-r--r--src/opt/rwt/rwtMan.c8
-rw-r--r--src/opt/rwt/rwtUtil.c3
3 files changed, 17 insertions, 16 deletions
diff --git a/src/opt/rwt/rwt.h b/src/opt/rwt/rwt.h
index a528a307..2e6de2cd 100644
--- a/src/opt/rwt/rwt.h
+++ b/src/opt/rwt/rwt.h
@@ -94,14 +94,14 @@ struct Rwt_Man_t_
int nCutsBad;
int nSubgraphs;
// runtime statistics
- int timeStart;
- int timeTruth;
- int timeCut;
- int timeRes;
- int timeEval;
- int timeMffc;
- int timeUpdate;
- int timeTotal;
+ clock_t timeStart;
+ clock_t timeTruth;
+ clock_t timeCut;
+ clock_t timeRes;
+ clock_t timeEval;
+ clock_t timeMffc;
+ clock_t timeUpdate;
+ clock_t timeTotal;
};
struct Rwt_Node_t_ // 24 bytes
@@ -142,9 +142,9 @@ extern void Rwt_ManPrintStatsFile( Rwt_Man_t * p );
extern void * Rwt_ManReadDecs( Rwt_Man_t * p );
extern Vec_Ptr_t * Rwt_ManReadLeaves( Rwt_Man_t * p );
extern int Rwt_ManReadCompl( Rwt_Man_t * p );
-extern void Rwt_ManAddTimeCuts( Rwt_Man_t * p, int Time );
-extern void Rwt_ManAddTimeUpdate( Rwt_Man_t * p, int Time );
-extern void Rwt_ManAddTimeTotal( Rwt_Man_t * p, int Time );
+extern void Rwt_ManAddTimeCuts( Rwt_Man_t * p, clock_t Time );
+extern void Rwt_ManAddTimeUpdate( Rwt_Man_t * p, clock_t Time );
+extern void Rwt_ManAddTimeTotal( Rwt_Man_t * p, clock_t Time );
/*=== rwrUtil.c ========================================================*/
extern void Rwt_ManLoadFromArray( Rwt_Man_t * p, int fVerbose );
extern char * Rwt_ManGetPractical( Rwt_Man_t * p );
diff --git a/src/opt/rwt/rwtMan.c b/src/opt/rwt/rwtMan.c
index 775d3a88..17799407 100644
--- a/src/opt/rwt/rwtMan.c
+++ b/src/opt/rwt/rwtMan.c
@@ -87,7 +87,7 @@ void Rwt_ManGlobalStop()
Rwt_Man_t * Rwt_ManStart( int fPrecompute )
{
Rwt_Man_t * p;
- int clk = clock();
+ clock_t clk = clock();
clk = clock();
p = ABC_ALLOC( Rwt_Man_t, 1 );
memset( p, 0, sizeof(Rwt_Man_t) );
@@ -298,7 +298,7 @@ int Rwt_ManReadCompl( Rwt_Man_t * p )
SeeAlso []
***********************************************************************/
-void Rwt_ManAddTimeCuts( Rwt_Man_t * p, int Time )
+void Rwt_ManAddTimeCuts( Rwt_Man_t * p, clock_t Time )
{
p->timeCut += Time;
}
@@ -314,7 +314,7 @@ void Rwt_ManAddTimeCuts( Rwt_Man_t * p, int Time )
SeeAlso []
***********************************************************************/
-void Rwt_ManAddTimeUpdate( Rwt_Man_t * p, int Time )
+void Rwt_ManAddTimeUpdate( Rwt_Man_t * p, clock_t Time )
{
p->timeUpdate += Time;
}
@@ -330,7 +330,7 @@ void Rwt_ManAddTimeUpdate( Rwt_Man_t * p, int Time )
SeeAlso []
***********************************************************************/
-void Rwt_ManAddTimeTotal( Rwt_Man_t * p, int Time )
+void Rwt_ManAddTimeTotal( Rwt_Man_t * p, clock_t Time )
{
p->timeTotal += Time;
}
diff --git a/src/opt/rwt/rwtUtil.c b/src/opt/rwt/rwtUtil.c
index 6cdaf657..d6011b20 100644
--- a/src/opt/rwt/rwtUtil.c
+++ b/src/opt/rwt/rwtUtil.c
@@ -592,7 +592,8 @@ void Rwt_ManLoadFromArray( Rwt_Man_t * p, int fVerbose )
Rwt_Node_t * p0, * p1;
unsigned Entry0, Entry1;
int Level, Volume, nEntries, fExor;
- int i, clk = clock();
+ int i;
+ clock_t clk = clock();
// reconstruct the forest
for ( i = 0; ; i++ )