Bug fix in &fraig -L <num>.

5 files changed, 107 insertions, 8 deletions

diff --git a/abcexe.dsp b/abcexe.dsp
index 2ea99f30..374c6de2 100644
--- a/abcexe.dsp
+++ b/abcexe.dsp
@@ -88,10 +88,6 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\src\aig\gia\giaBalance.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\src\base\main\main.c
 # End Source File
 # End Group
diff --git a/abclib.dsp b/abclib.dsp
index 943682c0..b18bb3a3 100644
--- a/abclib.dsp
+++ b/abclib.dsp
@@ -734,6 +734,98 @@ SOURCE=.\src\base\test\test.c
 
 # PROP Default_Filter ""
 # End Group
+# Begin Group "pcm"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\base\pcm\pcmCore.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\pcm\pcmCut.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\pcm\pcmInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\pcm\pcmMan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\pcm\pcmMap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\pcm\pcmReduce.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\pcm\pcmTime.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\pcm\pcmTruth.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\pcm\pcmUtil.c
+# End Source File
+# End Group
+# Begin Group "ply"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\base\ply\ply.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\ply\plyAbc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\ply\plyAig.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\ply\plyFake.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\ply\plyInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\ply\plyIter.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\ply\plyLib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\ply\plyMan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\ply\plyMap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\ply\plyNtk.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\ply\plyPair.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\ply\plyPar.c
+# End Source File
+# End Group
 # End Group
 # Begin Group "bdd"
 
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index dff328eb..c3ccc04b 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -10603,7 +10603,7 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv )
 //        Nf_ManPrepareLibraryTest();
 //        return 0;
     }
-/*
+
     if ( pNtk )
     {
 //        extern Abc_Ntk_t * Abc_NtkBarBufsOnOffTest( Abc_Ntk_t * pNtk );
@@ -10622,7 +10622,7 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv )
         }
         Abc_FrameReplaceCurrentNetwork( pAbc, pNtkRes );
     }
-*/
+
     return 0;
 usage:
     Abc_Print( -2, "usage: test [-CKDNM] [-aovwh] <file_name>\n" );
diff --git a/src/misc/vec/vecWrd.h b/src/misc/vec/vecWrd.h
index c765dd8d..5688d7b2 100644
--- a/src/misc/vec/vecWrd.h
+++ b/src/misc/vec/vecWrd.h
@@ -1084,6 +1084,17 @@ static inline void Vec_WrdUniqify( Vec_Wrd_t * p )
             p->pArray[k++] = p->pArray[i];
     p->nSize = k;
 }
+static inline int Vec_WrdUniqueCount( Vec_Wrd_t * vData, int nWordSize, Vec_Int_t ** pvMap )
+{
+    int Result;
+    Vec_Int_t * vDataInt = (Vec_Int_t *)vData;
+    vDataInt->nSize *= 2;
+    vDataInt->nCap *= 2;
+    Result = Vec_IntUniqueCount( vDataInt, 2 * nWordSize, pvMap );
+    vDataInt->nSize /= 2;
+    vDataInt->nCap /= 2;
+    return Result;
+}
 static inline Vec_Wrd_t * Vec_WrdUniqifyHash( Vec_Wrd_t * vData, int nWordSize )
 {
     Vec_Int_t * vResInt;
diff --git a/src/proof/cec/cecSweep.c b/src/proof/cec/cecSweep.c
index 977ff3a8..55f2219f 100644
--- a/src/proof/cec/cecSweep.c
+++ b/src/proof/cec/cecSweep.c
@@ -84,8 +84,8 @@ Gia_Man_t * Cec_ManFraSpecReduction( Cec_ManFra_t * p )
         if ( Abc_LitRegular(iNode) == Abc_LitRegular(iRepr) )
             continue;
         if ( p->pPars->nLevelMax && 
-            (Gia_ObjLevel(p->pAig, pObj)  > p->pPars->nLevelMax || 
-             Gia_ObjLevel(p->pAig, pRepr) > p->pPars->nLevelMax) )
+            (Gia_ObjLevelId(p->pAig, i)  > p->pPars->nLevelMax || 
+             Gia_ObjLevelId(p->pAig, Abc_Lit2Var(iRepr)) > p->pPars->nLevelMax) )
             continue;
         if ( p->pPars->fDualOut )
         {