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

Changed various uses of the maximum function to make sure they always succeed

Browse Source
This commit is contained in:
Neil Brown 2008-01-15 17:33:19 +00:00
parent 918b9e7af7
commit f6ba7be173
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
transformations/ArrayUsageCheck.hs
View File

@ -357,7 +357,7 @@ makeEquations es high = makeEquations' >>* (\(s,v,lh) -> [(s,squareEquations eqI
mapToArray :: (IArray a v, Num v, Num k, Ord k, Ix k) => Map.Map k v -> a k v
mapToArray m = accumArray (+) 0 (0, highest') . Map.assocs $ m
where
highest' = maximum $ Map.keys m
highest' = maximum $ 0 : Map.keys m
-- | Given a pair of equation sets, makes all the equations in the lists be the length
-- of the longest equation. All missing elements are of course given value zero.
@ -368,7 +368,7 @@ makeEquations es high = makeEquations' >>* (\(s,v,lh) -> [(s,squareEquations eqI
makeSize :: (Show i, Show e,IArray a e, Ix i, Enum i) => (i,i) -> e -> a i e -> a i e
makeSize size def arr = array size [(i,arrayLookupWithDefault def arr i) | i <- [fst size .. snd size]]
highest = maximum $ concatMap indices $ eqs ++ ineqs
highest = maximum $ 0 : (concatMap indices $ eqs ++ ineqs)
type CoeffIndex = Int
type EqualityConstraintEquation = Array CoeffIndex Integer

2
transformations/ArrayUsageCheckTest.hs
View File

@ -175,7 +175,7 @@ makeConsistent eqs ineqs = (map ensure eqs', map ensure ineqs')
ineqs' = map (\(Ineq e) -> e) ineqs
ensure = accumArray (+) 0 (0, largestIndex)
largestIndex = maximum $ map (maximum . map fst) $ eqs' ++ ineqs'
largestIndex = maximum $ map (maximum . map fst) $ [[(0,0)]] ++ eqs' ++ ineqs'
-- | Returns Nothing if there is definitely no solution, or (Just ineq) if