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

Fiddled with the types of genNewItem and similar functions, ready to support compound expressions in the QuickCheck tests

Browse Source
This commit is contained in:
Neil Brown 2008-02-09 02:01:01 +00:00
parent 1a89fdd218
commit 7fbb83a813
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
checks/ArrayUsageCheckTest.hs
View File

@ -527,28 +527,35 @@ type GenEqItems = (A.Expression, [(CoeffIndex, Integer)])
-- Generates a new variable, or multiplied variable pair -- Generates a new variable, or multiplied variable pair
-- TODO potentially scale variable -- TODO potentially scale variable
genNewItem :: StateT VarMap Gen GenEqItems genNewItem :: Bool -> StateT VarMap Gen (GenEqItems, FlattenedExp)
genNewItem = do m <- get genNewItem specialAllowed
let nextId = 1 + maximum (0 : Map.elems m) = do (exp, fexp, nextId) <- frequency' $
(exp, fexp) <- frequency' [(80, do m <- get
[(80, return (exprVariable $ "x" ++ show nextId, Scale 1 (variable $ "x" ++ show nextId,0) )) let nextId = 1 + maximum (0 : Map.elems m)
return (exprVariable $ "x" ++ show nextId, Scale 1 (variable $ "x" ++ show nextId,0), nextId))
-- TODO enable this once multiplied variables are supported -- TODO enable this once multiplied variables are supported
-- ,(20, return $ A.Dyadic emptyMeta A.Mul (exprVariable $ "y" ++ show nextId) (exprVariable $ "y" ++ show nextId))] -- ,(20, return (A.Dyadic emptyMeta A.Mul (exprVariable $ "y" ++ show nextId) (exprVariable $ "y" ++ show nextId))
] ] ++ if not specialAllowed then []
put $ Map.insert fexp nextId m else [(20, do ((eT,iT),fT) <- genNewItem False
return (exp, [(nextId,1)]) ((eB,iB),fB) <- genNewItem False
m <- get
let nextId = 1 + maximum (0 : Map.elems m)
return (A.Dyadic emptyMeta A.Rem eT eB, Modulo (Set.singleton fT) (Set.singleton fB), nextId)
)]
modify (Map.insert fexp nextId)
return ((exp, [(nextId,1)]), fexp)
genConst :: StateT VarMap Gen GenEqItems genConst :: StateT VarMap Gen (GenEqItems, FlattenedExp)
genConst = do val <- lift $ choose (1, 10) genConst = do val <- lift $ choose (1, 10)
let exp = intLiteral val let exp = intLiteral val
return (exp, [(0,val)]) return ((exp, [(0,val)]), Const val)
generateEquationInput :: Gen ([((A.Expression, A.Expression),VarMap,[HandyEq],[HandyIneq])],ParItems [A.Expression],A.Expression) generateEquationInput :: Gen ([((A.Expression, A.Expression),VarMap,[HandyEq],[HandyIneq])],ParItems [A.Expression],A.Expression)
generateEquationInput generateEquationInput
= do ((items, upper),vm) <- flip runStateT Map.empty = do ((items, upper),vm) <- flip runStateT Map.empty
(do upper <- frequency' [(80, genConst), (20, genNewItem)] (do upper <- frequency' [(80, genConst >>* fst), (20, genNewItem False >>* fst)]
itemCount <- lift $ choose (1,6) itemCount <- lift $ choose (1,6)
items <- replicateM itemCount $ frequency' [(40, genConst), (60, genNewItem)] items <- replicateM itemCount (genNewItem False >>* fst)
return (items, upper) return (items, upper)
) )
return (makeResults vm items upper, ParItems $ map (\(x,_) -> SeqItems [[x]]) items, fst upper) return (makeResults vm items upper, ParItems $ map (\(x,_) -> SeqItems [[x]]) items, fst upper)