Merge from decision branch (ITE support)
authorKshitij Bansal <kshitij@cs.nyu.edu>
Wed, 9 May 2012 05:45:36 +0000 (05:45 +0000)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Wed, 9 May 2012 05:45:36 +0000 (05:45 +0000)
commit6243fba11e0189891acf21de3c6daa072b038e13
tree8265abfa3e583831a972acdf97989930ae9c3592
parent9f74cfbd847663f80c362cf06bda7e749f0f694b
Merge from decision branch (ITE support)

Major changes from last merge
* ITEs supported
* Don't share theory lemmas to DE, only assertions

Should probably be noted that 'make regress' doesn't quite
pass with --decision=justification. Throws off search in couple
of arith benchmarks.

No serious performance changes expected. Keep an eye.
src/decision/decision_engine.cpp
src/decision/decision_engine.h
src/decision/decision_strategy.h
src/decision/justification_heuristic.cpp
src/decision/justification_heuristic.h
src/prop/minisat/core/Solver.cc
src/prop/prop_engine.cpp
src/smt/smt_engine.cpp
src/theory/theory_engine.h
src/util/ite_removal.h