From 46eb6df7e54a53c456ad495df03b9e6baf50dd1c Mon Sep 17 00:00:00 2001
From: ravi <ravi.kandhadai@epfl.ch>
Date: Tue, 8 Mar 2016 18:43:59 +0100
Subject: [PATCH] Fixing a broken orb unit test that failed the build.
---
.../invariant/structure/LinearConstraintUtil.scala | 2 +-
src/test/scala/leon/unit/orb/OrbUnitTestSuite.scala | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/scala/leon/invariant/structure/LinearConstraintUtil.scala b/src/main/scala/leon/invariant/structure/LinearConstraintUtil.scala
index 3ffb5c532..aee689be4 100644
--- a/src/main/scala/leon/invariant/structure/LinearConstraintUtil.scala
+++ b/src/main/scala/leon/invariant/structure/LinearConstraintUtil.scala
@@ -376,7 +376,7 @@ object LinearConstraintUtil {
}
case _ => Seq() // drop constraints with `oneSidedVars`
} ++ currEqs).distinct // note: this is very important!!
- Stats.updateCounterStats(currEqs.size, "UneliminatedEqualities", "disjuncts")
+ Stats.updateCumStats(currEqs.size, "UneliminatedEqualities")
resctrs
}
diff --git a/src/test/scala/leon/unit/orb/OrbUnitTestSuite.scala b/src/test/scala/leon/unit/orb/OrbUnitTestSuite.scala
index 32229100b..ac6a65f71 100644
--- a/src/test/scala/leon/unit/orb/OrbUnitTestSuite.scala
+++ b/src/test/scala/leon/unit/orb/OrbUnitTestSuite.scala
@@ -41,20 +41,20 @@ class OrbUnitTestSuite extends LeonTestSuite {
test("TestElimination") {ctx =>
val exprs = Seq(Equals(a, b), Equals(c, Plus(a, b)), GreaterEquals(Plus(c, d), zero))
- println("Exprs: "+exprs)
- val elimVars = Set(a, b, c).map(_.id)
+ //println("Exprs: "+exprs)
+ val retainVars = Set(d).map(_.id)
val ctrs = exprs map ConstraintUtil.createConstriant
- val nctrs = apply1PRuleOnDisjunct(ctrs.collect{ case c: LinearConstraint => c }, elimVars, None)
+ val nctrs = apply1PRuleOnDisjunct(ctrs.collect{ case c: LinearConstraint => c }, retainVars, None)
//println("Constraints after elimination: "+nctrs)
assert(nctrs.size == 1)
}
test("TestElimination2") {ctx =>
val exprs = Seq(Equals(zero, Plus(a, b)), Equals(a, zero), GreaterEquals(Plus(b, c), zero))
- println("Exprs: "+exprs)
- val elimVars = Set(a, b).map(_.id)
+ //println("Exprs: "+exprs)
+ val retainVars = Set(c).map(_.id)
val ctrs = exprs map ConstraintUtil.createConstriant
- val nctrs = apply1PRuleOnDisjunct(ctrs.collect{ case c: LinearConstraint => c }, elimVars, None)
+ val nctrs = apply1PRuleOnDisjunct(ctrs.collect{ case c: LinearConstraint => c }, retainVars, None)
//println("Constraints after elimination: "+nctrs)
assert(nctrs.size == 1)
}
--
GitLab