diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2019-03-08 21:08:43 +0100 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2019-03-08 21:08:43 +0100 |
| commit | 20bb89485adb4c7a6fe89c9dc7abe03b21bfd9d1 (patch) | |
| tree | 54df51b2d3e93eee66cc30a624cbdee0f7d7fee1 /src | |
| parent | ef599dca94a3996d13bb308555a92c8baeb66c4f (diff) | |
| download | abc-20bb89485adb4c7a6fe89c9dc7abe03b21bfd9d1.tar.gz abc-20bb89485adb4c7a6fe89c9dc7abe03b21bfd9d1.tar.bz2 abc-20bb89485adb4c7a6fe89c9dc7abe03b21bfd9d1.zip | |
Updated NPN classification code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/abci/abc.c | 8 | ||||
| -rw-r--r-- | src/base/abci/abcNpn.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 3d06fbf0..7c755e9d 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -6796,10 +6796,10 @@ usage: Abc_Print( -2, "\t 5: new fast hybrid semi-canonical form\n" ); Abc_Print( -2, "\t 6: new phase canonical form\n" ); Abc_Print( -2, "\t 7: new hierarchical matching\n" ); - Abc_Print( -2, "\t 8: hierarchical matching by XueGong Zhou at Fudan University, Shanghai\n" ); - Abc_Print( -2, "\t 9: FPL2018 algorithm by XueGong Zhou at Fudan University, Shanghai\n" ); - Abc_Print( -2, "\t 10: TRETS algorithm by XueGong Zhou at Fudan University, Shanghai\n" ); - Abc_Print( -2, "\t 11: a new exact matching by XueGong Zhou at Fudan University, Shanghai\n" ); + Abc_Print( -2, "\t 8: hierarchical matching by XueGong Zhou at Fudan University, Shanghai\n" ); + Abc_Print( -2, "\t 9: adjustable algorithm (heuristic) by XueGong Zhou at Fudan University, Shanghai\n" ); + Abc_Print( -2, "\t 10: adjustable algorithm (exact) by XueGong Zhou at Fudan University, Shanghai\n" ); + Abc_Print( -2, "\t 11: new cost-aware exact algorithm by XueGong Zhou at Fudan University, Shanghai\n" ); Abc_Print( -2, "\t-N <num> : the number of support variables (binary files only) [default = unused]\n" ); Abc_Print( -2, "\t-d : toggle dumping resulting functions into a file [default = %s]\n", fDumpRes? "yes": "no" ); Abc_Print( -2, "\t-b : toggle dumping in binary format [default = %s]\n", fBinary? "yes": "no" ); diff --git a/src/base/abci/abcNpn.c b/src/base/abci/abcNpn.c index ed8125b1..a3571a04 100644 --- a/src/base/abci/abcNpn.c +++ b/src/base/abci/abcNpn.c @@ -203,11 +203,11 @@ void Abc_TruthNpnPerform( Abc_TtStore_t * p, int NpnType, int fVerbose ) else if ( NpnType == 8 ) pAlgoName = "new adap. matching "; else if ( NpnType == 9 ) - pAlgoName = "FPL 2018 algorithm "; + pAlgoName = "adjustable algorithm (heuristic) "; else if ( NpnType == 10 ) - pAlgoName = "TRETS algorithm "; + pAlgoName = "adjustable algorithm (exact) "; else if ( NpnType == 11 ) - pAlgoName = "new exact algorithm "; + pAlgoName = "new cost-aware exact algorithm "; assert( p->nVars <= 16 ); if ( pAlgoName ) @@ -346,11 +346,11 @@ void Abc_TruthNpnPerform( Abc_TtStore_t * p, int NpnType, int fVerbose ) if ( fVerbose ) printf( "%7d : ", i ); if ( NpnType == 9 ) - uCanonPhase = Abc_TtCanonicizeWrap(Abc_TtCanonicizeAda, pMan, p->pFuncs[i], p->nVars, pCanonPerm, 100); // FPL2018 algorithm + uCanonPhase = Abc_TtCanonicizeWrap(Abc_TtCanonicizeAda, pMan, p->pFuncs[i], p->nVars, pCanonPerm, 125); // -A 8, adjustable algorithm (heuristic) else if ( NpnType == 10 ) - uCanonPhase = Abc_TtCanonicizeWrap(Abc_TtCanonicizeAda, pMan, p->pFuncs[i], p->nVars, pCanonPerm, 1100); // TRETS algorithm + uCanonPhase = Abc_TtCanonicizeWrap(Abc_TtCanonicizeAda, pMan, p->pFuncs[i], p->nVars, pCanonPerm, 1199); // -A 9, adjustable algorithm (exact) else if ( NpnType == 11 ) - uCanonPhase = Abc_TtCanonicizeWrap(Abc_TtCanonicizeAda, pMan, p->pFuncs[i], p->nVars, pCanonPerm, 0); // the new exact algorithm + uCanonPhase = Abc_TtCanonicizeWrap(Abc_TtCanonicizeCA, pMan, p->pFuncs[i], p->nVars, pCanonPerm, 1); // -A 10, new cost-aware exact algorithm if ( fVerbose ) Extra_PrintHex( stdout, (unsigned *)p->pFuncs[i], p->nVars ), Abc_TruthNpnPrint(pCanonPerm, uCanonPhase, p->nVars), printf( "\n" ); } |