Merge from decision branch (till r3663)
authorKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 8 Jun 2012 05:56:08 +0000 (05:56 +0000)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 8 Jun 2012 05:56:08 +0000 (05:56 +0000)
commit8cd22903675724e29249ce089ee77c7c4d3897fb
tree64ea92a2a0f8721b7e1b15796824f6259567aa75
parent6685546d585212559b97d5722161ad52ff5c4121
Merge from decision branch (till r3663)

(no performace or search behavior changes expected)
21 files changed:
src/decision/Makefile.am
src/decision/decision_engine.cpp
src/decision/decision_engine.h
src/decision/decision_strategy.h
src/decision/justification_heuristic.cpp
src/decision/relevancy.cpp [new file with mode: 0644]
src/decision/relevancy.h [new file with mode: 0644]
src/main/driver.cpp
src/prop/cnf_stream.cpp
src/prop/minisat/core/Solver.cc
src/prop/minisat/minisat.cpp
src/prop/minisat/minisat.h
src/prop/prop_engine.cpp
src/prop/sat_solver_types.h
src/prop/theory_proxy.cpp
src/prop/theory_proxy.h
src/smt/smt_engine.cpp
src/util/options.cpp
src/util/options.h
test/regress/regress0/arith/Makefile.am
test/regress/regress0/arith/integers/Makefile.am