casadi-bindings 2.4.1.4 → 2.4.1.5

raw patch · 2 files changed

+39/−14 lines, 2 files

Files

• casadi-bindings.cabal +1/−1
• src/Casadi/Viewable.hs +38/−13

@@ -1,5 +1,5 @@ name:                casadi-bindings-version:             2.4.1.4+version:             2.4.1.5 synopsis:            mid-level bindings to CasADi category:            Numerical, Math description:

@@ -1,33 +1,58 @@ {-# OPTIONS_GHC -Wall #-}+{-# LANGUAGE ScopedTypeVariables #-}  module Casadi.Viewable        ( Viewable(..)        ) where  import qualified Data.Vector as V+import qualified Data.Vector.Storable as SV+import qualified Data.Vector.Unboxed as UV  class Viewable a where-  vvertsplit :: a -> V.Vector Int -> V.Vector a-  vvertcat :: V.Vector a -> a   vsize1 :: a -> Int   vsize2 :: a -> Int   vrecoverDimension :: a -> (Int, Int) -> a+  vvertcat :: V.Vector a -> a+  vvertsplit :: a -> V.Vector Int -> V.Vector a  instance Viewable (V.Vector a) where   vsize1 = V.length   vsize2 = const 1+  vrecoverDimension x _ = x   vvertcat = V.concat . V.toList-  vvertsplit x ks = V.fromList (split x (V.toList ks))-  -- todo(greg): this doesn't look right+  vvertsplit x ks = V.fromList (splitV x (V.toList ks))++instance SV.Storable a => Viewable (SV.Vector a) where+  vsize1 = SV.length+  vsize2 = const 1   vrecoverDimension x _ = x+  vvertcat = SV.concat . V.toList+  vvertsplit x ks = V.fromList (splitSV x (V.toList ks)) -split :: V.Vector a -> [Int] -> [V.Vector a]-split v xs@(0:_) = split' v xs-split _ _ = error "split: first index must be 0"+instance UV.Unbox a => Viewable (UV.Vector a) where+  vsize1 = UV.length+  vsize2 = const 1+  vrecoverDimension x _ = x+  vvertcat = UV.concat . V.toList+  vvertsplit x ks = V.fromList (splitUV x (V.toList ks)) -split' :: V.Vector a -> [Int] -> [V.Vector a]-split' _ [] = error "can't split with no input"-split' x [kf]-  | V.length x == kf = []-  | otherwise = error "split: last index must be length of vector"-split' x (k0:k1:ks) = V.slice k0 (k1 - k0) x : split' x (k1:ks)+splitV :: V.Vector a -> [Int] -> [V.Vector a]+splitV = split V.length V.slice++splitSV :: SV.Storable a => SV.Vector a -> [Int] -> [SV.Vector a]+splitSV = split SV.length SV.slice++splitUV :: UV.Unbox a => UV.Vector a -> [Int] -> [UV.Vector a]+splitUV = split UV.length UV.slice++split :: forall a . (a -> Int) -> (Int -> Int -> a -> a) -> a -> [Int] -> [a]+split length' slice v xs@(0:_) = split' v xs+  where+    split' :: a -> [Int] -> [a]+    split' _ [] = error "can't split with no input"+    split' x [kf]+      | length' x == kf = []+      | otherwise = error "split: last index must be length of vector"+    split' x (k0:k1:ks) = slice k0 (k1 - k0) x : split' x (k1:ks)+split _ _ _ _ = error "split: first index must be 0"