Skip to content

Commit 2aa81eb

Browse files
committed
Remove support for SMVSAT
Publications on SMVSAT appeared in 2004 and it's not clear where it might be available for download. The code base has not fully supported it anymore either.
1 parent a0fd3f7 commit 2aa81eb

File tree

5 files changed

+2
-341
lines changed

5 files changed

+2
-341
lines changed

src/config.inc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ endif
2525
#MINISAT2 = ../../minisat-2.2.1
2626
#IPASIR = ../../ipasir
2727
#GLUCOSE = ../../glucose-syrup
28-
#SMVSAT =
2928

3029
# Extra library for SAT solver. This should link to the archive file to be used
3130
# when linking against an IPASIR solver.
@@ -63,10 +62,6 @@ ifneq ($(GLUCOSE),)
6362
CP_CXXFLAGS += -DSATCHECK_GLUCOSE
6463
endif
6564

66-
ifneq ($(SMVSAT),)
67-
CP_CXXFLAGS += -DSATCHECK_SMVSAT
68-
endif
69-
7065
# Signing identity for MacOS Gatekeeper
7166

7267
OSX_IDENTITY="Developer ID Application: Daniel Kroening"

src/solvers/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ set(minisat2_source
1818
set(glucose_source
1919
${CMAKE_CURRENT_SOURCE_DIR}/sat/satcheck_glucose.cpp
2020
)
21-
set(smvsat_source
22-
${CMAKE_CURRENT_SOURCE_DIR}/sat/satcheck_smvsat.cpp
23-
)
2421
set(squolem2_source
2522
${CMAKE_CURRENT_SOURCE_DIR}/qbf/qbf_squolem.cpp
2623
${CMAKE_CURRENT_SOURCE_DIR}/qbf/qbf_squolem_core.cpp
@@ -51,7 +48,6 @@ list(REMOVE_ITEM sources
5148
${minisat_source}
5249
${minisat2_source}
5350
${glucose_source}
54-
${smvsat_source}
5551
${squolem2_source}
5652
${cudd_source}
5753
${precosat_source}

src/solvers/Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ ifneq ($(GLUCOSE),)
3636
CP_CXXFLAGS += -DHAVE_GLUCOSE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
3737
endif
3838

39-
ifneq ($(SMVSAT),)
40-
SMVSAT_SRC=sat/satcheck_smvsat.cpp
41-
SMVSAT_INCLUDE=-I $(SMVSAT)/include
42-
SMVSAT_LIB=$(SMVSAT)/lib/libsmvsat$(LIBEXT)
43-
endif
44-
4539
ifneq ($(SQUOLEM2),)
4640
SQUOLEM2_SRC=qbf/qbf_squolem.cpp qbf/qbf_squolem_core.cpp
4741
SQUOLEM2_INCLUDE=-I $(SQUOLEM2)
@@ -87,7 +81,6 @@ SRC = $(BOOLEFORCE_SRC) \
8781
$(MINISAT_SRC) \
8882
$(PICOSAT_SRC) \
8983
$(PRECOSAT_SRC) \
90-
$(SMVSAT_SRC) \
9184
$(SQUOLEM2_SRC) \
9285
cvc/cvc_conv.cpp \
9386
cvc/cvc_dec.cpp \
@@ -205,7 +198,7 @@ SRC = $(BOOLEFORCE_SRC) \
205198
INCLUDES += -I .. \
206199
$(CHAFF_INCLUDE) $(BOOLEFORCE_INCLUDE) $(MINISAT_INCLUDE) $(MINISAT2_INCLUDE) \
207200
$(IPASIR_INCLUDE) \
208-
$(SMVSAT_INCLUDE) $(SQUOLEM2_INC) $(CUDD_INCLUDE) $(GLUCOSE_INCLUDE) \
201+
$(SQUOLEM2_INC) $(CUDD_INCLUDE) $(GLUCOSE_INCLUDE) \
209202
$(PRECOSAT_INCLUDE) $(PICOSAT_INCLUDE) $(LINGELING_INCLUDE)
210203

211204
CLEANFILES = solvers$(LIBEXT) \
@@ -222,7 +215,7 @@ endif
222215
endif
223216

224217
SOLVER_LIB = $(CHAFF_LIB) $(BOOLEFORCE_LIB) $(MINISAT_LIB) \
225-
$(MINISAT2_LIB) $(SMVSAT_LIB) $(SQUOLEM2_LIB) $(CUDD_LIB) \
218+
$(MINISAT2_LIB) $(SQUOLEM2_LIB) $(CUDD_LIB) \
226219
$(PRECOSAT_LIB) $(PICOSAT_LIB) $(LINGELING_LIB) $(GLUCOSE_LIB)
227220

228221
###############################################################################

src/solvers/sat/satcheck_smvsat.cpp

Lines changed: 0 additions & 233 deletions
This file was deleted.

0 commit comments

Comments
 (0)