This commit merges the arith-prop-opt branch into the main trunk. This was done by...
authorTim King <taking@cs.nyu.edu>
Mon, 15 Nov 2010 21:15:45 +0000 (21:15 +0000)
committerTim King <taking@cs.nyu.edu>
Mon, 15 Nov 2010 21:15:45 +0000 (21:15 +0000)
commitec4e1bdba56565d6372cb19ded12c9cadc506870
treec263b7bf2e38034885089633677513e2ceff366e
parent24b8c7f104ae9bebbbb04b973d62337c43c6adb8
This commit merges the arith-prop-opt branch into the main trunk. This was done by way of the intermediate branch arith-prop-tmp. Both arith-prop-opt and arith-prop-tmp will now be phased out.
13 files changed:
src/prop/prop_engine.cpp
src/prop/prop_engine.h
src/theory/arith/Makefile.am
src/theory/arith/arith_propagator.cpp [deleted file]
src/theory/arith/arith_propagator.h [deleted file]
src/theory/arith/ordered_set.h [new file with mode: 0644]
src/theory/arith/theory_arith.cpp
src/theory/arith/theory_arith.h
src/theory/arith/unate_propagator.cpp [new file with mode: 0644]
src/theory/arith/unate_propagator.h [new file with mode: 0644]
src/theory/theory_engine.h
src/theory/theory_test_utils.h
test/unit/theory/theory_arith_white.h