summaryrefslogtreecommitdiffstats
path: root/src/base/abci
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2016-05-11 19:59:56 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2016-05-11 19:59:56 -0700
commitc30819cb058b854339858a77eaa69cd2e53858e0 (patch)
treeda08351a6fc2e883aa962d8e024131fa564b572d /src/base/abci
parent59c3151eaf04840420f7306a39d4590528eccdec (diff)
downloadabc-c30819cb058b854339858a77eaa69cd2e53858e0.tar.gz
abc-c30819cb058b854339858a77eaa69cd2e53858e0.tar.bz2
abc-c30819cb058b854339858a77eaa69cd2e53858e0.zip
Cosmetic changes after incorporating new code of 'fxch'.
Diffstat (limited to 'src/base/abci')
-rw-r--r--src/base/abci/abc.c15
-rw-r--r--src/base/abci/abcFx.c4
2 files changed, 11 insertions, 8 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index cc687689..302b8553 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -4139,13 +4139,13 @@ static int Abc_CommandFxch( Abc_Frame_t * pAbc, int argc, char ** argv )
Abc_Ntk_t * pNtk = Abc_FrameReadNtk(pAbc);
int c,
- nMaxDivExt,
+ nMaxDivExt = 0,
SMode = 0,
fVerbose = 0,
fVeryVerbose = 0;
Extra_UtilGetoptReset();
- while ( (c = Extra_UtilGetopt(argc, argv, "NSvwh")) != EOF )
+ while ( (c = Extra_UtilGetopt(argc, argv, "Nsvwh")) != EOF )
{
switch (c)
{
@@ -4162,7 +4162,7 @@ static int Abc_CommandFxch( Abc_Frame_t * pAbc, int argc, char ** argv )
goto usage;
break;
- case 'S':
+ case 's':
SMode ^= 1;
break;
@@ -4209,13 +4209,16 @@ static int Abc_CommandFxch( Abc_Frame_t * pAbc, int argc, char ** argv )
return 0;
usage:
- Abc_Print( -2, "usage: fxch [-N <num>] [-vwh]\n");
+ Abc_Print( -2, "usage: fxch [-N <num>] [-svwh]\n");
Abc_Print( -2, "\t performs fast extract with cube hashing on the current network\n");
- Abc_Print( -2, "\t-N <num> : max number of divisors to extract during this run [default = %d]\n", nMaxDivExt );
- Abc_Print( -2, "\t-S : memory saving mode (slower) [default = %d]\n", SMode );
+ Abc_Print( -2, "\t-N <num> : max number of divisors to extract during this run [default = unused]\n" );
+ Abc_Print( -2, "\t-s : memory saving mode (slower) [default = %d]\n", SMode? "yes": "no" );
Abc_Print( -2, "\t-v : print verbose information [default = %s]\n", fVerbose? "yes": "no" );
Abc_Print( -2, "\t-w : print additional information [default = %s]\n", fVeryVerbose? "yes": "no" );
Abc_Print( -2, "\t-h : print the command usage\n");
+ Abc_Print( -2, "\t\n" );
+ Abc_Print( -2, "\t This command was contributed by Bruno Schmitt from UFRGS in May 2016.\n" );
+ Abc_Print( -2, "\t The author can be contacted as boschmitt at inf.ufrgs.br\n" );
return 1;
}
diff --git a/src/base/abci/abcFx.c b/src/base/abci/abcFx.c
index de7125bc..8208f68b 100644
--- a/src/base/abci/abcFx.c
+++ b/src/base/abci/abcFx.c
@@ -664,8 +664,8 @@ int Fx_ManDivFindCubeFree( Vec_Int_t * vArr1, Vec_Int_t * vArr2, Vec_Int_t * vCu
printf( "The SOP has duplicated cubes.\n" );
else if ( Vec_IntSize(vCubeFree) == 1 )
printf( "The SOP has contained cubes.\n" );
- else if ( Vec_IntSize(vCubeFree) == 2 && Abc_Lit2Var(Abc_Lit2Var(Vec_IntEntry(vCubeFree, 0))) == Abc_Lit2Var(Abc_Lit2Var(Vec_IntEntry(vCubeFree, 1))) && !*fWarning )
- printf( "The SOP has distance-1 cubes or it is not a prime cover. Please make sure the result verifies.\n" ), *fWarning = 1;
+// else if ( Vec_IntSize(vCubeFree) == 2 && Abc_Lit2Var(Abc_Lit2Var(Vec_IntEntry(vCubeFree, 0))) == Abc_Lit2Var(Abc_Lit2Var(Vec_IntEntry(vCubeFree, 1))) && !*fWarning )
+// printf( "The SOP has distance-1 cubes or it is not a prime cover. Please make sure the result verifies.\n" ), *fWarning = 1;
assert( !Abc_LitIsCompl(Vec_IntEntry(vCubeFree, 0)) );
return Counter;
}