From: vijay_ganesh <vijay_ganesh@e59a4935-1847-0410-ae03-e826735625c1>
Date: Tue, 8 Dec 2009 17:04:05 +0000 (+0000)
Subject: minor edit
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=327c952cc60e0f8744e2448d4e2db7b8466bdf78;p=francis%2Fstp.git

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 55f0cc5..1449e03 100644
--- 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 c6be352..6f44a3c 100644
--- 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);