Cleanup of arithmetic, and some new utility functions for the coming fcsimplex code.

diff --git a/src/theory/arith/arith_utilities.h b/src/theory/arith/arith_utilities.h
index c7f511a98f4c3abde7463dd32833c62d9f2dfa9d..76210fc7c5fbc4837b9d32971c36fbd239b1e76d 100644 (file)
--- a/src/theory/arith/arith_utilities.h
+++ b/src/theory/arith/arith_utilities.h
@@ -168,59 +168,6 @@ inline int deltaCoeff(Kind k){
   }
 }
 
-
-// template <bool selectLeft>
-// inline TNode getSide(TNode assertion, Kind simpleKind){
-//   switch(simpleKind){
-//   case kind::LT:
-//   case kind::GT:
-//   case kind::DISTINCT:
-//     return selectLeft ? (assertion[0])[0] : (assertion[0])[1];
-//   case kind::LEQ:
-//   case kind::GEQ:
-//   case kind::EQUAL:
-//     return selectLeft ? assertion[0] : assertion[1];
-//   default:
-//     Unreachable();
-//     return TNode::null();
-//   }
-// }
-
-// inline DeltaRational determineRightConstant(TNode assertion, Kind simpleKind){
-//   TNode right = getSide<false>(assertion, simpleKind);
-
-//   Assert(right.getKind() == kind::CONST_RATIONAL);
-//   const Rational& noninf = right.getConst<Rational>();
-
-//   Rational inf = Rational(Integer(deltaCoeff(simpleKind)));
-//   return DeltaRational(noninf, inf);
-// }
-
-// inline DeltaRational asDeltaRational(TNode n){
-//   Kind simp = simplifiedKind(n);
-//   return determineRightConstant(n, simp);
-// }
-
-//  /**
-//   * Takes two nodes with exactly 2 children,
-//   * the second child of both are of kind CONST_RATIONAL,
-//   * and compares value of the two children.
-//   * This is for comparing inequality nodes.
-//   *   RightHandRationalLT((<= x 50), (< x 75)) == true
-//   */
-// struct RightHandRationalLT
-// {
-//   bool operator()(TNode s1, TNode s2) const
-//   {
-//     TNode rh1 = s1[1];
-//     TNode rh2 = s2[1];
-//     const Rational& c1 = rh1.getConst<Rational>();
-//     const Rational& c2 = rh2.getConst<Rational>();
-//     int cmpRes = c1.cmp(c2);
-//     return cmpRes < 0;
-//   }
-// };
-
 inline Node negateConjunctionAsClause(TNode conjunction){
   Assert(conjunction.getKind() == kind::AND);
   NodeBuilder<> orBuilder(kind::OR);

diff --git a/src/theory/arith/arithvar.h b/src/theory/arith/arithvar.h
index 7cb6c6e995e94867a8ebfc1839bef9a7642b0d8a..eac238cba9346fb199540a9479e8fe7eccb6d320 100644 (file)
--- a/src/theory/arith/arithvar.h
+++ b/src/theory/arith/arithvar.h
@@ -50,6 +50,16 @@ public:
   virtual void operator()(ArithVar x) = 0;
 };
 
+/**
+ * Requests arithmetic variables for internal use,
+ * and releases arithmetic variables that are no longer being used.
+ */
+class ArithVarMalloc {
+public:
+  virtual ArithVar request() = 0;
+  virtual void release(ArithVar v) = 0;
+};
+
 class TNodeCallBack {
 public:
   virtual void operator()(TNode n) = 0;

diff --git a/src/theory/arith/partial_model.cpp b/src/theory/arith/partial_model.cpp
index 0ffe6776340800c93f7686758fbc35b9eef9e648..5dccd8747687827a7925a565f2b9bef2737721f8 100644 (file)
--- a/src/theory/arith/partial_model.cpp
+++ b/src/theory/arith/partial_model.cpp
@@ -72,7 +72,9 @@ void ArithPartialModel::setAssignment(ArithVar x, const DeltaRational& safe, con
    Debug("partial_model") << "pm: updating the assignment to" << x
                           << " now " << r <<endl;
   if(safe == r){
-    d_hasSafeAssignment[x] = false;
+    if(d_hasSafeAssignment[x]){
+      d_safeAssignment[x] = safe;
+    }
   }else{
     d_safeAssignment[x] = safe;
 
@@ -177,6 +179,25 @@ void ArithPartialModel::setUpperBoundConstraint(Constraint c){
   d_ubc.set(x, c);
 }
 
+void ArithPartialModel::forceRelaxLowerBound(ArithVar v){
+  AssertArgument(inMaps(v), "Calling forceRelaxLowerBound on a variable that is not properly setup.");
+  AssertArgument(hasLowerBound(v), "Calling forceRelaxLowerBound on a variable without a lowerbound.");
+
+  Debug("partial_model") << "forceRelaxLowerBound(" << v << ") dropping :" << getLowerBoundConstraint(v) << endl;
+
+  d_lbc.set(v, NullConstraint);
+}
+
+
+void ArithPartialModel::forceRelaxUpperBound(ArithVar v){
+  AssertArgument(inMaps(v), "Calling forceRelaxUpperBound on a variable that is not properly setup.");
+  AssertArgument(hasUpperBound(v), "Calling forceRelaxUpperBound on a variable without an upper bound.");
+
+  Debug("partial_model") << "forceRelaxUpperBound(" << v << ") dropping :" << getUpperBoundConstraint(v) << endl;
+
+  d_ubc.set(v, NullConstraint);
+}
+
 int ArithPartialModel::cmpToLowerBound(ArithVar x, const DeltaRational& c) const{
   if(!hasLowerBound(x)){
     // l = -\intfy

diff --git a/src/theory/arith/partial_model.h b/src/theory/arith/partial_model.h
index 49cfd44a1bd8b7e51c797b2dfc2964233cbfdeef..9a41d8d2395d391871c779fceaae57c2422257b9 100644 (file)
--- a/src/theory/arith/partial_model.h
+++ b/src/theory/arith/partial_model.h
@@ -68,16 +68,40 @@ public:
 
   ArithPartialModel(context::Context* c, RationalCallBack& deltaComputation);
 
+  /**
+   * This sets the lower bound for a variable in the current context.
+   * This must be stronger the previous constraint.
+   */
   void setLowerBoundConstraint(Constraint lb);
+
+  /**
+   * This sets the upper bound for a variable in the current context.
+   * This must be stronger the previous constraint.
+   */
   void setUpperBoundConstraint(Constraint ub);
 
+  /** Returns the constraint for the upper bound of a variable. */
   inline Constraint getUpperBoundConstraint(ArithVar x) const{
     return d_ubc[x];
   }
+  /** Returns the constraint for the lower bound of a variable. */
   inline Constraint getLowerBoundConstraint(ArithVar x) const{
     return d_lbc[x];
   }
 
+  /**
+   * This forces the lower bound for a variable to be relaxed in the current context.
+   * This is done by forcing the lower bound to be NullConstraint.
+   * This is an expert only operation! (See primal simplex for an example.)
+   */
+  void forceRelaxLowerBound(ArithVar x);
+
+  /**
+   * This forces the upper bound for a variable to be relaxed in the current context.
+   * This is done by forcing the upper bound to be NullConstraint.
+   * This is an expert only operation! (See primal simplex for an example.)
+   */
+  void forceRelaxUpperBound(ArithVar x);
 
   /* Initializes a variable to a safe value.*/
   void initialize(ArithVar x, const DeltaRational& r);
@@ -190,7 +214,6 @@ public:
     d_deltaIsSafe = true;
   }
 
-
 private:
 
   /**