summaryrefslogtreecommitdiff
path: root/lib/Data
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Data')
-rw-r--r--lib/Data/Packed/Internal/Matrix.hs25
-rw-r--r--lib/Data/Packed/Internal/Vector.hs18
2 files changed, 33 insertions, 10 deletions
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index c6129c6..7a35a61 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -1,4 +1,5 @@
1{-# OPTIONS_GHC -fglasgow-exts #-} 1{-# OPTIONS_GHC -fglasgow-exts #-}
2{-# LANGUAGE CPP #-}
2----------------------------------------------------------------------------- 3-----------------------------------------------------------------------------
3-- | 4-- |
4-- Module : Data.Packed.Internal.Matrix 5-- Module : Data.Packed.Internal.Matrix
@@ -61,8 +62,13 @@ import Data.List(transpose)
61data MatrixOrder = RowMajor | ColumnMajor deriving (Show,Eq) 62data MatrixOrder = RowMajor | ColumnMajor deriving (Show,Eq)
62 63
63-- | Matrix representation suitable for GSL and LAPACK computations. 64-- | Matrix representation suitable for GSL and LAPACK computations.
64data Matrix t = MC { rows :: Int, cols :: Int, cdat :: Vector t } 65data Matrix t = MC { rows :: {-# UNPACK #-} !Int
65 | MF { rows :: Int, cols :: Int, fdat :: Vector t } 66 , cols :: {-# UNPACK #-} !Int
67 , cdat :: {-# UNPACK #-} !(Vector t) }
68
69 | MF { rows :: {-# UNPACK #-} !Int
70 , cols :: {-# UNPACK #-} !Int
71 , fdat :: {-# UNPACK #-} !(Vector t) }
66 72
67-- MC: preferred by C, fdat may require a transposition 73-- MC: preferred by C, fdat may require a transposition
68-- MF: preferred by LAPACK, cdat may require a transposition 74-- MF: preferred by LAPACK, cdat may require a transposition
@@ -100,7 +106,6 @@ withMatrix MF {rows = r, cols = c, fdat = d } f =
100flatten :: Element t => Matrix t -> Vector t 106flatten :: Element t => Matrix t -> Vector t
101flatten = cdat . cmat 107flatten = cdat . cmat
102 108
103
104type Mt t s = Int -> Int -> Ptr t -> s 109type Mt t s = Int -> Int -> Ptr t -> s
105-- not yet admitted by my haddock version 110-- not yet admitted by my haddock version
106-- infixr 6 ::> 111-- infixr 6 ::>
@@ -133,7 +138,6 @@ fromColumns m = trans . fromRows $ m
133toColumns :: Element t => Matrix t -> [Vector t] 138toColumns :: Element t => Matrix t -> [Vector t]
134toColumns m = toRows . trans $ m 139toColumns m = toRows . trans $ m
135 140
136
137-- | Reads a matrix position. 141-- | Reads a matrix position.
138(@@>) :: Storable t => Matrix t -> (Int,Int) -> t 142(@@>) :: Storable t => Matrix t -> (Int,Int) -> t
139infixl 9 @@> 143infixl 9 @@>
@@ -142,12 +146,17 @@ infixl 9 @@>
142-- | otherwise = cdat m `at` (i*c+j) 146-- | otherwise = cdat m `at` (i*c+j)
143 147
144MC {rows = r, cols = c, cdat = v} @@> (i,j) 148MC {rows = r, cols = c, cdat = v} @@> (i,j)
145 | i<0 || i>=r || j<0 || j>=c = error "matrix indexing out of range" 149 | safe = if i<0 || i>=r || j<0 || j>=c
146 | otherwise = v `at` (i*c+j) 150 then error "matrix indexing out of range"
151 else v `at` (i*c+j)
152 | otherwise = v `at` (i*c+j)
147 153
148MF {rows = r, cols = c, fdat = v} @@> (i,j) 154MF {rows = r, cols = c, fdat = v} @@> (i,j)
149 | i<0 || i>=r || j<0 || j>=c = error "matrix indexing out of range" 155 | safe = if i<0 || i>=r || j<0 || j>=c
150 | otherwise = v `at` (j*r+i) 156 then error "matrix indexing out of range"
157 else v `at` (j*r+i)
158 | otherwise = v `at` (j*r+i)
159{-# INLINE (@@>) #-}
151 160
152------------------------------------------------------------------ 161------------------------------------------------------------------
153 162
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 8723367..6274e48 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -100,10 +100,24 @@ n |> l = if length l == n then fromList l else error "|> with wrong size"
100at' :: Storable a => Vector a -> Int -> a 100at' :: Storable a => Vector a -> Int -> a
101at' v n = safeRead v $ flip peekElemOff n 101at' v n = safeRead v $ flip peekElemOff n
102 102
103--
104-- turn off bounds checking with -funsafe at configure time.
105-- ghc will optimise away the salways true case at compile time.
106--
107#if defined(UNSAFE)
108safe :: Bool
109safe = False
110#else
111safe = True
112#endif
113
103-- | access to Vector elements with range checking. 114-- | access to Vector elements with range checking.
104at :: Storable a => Vector a -> Int -> a 115at :: Storable a => Vector a -> Int -> a
105at v n | n >= 0 && n < dim v = at' v n 116at v n
106 | otherwise = error "vector index out of range" 117 | safe = if n >= 0 && n < dim v
118 then at' v n
119 else error "vector index out of range"
120 | otherwise = at' v n
107{-# INLINE at #-} 121{-# INLINE at #-}
108 122
109{- | takes a number of consecutive elements from a Vector 123{- | takes a number of consecutive elements from a Vector