suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the norm helper to be a top-level function in the tests

Browse Source
This commit is contained in:
Neil Brown 2007-12-15 03:19:25 +00:00
parent 3e4e5355ff
commit d5461bb10b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
transformations/RainUsageCheckTest.hs
View File

@ -348,6 +348,10 @@ arrayise = simpleArray . zip [0..]
newtype HandyEq = Eq [(Int, Integer)] deriving (Show, Eq)
newtype HandyIneq = Ineq [(Int, Integer)] deriving (Show, Eq)
normaliseAnswers :: EqualityProblem -> EqualityProblem
-- Put all the equalities such that the units are positive:
normaliseAnswers = sort . map (\eq -> amap (* signum (eq ! 0)) eq)
testIndexes :: Test
testIndexes = TestList
[
@ -401,12 +405,10 @@ testIndexes = TestList
assertCounterExampleIs title counterEq (eq,ineq)
= assertCompareCustom title equivEq (Just counterEq) ((solveAndPrune eq ineq) >>* (getCounterEqs . fst))
where
equivEq (Just xs) (Just ys) = (sort $ map norm xs) == (sort $ map norm ys)
equivEq (Just xs) (Just ys) = (normaliseAnswers xs) == (normaliseAnswers ys)
equivEq Nothing Nothing = True
equivEq _ _ = False
-- Put all the equalities such that the units are positive:
norm eq = amap (* signum (eq ! 0)) eq
-- Given some indexes using "i", this function checks whether these can
-- ever overlap within the bounds given, and matches this against