missed few modifications

meelgroup · Nov 15, 2024 · 9e724e5 · 9e724e5
1 parent 608a2d2
commit 9e724e5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/lib/Sat/CryptoMinisat5.cpp b/lib/Sat/CryptoMinisat5.cpp
@@ -117,7 +117,7 @@ uint8_t CryptoMiniSat5::modelValue(uint32_t x) const
   return (s->get_model().at(x) == CMSat::l_True);
 }
 
-uint32_t CryptoMiniSat5::newProjVar()
+uint32_t CryptoMiniSat5::newProjVar(uint32_t x)
 {
   return 42;
 }

diff --git a/lib/extlib-abc/cnf_short.h b/lib/extlib-abc/cnf_short.h
@@ -55,30 +55,32 @@ extern "C" {
 
 #include "vec.h"
 #include "aig.h"
-//#include "darInt.h"
-
-////////////////////////////////////////////////////////////////////////
-///                         PARAMETERS                               ///
-////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////
-///                         BASIC TYPES                              ///
-////////////////////////////////////////////////////////////////////////
-
-typedef struct Cnf_Man_t_            Cnf_Man_t;
-typedef struct Cnf_Dat_t_            Cnf_Dat_t;
-typedef struct Cnf_Cut_t_            Cnf_Cut_t;
-
-// the CNF asserting outputs of AIG to be 1
-struct Cnf_Dat_t_
-{
-    Aig_Man_t *     pMan;            // the AIG manager, for which CNF is computed
-    int             nVars;           // the number of variables
-    int             nLiterals;       // the number of CNF literals
-    int             nClauses;        // the number of CNF clauses
-    int **          pClauses;        // the CNF clauses
-    int *           pVarNums;        // the number of CNF variable for each node ID (-1 if unused)
-};
+#include "vec.h"
+  //#include "darInt.h"
+
+  ////////////////////////////////////////////////////////////////////////
+  ///                         PARAMETERS                               ///
+  ////////////////////////////////////////////////////////////////////////
+
+  ////////////////////////////////////////////////////////////////////////
+  ///                         BASIC TYPES                              ///
+  ////////////////////////////////////////////////////////////////////////
+
+  typedef struct Cnf_Man_t_ Cnf_Man_t;
+  typedef struct Cnf_Dat_t_ Cnf_Dat_t;
+  typedef struct Cnf_Cut_t_ Cnf_Cut_t;
+
+  // the CNF asserting outputs of AIG to be 1
+  struct Cnf_Dat_t_
+  {
+    Aig_Man_t* pMan; // the AIG manager, for which CNF is computed
+    int nVars;       // the number of variables
+    int nLiterals;   // the number of CNF literals
+    int nClauses;    // the number of CNF clauses
+    int** pClauses;  // the CNF clauses
+    int* pVarNums; // the number of CNF variable for each node ID (-1 if unused)
+    int* lProjVars; // the projection variables
+  };
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpedantic"