Small rewrite

c3f3c6f4 · Philipp Meyer · 2f387156 · c3f3c6f4 · c3f3c6f4
Commit c3f3c6f4 authored Aug 08, 2018 by Philipp Meyer
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

Property.hs src/Property.hs +3 -3

Formula.hs src/Solver/Formula.hs +2 -0

No files found.
--- a/src/Property.hs
+++ b/src/Property.hs
@@ -95,10 +95,10 @@ eliminateModulo' n makeVar (Equation lhs (ModEq m) rhs) =
        let k = makeVar n
        in  (Equation lhs Eq (rhs :+: ((Const m) :*: (Var k))), [k])
 eliminateModulo' n makeVar (Equation lhs (ModNe m) rhs) =
-        let j = makeVar (n + 1)
-            k = makeVar n
+        let j = makeVar n
+            k = makeVar (n + 1)
        in  ((Equation lhs Eq (rhs :+: ((Var j) :+: ((Const m) :*: (Var k))))) :&:
-            (Equation (Const 0) Lt (Var j)) :&: (Equation (Var j) Lt (Const m)), [k, j])
+            (Equation (Const 0) Lt (Var j)) :&: (Equation (Var j) Lt (Const m)), [j, k])
 eliminateModulo' n makeVar (g :|: h) =
        let (g', ag) = eliminateModulo' n makeVar g
            (h', ah) = eliminateModulo' (n + length ag) makeVar h

--- a/src/Solver/Formula.hs
+++ b/src/Solver/Formula.hs
@@ -23,6 +23,8 @@ opToFunction Eq = (.==)
 opToFunction Ne = (./=)
 opToFunction Le = (.<=)
 opToFunction Lt = (.<)
+opToFunction (ModEq _) = error "symbolic modulo not supported"
+opToFunction (ModNe _) = error "symbolic modulo not supported"

 evaluateFormula :: (Ord a, Show a) => Formula a -> SIMap a -> SBool
 evaluateFormula FTrue _ = true