From ced538b2249c503cbfb00bf8328be9a0a8993904 Mon Sep 17 00:00:00 2001 From: vijay_ganesh Date: Sat, 9 Jan 2010 23:05:26 +0000 Subject: [PATCH] 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 --- scripts/Makefile.common | 25 ++++++++++++------------- src/sat/core/Solver.C | 2 +- src/sat/simp/SimpSolver.C | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/scripts/Makefile.common b/scripts/Makefile.common index 9d0ae8e..ac03650 100644 --- 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 feb7843..8523996 100644 --- 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 a444c45..03b1990 100644 --- 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); } -- 2.47.3