summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlberto Ruiz <aruiz@um.es>2008-06-10 08:31:27 +0000
committerAlberto Ruiz <aruiz@um.es>2008-06-10 08:31:27 +0000
commit53b361e5b9840273ccfd50e5b256002498a97469 (patch)
treec96ae1a373cd6884821f4b74b9e6cabd5e6f2204 /lib
parent9cb72979acc7bcd9df2fa8eab05169d9c5ca84f5 (diff)
added examples/benchmarks.hs
Diffstat (limited to 'lib')
-rw-r--r--lib/Data/Packed/Internal.hs2
-rw-r--r--lib/Data/Packed/Internal/Matrix.hs27
-rw-r--r--lib/Data/Packed/Internal/Vector.hs22
-rw-r--r--lib/Data/Packed/Matrix.hs2
4 files changed, 2 insertions, 51 deletions
diff --git a/lib/Data/Packed/Internal.hs b/lib/Data/Packed/Internal.hs
index e5028d3..0bf9f8c 100644
--- a/lib/Data/Packed/Internal.hs
+++ b/lib/Data/Packed/Internal.hs
@@ -21,4 +21,4 @@ module Data.Packed.Internal (
21 21
22import Data.Packed.Internal.Common 22import Data.Packed.Internal.Common
23import Data.Packed.Internal.Vector 23import Data.Packed.Internal.Vector
24import Data.Packed.Internal.Matrix \ No newline at end of file 24import Data.Packed.Internal.Matrix
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 7a35a61..caf3699 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -394,30 +394,3 @@ fromFile filename (r,c) = do
394 --free charname -- TO DO: free the auxiliary CString 394 --free charname -- TO DO: free the auxiliary CString
395 return res 395 return res
396foreign import ccall "auxi.h matrix_fscanf" c_gslReadMatrix:: Ptr CChar -> TM 396foreign import ccall "auxi.h matrix_fscanf" c_gslReadMatrix:: Ptr CChar -> TM
397
398----------------------------------------------------------------------------
399
400{- | creates a new matrix with the given position updated with a modification function
401
402@> updateMatrix (0,2) (const 57) (ident 3 :: Matrix Double)
403(3><3)
404 [ 1.0, 0.0, 57.0
405 , 0.0, 1.0, 0.0
406 , 0.0, 0.0, 1.0 ]@
407
408-}
409updateMatrix :: Storable t
410 => (Int,Int) -- ^ position (row,column)
411 -> (t -> t) -- ^ modification function
412 -> Matrix t -- ^ source matrix
413 -> Matrix t -- ^ result
414
415updateMatrix (i,j) f (m@MC {rows = r, cols = c, cdat = v})
416 | i<0 || i>=r || j<0 || j>=c = error $ "updateMatrix out of range(size="++show (r,c)++", pos="++show (i,j)++")"
417 | otherwise = let pos = i*c+j
418 in m { cdat = updateVector pos f v }
419
420updateMatrix (i,j) f (m@MF {rows = r, cols = c, fdat = v})
421 | i<0 || i>=r || j<0 || j>=c = error $ "updateMatrix out of range(size="++show (r,c)++", pos="++show (i,j)++")"
422 | otherwise = let pos = j*r+i
423 in m { fdat = updateVector pos f v }
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 6274e48..2df33e0 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -189,28 +189,6 @@ liftVector2 f u v = fromList $ zipWith f (toList u) (toList v)
189 189
190----------------------------------------------------------------- 190-----------------------------------------------------------------
191 191
192{- | creates a new vector with a desired position updated with a modification function
193
194@> updateVector 3 (+7) (fromList [1..5])
1955 |> [1.0,2.0,3.0,11.0,5.0]@
196
197-}
198updateVector :: Storable t => Int -- ^ position
199 -> (t->t) -- ^ modification function
200 -> Vector t -- ^ source
201 -> Vector t -- ^ result
202updateVector k h (v@V {dim=n})
203 | k<0 || k >= n = error $ "updateVector out of range (dim="++show n++", pos="++show k++")"
204 | otherwise = unsafePerformIO $ do
205 r <- createVector n
206 let f _ s _ d = copyArray d s n
207 >> pokeElemOff d k (h (v`at'`k))
208 >> return 0
209 app2 f vec v vec r "updateVector"
210 return r
211
212-----------------------------------------------------------------
213
214cloneVector :: Storable t => Vector t -> IO (Vector t) 192cloneVector :: Storable t => Vector t -> IO (Vector t)
215cloneVector (v@V {dim=n}) = do 193cloneVector (v@V {dim=n}) = do
216 r <- createVector n 194 r <- createVector n
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index 62d28b1..7d2c564 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -226,4 +226,4 @@ extractRows l m = fromRows $ extract (toRows $ m) l
226 226
227-} 227-}
228repmat :: (Element t) => Matrix t -> Int -> Int -> Matrix t 228repmat :: (Element t) => Matrix t -> Int -> Int -> Matrix t
229repmat m r c = fromBlocks $ partit c $ replicate (r*c) m \ No newline at end of file 229repmat m r c = fromBlocks $ partit c $ replicate (r*c) m