minor modification to Makefile.common to isolate some memory blowup problems

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

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index 9d0ae8e600d1f3d571e0034442e1fa6745680350..ac03650616f4c3a421eb41f3fac4cba6f8639461 100644 (file)
--- a/scripts/Makefile.common
+++ b/scripts/Makefile.common
@@ -24,16 +24,16 @@ CFLAGS_BASE   = $(OPTIMIZE)
 # 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
-#CFLAGS_BASE   = $(OPTIMIZE) -DCORE
-#MTL            = ../sat/mtl
-#SOLVER_INCLUDE = ../sat/core
+CORE          = true
+CFLAGS_BASE   = $(OPTIMIZE) -DCORE
+MTL            = ../sat/mtl
+SOLVER_INCLUDE = ../sat/core
 
 
 # OPTION to compile UNSOUND MiniSAT
@@ -44,11 +44,10 @@ SOLVER_INCLUDE = ../sat/cryptominisat2
 
 
 # OPTION to compile Simplifying MiniSAT
-#SIMP          = true
-#CFLAGS_BASE   = $(OPTIMIZE) -DSIMP
-#MTL            = ../sat/mtl
-#SOLVER_INCLUDE = ../sat/simp
-
+# SIMP          = true
+# CFLAGS_BASE   = $(OPTIMIZE) -DSIMP
+# MTL            = ../sat/mtl
+# SOLVER_INCLUDE = ../sat/simp
 
 SHELL=/bin/bash
 

diff --git a/src/sat/core/Solver.C b/src/sat/core/Solver.C
index feb784307cba612a96b9781ea44fde924472da83..8523996792d425dd3099a885d7c15f9ebfbed71d 100644 (file)
--- a/src/sat/core/Solver.C
+++ b/src/sat/core/Solver.C
@@ -725,7 +725,7 @@ void Solver::verifyModel()
 
     assert(!failed);
 
-    reportf("Verified %d original clauses.\n", clauses.size());
+    //reportf("Verified %d original clauses.\n", clauses.size());
 }
 
 

diff --git a/src/sat/simp/SimpSolver.C b/src/sat/simp/SimpSolver.C
index a444c4508883ca54fe089ed9198c83391bcbf5c2..03b19907d495d7d7f09295cf6156383b4c4eaef8 100644 (file)
--- a/src/sat/simp/SimpSolver.C
+++ b/src/sat/simp/SimpSolver.C
@@ -441,7 +441,7 @@ void SimpSolver::verifyModel()
             }
 
     assert(!failed);
-    reportf("Verified %d eliminated clauses.\n", cnt);
+    //reportf("Verified %d eliminated clauses.\n", cnt);
 }