Moved makeSize to the top-level of ArrayUsageCheck
This commit is contained in:
parent
312719088a
commit
ee102c10a3
|
@ -425,15 +425,16 @@ 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 $ 0 : Map.keys m
|
||||
|
||||
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]]
|
||||
|
||||
|
||||
-- | 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.
|
||||
squareEquations :: ([Array CoeffIndex Integer],[Array CoeffIndex Integer]) -> ([Array CoeffIndex Integer],[Array CoeffIndex Integer])
|
||||
squareEquations (eqs,ineqs) = uncurry transformPair (mkPair $ map $ makeSize (0,highest) 0) (eqs,ineqs)
|
||||
|
||||
where
|
||||
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]]
|
||||
|
||||
where
|
||||
highest = maximum $ 0 : (concatMap indices $ eqs ++ ineqs)
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user