vector fread/fwrite, fscanf/fprinf

2 files changed, 47 insertions, 9 deletions

diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index ccc652a..01d2ccf 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -22,7 +22,6 @@ import Data.Packed.Internal.Vector
 
 import Foreign hiding (xor)
 import Complex
-import Foreign.C.String
 import Foreign.C.Types
 
 -----------------------------------------------------------------
@@ -353,10 +352,4 @@ fromComplex z = (r,i) where
 
 -- | loads a matrix from an ASCII file (the number of rows and columns must be known in advance).
 fromFile :: FilePath -> (Int,Int) -> IO (Matrix Double)
-fromFile filename (r,c) = do
-    charname <- newCString filename
-    res <- createMatrix RowMajor r c
-    app1 (c_gslReadMatrix charname) mat res "gslReadMatrix"
-    free charname
-    return res
-foreign import ccall "matrix_fscanf" c_gslReadMatrix:: Ptr CChar -> TM
+fromFile filename (r,c) = reshape c `fmap` fscanfVector filename (r*c)
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 1b572a5..5784861 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -18,7 +18,8 @@ module Data.Packed.Internal.Vector where
 
 import Data.Packed.Internal.Common
 import Foreign
-import Foreign.C.Types(CInt)
+import Foreign.C.String
+import Foreign.C.Types(CInt,CChar)
 import Complex
 import Control.Monad(when)
 
@@ -255,3 +256,47 @@ foldVectorG f s0 v = foldLoop g s0 (dim v)
     where g !k !s = f k (at' v) s
           {-# INLINE g #-} -- Thanks to Ryan Ingram (http://permalink.gmane.org/gmane.comp.lang.haskell.cafe/46479)
 {-# INLINE foldVectorG #-}
+
+-------------------------------------------------------------------
+
+-- | Loads a vector from an ASCII file (the number of elements must be known in advance).
+fscanfVector :: FilePath -> Int -> IO (Vector Double)
+fscanfVector filename n = do
+    charname <- newCString filename
+    res <- createVector n
+    app1 (gsl_vector_fscanf charname) vec res "gsl_vector_fscanf"
+    free charname
+    return res
+
+foreign import ccall "vector_fscanf" gsl_vector_fscanf:: Ptr CChar -> TV
+
+-- | Saves the elements of a vector, with a given format (%f, %e, %g), to an ASCII file.
+fprintfVector :: FilePath -> String -> Vector Double -> IO ()
+fprintfVector filename fmt v = do
+    charname <- newCString filename
+    charfmt <- newCString fmt
+    app1 (gsl_vector_fprintf charname charfmt) vec v "gsl_vector_fprintf"
+    free charname
+    free charfmt
+
+foreign import ccall "vector_fprintf" gsl_vector_fprintf :: Ptr CChar -> Ptr CChar -> TV
+
+-- | Loads a vector from a binary file (the number of elements must be known in advance).
+freadVector :: FilePath -> Int -> IO (Vector Double)
+freadVector filename n = do
+    charname <- newCString filename
+    res <- createVector n
+    app1 (gsl_vector_fread charname) vec res "gsl_vector_fread"
+    free charname
+    return res
+
+foreign import ccall "vector_fread" gsl_vector_fread:: Ptr CChar -> TV
+
+-- | Saves the elements of a vector to a binary file.
+fwriteVector :: FilePath -> Vector Double -> IO ()
+fwriteVector filename v = do
+    charname <- newCString filename
+    app1 (gsl_vector_fwrite charname) vec v "gsl_vector_fwrite"
+    free charname
+
+foreign import ccall "vector_fwrite" gsl_vector_fwrite :: Ptr CChar -> TV