Experiments with SAT-based collapsing.

src/base/abc/abcDfs.c

@@ -970,7 +970,7 @@ Vec_Int_t * Abc_NtkNodeSupportInt( Abc_Ntk_t * pNtk, int iCo )
 int Abc_NtkFunctionalIsoGia_rec( Gia_Man_t * pNew, Abc_Obj_t * pNode )
 {
     int iLit0, iLit1;
-    if ( Abc_NodeIsTravIdCurrent(pNode) || Abc_ObjFaninNum(pNode) == 0 )
+    if ( Abc_NodeIsTravIdCurrent(pNode) || Abc_ObjFaninNum(pNode) == 0 || Abc_ObjIsCi(pNode) )
         return pNode->iTemp;
     assert( Abc_ObjIsNode( pNode ) );
     Abc_NodeSetTravIdCurrent( pNode );

src/base/abci/abcCollapse.c

@@ -256,7 +256,7 @@ Abc_Ntk_t * Abc_NtkCollapse( Abc_Ntk_t * pNtk, int fBddSizeMax, int fDualRail, i
 int Abc_NtkClpOneGia_rec( Gia_Man_t * pNew, Abc_Obj_t * pNode )
 {
     int iLit0, iLit1;
-    if ( Abc_NodeIsTravIdCurrent(pNode) || Abc_ObjFaninNum(pNode) == 0 )
+    if ( Abc_NodeIsTravIdCurrent(pNode) || Abc_ObjFaninNum(pNode) == 0 || Abc_ObjIsCi(pNode) )
         return pNode->iTemp;
     assert( Abc_ObjIsNode( pNode ) );
     Abc_NodeSetTravIdCurrent( pNode );

src/sat/bsat/satSolver.c

@@ -1861,7 +1861,7 @@ int sat_solver_solve(sat_solver* s, lit* begin, lit* end, ABC_INT64_T nConfLimit
             int fConfl = sat_solver_propagate(s);
             if (fConfl){
                 sat_solver_analyze_final(s, fConfl, 0);
-                assert(s->conf_final.size > 0);
+                //assert(s->conf_final.size > 0);
                 sat_solver_canceluntil(s, 0);
                 return l_False; }
         }

src/sat/bsat/satSolver.h

@@ -234,6 +234,13 @@ static void sat_solver_prepare_enum(sat_solver* s, int * pVars, int nVars )
     for ( v = 0; v < nVars; v++ )
         veci_push(&s->vDeciVars,pVars[v]);
 }
+static void sat_solver_clean_polarity(sat_solver* s, int * pVars, int nVars )
+{
+    int i;
+    assert( veci_size(&s->vDeciVars) == 0 );
+    for ( i = 0; i < nVars; i++ )
+        s->polarity[pVars[i]] = 0;
+}
 
 static int sat_solver_final(sat_solver* s, int ** ppArray)
 {