minor edit

git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@484 e59a4935-1847-0410-ae03-e826735625c1

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index 55f0cc572bb10bb2383c05a44994c31b937f03c7..1449e03c1101a2cbcab49dc3d9793416207f9dd5 100644 (file)
--- a/scripts/Makefile.common
+++ b/scripts/Makefile.common
@@ -17,16 +17,16 @@ OPTIMIZE      = -O3               # Maximum optimization
 CFLAGS_BASE   = $(OPTIMIZE)
 
 # OPTION to compile CRYPTOMiniSAT
-CRYPTOMINISAT  = true
-CFLAGS_BASE    = $(OPTIMIZE) -DCRYPTOMINISAT
-MTL            = ../sat/cryptominisat/mtl
-SOLVER_INCLUDE = ../sat/cryptominisat
+# CRYPTOMINISAT  = true
+# CFLAGS_BASE    = $(OPTIMIZE) -DCRYPTOMINISAT
+# MTL            = ../sat/cryptominisat/mtl
+# SOLVER_INCLUDE = ../sat/cryptominisat
 
 # OPTION to compile CRYPTOMiniSAT version 2.x
-# CRYPTOMINISAT2 = true
-# CFLAGS_BASE    = $(OPTIMIZE) -DCRYPTOMINISAT2
-# MTL            = ../sat/cryptominisat2/mtl
-# SOLVER_INCLUDE = ../sat/cryptominisat2
+CRYPTOMINISAT2 = true
+CFLAGS_BASE    = $(OPTIMIZE) -DCRYPTOMINISAT2
+MTL            = ../sat/cryptominisat2/mtl
+SOLVER_INCLUDE = ../sat/cryptominisat2
 
 # OPTION to compile MiniSAT
 #CORE          = true

diff --git a/src/to-sat/ToSAT.cpp b/src/to-sat/ToSAT.cpp
index c6be352b8714dd217f665162e3b8b7ef360060ee..6f44a3c889f35ae2ced27257117ed2e240574ea2 100644 (file)
--- a/src/to-sat/ToSAT.cpp
+++ b/src/to-sat/ToSAT.cpp
@@ -129,11 +129,11 @@ namespace BEEV
         if(add_xor_clauses)
           {         
             //cout << "addXorClause:\n";
-            newSolver.addXorClause(satSolverClause, false, 0, "z");
+            newSolver.addXorClause(satSolverClause, false, 0, (char*)"z");
           }
         else 
           {
-            newSolver.addClause(satSolverClause,0,"z");
+            newSolver.addClause(satSolverClause,0,(char*)"z");
           }
 #else
         newSolver.addClause(satSolverClause);
@@ -150,8 +150,8 @@ namespace BEEV
 
 #if defined CRYPTOMINISAT2
            newSolver.set_gaussian_decision_until(300);
-           newSolver.performReplace = false;
-           newSolver.xorFinder = false;
+           newSolver.performReplace = true;
+           newSolver.xorFinder = true;
 #endif
            newSolver.solve();
             bm->GetRunTimes()->stop(RunTimes::Solving);