From b9ee5d8564025acfbeb632cf3c28ecb8d61a7aa4 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Wed, 11 Jul 2012 12:45:46 -0700 Subject: Improvements in the proof-logging SAT solver. --- src/proof/fra/fra.h | 2 +- src/proof/fra/fraCec.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/proof/fra') diff --git a/src/proof/fra/fra.h b/src/proof/fra/fra.h index 8be02e45..1690b463 100644 --- a/src/proof/fra/fra.h +++ b/src/proof/fra/fra.h @@ -285,7 +285,7 @@ static inline int Fra_ImpCreate( int Left, int Right ) //////////////////////////////////////////////////////////////////////// /*=== fraCec.c ========================================================*/ -extern int Fra_FraigSat( Aig_Man_t * pMan, ABC_INT64_T nConfLimit, ABC_INT64_T nInsLimit, int nStartLearned, int nDeltaLearned, int nRatioLearned, int fFlipBits, int fAndOuts, int fNewSolver, int fVerbose ); +extern int Fra_FraigSat( Aig_Man_t * pMan, ABC_INT64_T nConfLimit, ABC_INT64_T nInsLimit, int nLearnedStart, int nLearnedDelta, int nLearnedPerce, int fFlipBits, int fAndOuts, int fNewSolver, int fVerbose ); extern int Fra_FraigCec( Aig_Man_t ** ppAig, int nConfLimit, int fVerbose ); extern int Fra_FraigCecPartitioned( Aig_Man_t * pMan1, Aig_Man_t * pMan2, int nConfLimit, int nPartSize, int fSmart, int fVerbose ); /*=== fraClass.c ========================================================*/ diff --git a/src/proof/fra/fraCec.c b/src/proof/fra/fraCec.c index 0e483b1f..3e7addb2 100644 --- a/src/proof/fra/fraCec.c +++ b/src/proof/fra/fraCec.c @@ -44,7 +44,7 @@ ABC_NAMESPACE_IMPL_START SeeAlso [] ***********************************************************************/ -int Fra_FraigSat( Aig_Man_t * pMan, ABC_INT64_T nConfLimit, ABC_INT64_T nInsLimit, int nStartLearned, int nDeltaLearned, int nRatioLearned, int fFlipBits, int fAndOuts, int fNewSolver, int fVerbose ) +int Fra_FraigSat( Aig_Man_t * pMan, ABC_INT64_T nConfLimit, ABC_INT64_T nInsLimit, int nLearnedStart, int nLearnedDelta, int nLearnedPerce, int fFlipBits, int fAndOuts, int fNewSolver, int fVerbose ) { if ( fNewSolver ) { @@ -181,12 +181,12 @@ int Fra_FraigSat( Aig_Man_t * pMan, ABC_INT64_T nConfLimit, ABC_INT64_T nInsLimi return 1; } - if ( nStartLearned ) - pSat->nLearntStart = nStartLearned; - if ( nDeltaLearned ) - pSat->nLearntDelta = nDeltaLearned; - if ( nRatioLearned ) - pSat->nLearntRatio = nRatioLearned; + if ( nLearnedStart ) + pSat->nLearntStart = nLearnedStart; + if ( nLearnedDelta ) + pSat->nLearntDelta = nLearnedDelta; + if ( nLearnedPerce ) + pSat->nLearntRatio = nLearnedPerce; if ( fVerbose ) pSat->fVerbose = fVerbose; -- cgit v1.2.3