diff options
author | Tim King <taking@cs.nyu.edu> | 2012-06-27 22:45:51 +0000 |
---|---|---|
committer | Tim King <taking@cs.nyu.edu> | 2012-06-27 22:45:51 +0000 |
commit | 86eb789dfb6b79a964912ac8289c2ecb28628667 (patch) | |
tree | 48298f8e26711c40b2cb84fa7c18773de285ba58 /src/theory/arith | |
parent | cde31cf615ccd7f8e090f1713022e5aeae31ccb5 (diff) |
Fixing a bug in proof production for the DioSolver.
Diffstat (limited to 'src/theory/arith')
-rw-r--r-- | src/theory/arith/dio_solver.cpp | 6 | ||||
-rw-r--r-- | src/theory/arith/theory_arith.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/theory/arith/dio_solver.cpp b/src/theory/arith/dio_solver.cpp index 093fef0d5..38cff88ff 100644 --- a/src/theory/arith/dio_solver.cpp +++ b/src/theory/arith/dio_solver.cpp @@ -213,10 +213,10 @@ Node DioSolver::proveIndex(TrailIndex i){ Node input = proofVariableToReason(v); Assert(acceptableOriginalNodes(input)); if(input.getKind() == kind::AND){ - if(input.getNumChildren() != 2){ - Warning() << "Fix this bug!" << std::endl; + for(Node::iterator input_iter = input.begin(), input_end = input.end(); input_iter != input_end; ++input_iter){ + Node inputChild = *input_iter; + nb << inputChild; } - nb << input[0] << input[1]; }else{ nb << input; } diff --git a/src/theory/arith/theory_arith.cpp b/src/theory/arith/theory_arith.cpp index badfe4c41..6174e9500 100644 --- a/src/theory/arith/theory_arith.cpp +++ b/src/theory/arith/theory_arith.cpp @@ -1521,7 +1521,7 @@ void TheoryArith::check(Effort effortLevel){ d_partialModel.commitAssignmentChanges(); revertOutOfConflict(); - if(Debug.isOn("arith::consistency")){ + if(Debug.isOn("arith::consistency::comitonconflict")){ entireStateIsConsistent("commit on conflict"); } } @@ -2083,7 +2083,7 @@ bool TheoryArith::unenqueuedVariablesAreConsistent(){ } Warning() << endl; result = false; - } else { + } else if(Debug.isOn("arith::consistency::initial")){ d_partialModel.printModel(var); Warning() << "Initial var is not consistent for " << var << *i; if(d_tableau.isBasic(var)){ |