diff options
Diffstat (limited to 'src/Data/Array/Mixed/XArray.hs')
| -rw-r--r-- | src/Data/Array/Mixed/XArray.hs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Data/Array/Mixed/XArray.hs b/src/Data/Array/Mixed/XArray.hs index 3680930..681b8db 100644 --- a/src/Data/Array/Mixed/XArray.hs +++ b/src/Data/Array/Mixed/XArray.hs @@ -5,7 +5,6 @@ {-# LANGUAGE ImportQualifiedPost #-} {-# LANGUAGE NoStarIsType #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE StandaloneKindSignatures #-} {-# LANGUAGE StrictData #-} {-# LANGUAGE TypeApplications #-} @@ -93,7 +92,7 @@ replicate sh ssh' (XArray arr) , Dict <- lemKnownNatRankSSX (ssxAppend (ssxFromShape sh) ssh') , Refl <- lemRankApp (ssxFromShape sh) ssh' = XArray (S.stretch (shxToList sh ++ S.shapeL arr) $ - S.reshape (map (const 1) (shxToList sh) ++ S.shapeL arr) $ + S.reshape (map (const 1) (shxToList sh) ++ S.shapeL arr) arr) replicateScal :: forall sh a. Storable a => IShX sh -> a -> XArray sh a @@ -169,7 +168,7 @@ rerank :: forall sh sh1 sh2 a b. rerank ssh ssh1 ssh2 f xarr@(XArray arr) | Dict <- lemKnownNatRankSSX (ssxAppend ssh ssh2) = let (sh, _) = shxSplitApp (Proxy @sh1) ssh (shape (ssxAppend ssh ssh1) xarr) - in if any (== 0) (shxToList sh) + in if elem 0 (shxToList sh) then XArray (S.fromList (shxToList (shxAppend sh (shxCompleteZeros ssh2))) []) else case () of () | Dict <- lemKnownNatRankSSX ssh @@ -196,7 +195,7 @@ rerank2 :: forall sh sh1 sh2 a b c. rerank2 ssh ssh1 ssh2 f xarr1@(XArray arr1) (XArray arr2) | Dict <- lemKnownNatRankSSX (ssxAppend ssh ssh2) = let (sh, _) = shxSplitApp (Proxy @sh1) ssh (shape (ssxAppend ssh ssh1) xarr1) - in if any (== 0) (shxToList sh) + in if elem 0 (shxToList sh) then XArray (S.fromList (shxToList (shxAppend sh (shxCompleteZeros ssh2))) []) else case () of () | Dict <- lemKnownNatRankSSX ssh @@ -270,7 +269,7 @@ sumInner ssh ssh' arr in go $ transpose2 ssh'F ssh $ reshapePartial ssh' ssh sh'F $ - transpose2 ssh ssh' $ + transpose2 ssh ssh' arr sumOuter :: forall sh sh' a. (Storable a, NumElt a) @@ -281,7 +280,7 @@ sumOuter ssh ssh' arr shF = shxFlatten sh :$% ZSX in sumInner ssh' (ssxFromShape shF) $ transpose2 (ssxFromShape shF) ssh' $ - reshapePartial ssh ssh' shF $ + reshapePartial ssh ssh' shF arr fromListOuter :: forall n sh a. Storable a |