diff options
| author | Tim King <taking@cs.nyu.edu> | 2010-11-15 21:15:45 +0000 |
|---|---|---|
| committer | Tim King <taking@cs.nyu.edu> | 2010-11-15 21:15:45 +0000 |
| commit | ec4e1bdba56565d6372cb19ded12c9cadc506870 (patch) | |
| tree | c263b7bf2e38034885089633677513e2ceff366e /src/theory/arith/theory_arith.h | |
| parent | 24b8c7f104ae9bebbbb04b973d62337c43c6adb8 (diff) | |
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.
Diffstat (limited to 'src/theory/arith/theory_arith.h')
| -rw-r--r-- | src/theory/arith/theory_arith.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/theory/arith/theory_arith.h b/src/theory/arith/theory_arith.h index 5c65b993d..81711a101 100644 --- a/src/theory/arith/theory_arith.h +++ b/src/theory/arith/theory_arith.h @@ -33,7 +33,7 @@ #include "theory/arith/tableau.h" #include "theory/arith/arith_rewriter.h" #include "theory/arith/partial_model.h" -#include "theory/arith/arith_propagator.h" +#include "theory/arith/unate_propagator.h" #include "theory/arith/simplex.h" #include "util/stats.h" @@ -176,6 +176,8 @@ private: class Statistics { public: IntStat d_statUserVariables, d_statSlackVariables; + IntStat d_statDisequalitySplits; + IntStat d_statDisequalityConflicts; Statistics(); ~Statistics(); |