Experiments with don't-cares.

abclib.dsp

@@ -5695,7 +5695,7 @@ SOURCE=.\src\proof\acec\acec.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\proof\acec\acec2Booth.c
+SOURCE=.\src\proof\acec\acec2Mult.c
 # End Source File
 # Begin Source File
 

src/base/acb/acb.h

@@ -88,9 +88,13 @@ struct Acb_Ntk_t_
     Vec_Int_t       vLevelR;    // level
     Vec_Int_t       vPathD;     // path
     Vec_Int_t       vPathR;     // path
+    Vec_Wec_t       vClauses;
+    Vec_Wec_t       vCnfs;
+    Vec_Int_t       vCover;
     // other
     Vec_Int_t       vArray0;
     Vec_Int_t       vArray1;
+    Vec_Int_t       vArray2;
 };
 
 // design
@@ -239,6 +243,7 @@ static inline int            Acb_ObjFanOffset( Acb_Ntk_t * p, int i )        { a
 static inline int *          Acb_ObjFanins( Acb_Ntk_t * p, int i )           { return Vec_IntEntryP(&p->vFanSto, Acb_ObjFanOffset(p, i));                                   }
 static inline int            Acb_ObjFanin( Acb_Ntk_t * p, int i, int k )     { return Acb_ObjFanins(p, i)[k+1];                                                             }
 static inline int            Acb_ObjFaninNum( Acb_Ntk_t * p, int i )         { return Acb_ObjFanins(p, i)[0];                                                               }
+static inline int            Acb_ObjFanoutNum( Acb_Ntk_t * p, int i )        { return Vec_IntSize( Vec_WecEntry(&p->vFanouts, i) );                                         }
 static inline int            Acb_ObjFanin0( Acb_Ntk_t * p, int i )           { return Acb_ObjFanins(p, i)[1];                                                               }
 static inline int            Acb_ObjCioId( Acb_Ntk_t * p, int i )            { return Acb_ObjFanins(p, i)[2];                                                               }
  
@@ -288,10 +293,13 @@ static inline void           Acb_ObjHashRange( Acb_Ntk_t * p, int i, int l, int
 static inline int            Acb_ObjRangeSign( Acb_Ntk_t * p, int i )               { return Abc_Var2Lit( Acb_ObjRangeSize(p, i), Acb_ObjSigned(p, i) );                           }
 
 static inline int            Acb_ObjTravId( Acb_Ntk_t * p, int i )                  { return Vec_IntGetEntry(&p->vObjTrav, i);                                                     }
+static inline int            Acb_ObjTravIdDiff( Acb_Ntk_t * p, int i )              { return p->nObjTravs - Vec_IntGetEntry(&p->vObjTrav, i);                                      }
 static inline int            Acb_ObjIsTravIdCur( Acb_Ntk_t * p, int i )             { return Acb_ObjTravId(p, i) == p->nObjTravs;                                                  }
 static inline int            Acb_ObjIsTravIdPrev( Acb_Ntk_t * p, int i )            { return Acb_ObjTravId(p, i) == p->nObjTravs-1;                                                }
+static inline int            Acb_ObjIsTravIdDiff( Acb_Ntk_t * p, int i, int d )     { return Acb_ObjTravId(p, i) == p->nObjTravs-d;                                                }
 static inline int            Acb_ObjSetTravIdCur( Acb_Ntk_t * p, int i )            { int r = Acb_ObjIsTravIdCur(p, i);  Vec_IntWriteEntry(&p->vObjTrav, i, p->nObjTravs);   return r; }
 static inline int            Acb_ObjSetTravIdPrev( Acb_Ntk_t * p, int i )           { int r = Acb_ObjIsTravIdPrev(p, i); Vec_IntWriteEntry(&p->vObjTrav, i, p->nObjTravs-1); return r; }
+static inline int            Acb_ObjSetTravIdDiff( Acb_Ntk_t * p, int i, int d )    { int r = Acb_ObjTravIdDiff(p, i);   Vec_IntWriteEntry(&p->vObjTrav, i, p->nObjTravs-d); return r; }
 static inline int            Acb_NtkTravId( Acb_Ntk_t * p )                         { return p->nObjTravs;                                                                         }
 static inline void           Acb_NtkIncTravId( Acb_Ntk_t * p )                      { if ( !Acb_NtkHasObjTravs(p) ) Acb_NtkCleanObjTravs(p); p->nObjTravs++;                       }
 
@@ -493,6 +501,7 @@ static inline void Acb_NtkFree( Acb_Ntk_t * p )
     // other
     Vec_IntErase( &p->vArray0 );    
     Vec_IntErase( &p->vArray1 );    
+    Vec_IntErase( &p->vArray2 );    
     ABC_FREE( p );
 }
 static inline int Acb_NtkNewStrId( Acb_Ntk_t * pNtk, const char * format, ...  )
@@ -663,8 +672,9 @@ static inline int Acb_NtkMemory( Acb_Ntk_t * p )
     nMem += (int)Vec_IntMemory(&p->vNtkObjs );  
     nMem += (int)Vec_IntMemory(&p->vTargets );  
     // other
+    nMem += (int)Vec_IntMemory(&p->vArray0 );
     nMem += (int)Vec_IntMemory(&p->vArray1 );
-    nMem += (int)Vec_IntMemory(&p->vArray1 );
+    nMem += (int)Vec_IntMemory(&p->vArray2 );
     return nMem;
 }
 static inline void Acb_NtkPrintStats( Acb_Ntk_t * p )

src/sat/bmc/bmcFault.c

@@ -1069,7 +1069,7 @@ Vec_Int_t * Gia_ManGetTestPatterns( char * pFileName )
             continue;
         if ( c != '0' && c != '1' )
         {
-            printf( "Wring symbol (%c) in the input file.\n", c );
+            printf( "Wrong symbol (%c) in the input file.\n", c );
             Vec_IntFreeP( &vTests );
             break;
         }