diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Data/Packed.hs | 4 | ||||
-rw-r--r-- | lib/Data/Packed/Internal/Matrix.hs | 26 | ||||
-rw-r--r-- | lib/Data/Packed/Matrix.hs | 7 | ||||
-rw-r--r-- | lib/Data/Packed/Vector.hs | 2 | ||||
-rw-r--r-- | lib/Graphics/Plot.hs | 84 | ||||
-rw-r--r-- | lib/Numeric/Container.hs | 8 | ||||
-rw-r--r-- | lib/Numeric/LinearAlgebra/Algorithms.hs | 5 |
7 files changed, 57 insertions, 79 deletions
diff --git a/lib/Data/Packed.hs b/lib/Data/Packed.hs index bfc2d8b..b8bec8a 100644 --- a/lib/Data/Packed.hs +++ b/lib/Data/Packed.hs | |||
@@ -1,14 +1,14 @@ | |||
1 | ----------------------------------------------------------------------------- | 1 | ----------------------------------------------------------------------------- |
2 | {- | | 2 | {- | |
3 | Module : Data.Packed | 3 | Module : Data.Packed |
4 | Copyright : (c) Alberto Ruiz 2006-7 | 4 | Copyright : (c) Alberto Ruiz 2006-2010 |
5 | License : GPL-style | 5 | License : GPL-style |
6 | 6 | ||
7 | Maintainer : Alberto Ruiz (aruiz at um dot es) | 7 | Maintainer : Alberto Ruiz (aruiz at um dot es) |
8 | Stability : provisional | 8 | Stability : provisional |
9 | Portability : uses ffi | 9 | Portability : uses ffi |
10 | 10 | ||
11 | The Vector and Matrix types and some utilities. | 11 | Types for dense 'Vector' and 'Matrix' of 'Storable' elements. |
12 | 12 | ||
13 | -} | 13 | -} |
14 | ----------------------------------------------------------------------------- | 14 | ----------------------------------------------------------------------------- |
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs index 7b823de..b616442 100644 --- a/lib/Data/Packed/Internal/Matrix.hs +++ b/lib/Data/Packed/Internal/Matrix.hs | |||
@@ -75,7 +75,11 @@ import Foreign.C.String | |||
75 | 75 | ||
76 | data MatrixOrder = RowMajor | ColumnMajor deriving (Show,Eq) | 76 | data MatrixOrder = RowMajor | ColumnMajor deriving (Show,Eq) |
77 | 77 | ||
78 | -- | Matrix representation suitable for GSL and LAPACK computations. | 78 | {- | Matrix representation suitable for GSL and LAPACK computations. |
79 | |||
80 | The elements are stored in a continuous memory array. | ||
81 | |||
82 | -} | ||
79 | data Matrix t = MC { irows :: {-# UNPACK #-} !Int | 83 | data Matrix t = MC { irows :: {-# UNPACK #-} !Int |
80 | , icols :: {-# UNPACK #-} !Int | 84 | , icols :: {-# UNPACK #-} !Int |
81 | , cdat :: {-# UNPACK #-} !(Vector t) } | 85 | , cdat :: {-# UNPACK #-} !(Vector t) } |
@@ -245,9 +249,14 @@ compat m1 m2 = rows m1 == rows m2 && cols m1 == cols m2 | |||
245 | 249 | ||
246 | ------------------------------------------------------------------ | 250 | ------------------------------------------------------------------ |
247 | 251 | ||
248 | -- | Supported element types for basic matrix operations. | 252 | {- | Supported matrix elements. |
249 | -- provides unoptimised defaults for all (Storable a) instances | 253 | |
250 | -- @instance Element Foo where@ | 254 | This class provides optimized internal |
255 | operations for selected element types. | ||
256 | It provides unoptimised defaults for any 'Storable' type, | ||
257 | so you can create instances simply as: | ||
258 | @instance Element Foo@. | ||
259 | -} | ||
251 | class (Storable a) => Element a where | 260 | class (Storable a) => Element a where |
252 | subMatrixD :: (Int,Int) -- ^ (r0,c0) starting position | 261 | subMatrixD :: (Int,Int) -- ^ (r0,c0) starting position |
253 | -> (Int,Int) -- ^ (rt,ct) dimensions of submatrix | 262 | -> (Int,Int) -- ^ (rt,ct) dimensions of submatrix |
@@ -257,30 +266,23 @@ class (Storable a) => Element a where | |||
257 | transdata = transdataP -- transdata' | 266 | transdata = transdataP -- transdata' |
258 | constantD :: a -> Int -> Vector a | 267 | constantD :: a -> Int -> Vector a |
259 | constantD = constantP -- constant' | 268 | constantD = constantP -- constant' |
260 | {- | 269 | |
261 | conjugateD :: Vector a -> Vector a | ||
262 | conjugateD = id | ||
263 | -} | ||
264 | 270 | ||
265 | instance Element Float where | 271 | instance Element Float where |
266 | transdata = transdataAux ctransF | 272 | transdata = transdataAux ctransF |
267 | constantD = constantAux cconstantF | 273 | constantD = constantAux cconstantF |
268 | -- conjugateD = id | ||
269 | 274 | ||
270 | instance Element Double where | 275 | instance Element Double where |
271 | transdata = transdataAux ctransR | 276 | transdata = transdataAux ctransR |
272 | constantD = constantAux cconstantR | 277 | constantD = constantAux cconstantR |
273 | -- conjugateD = id | ||
274 | 278 | ||
275 | instance Element (Complex Float) where | 279 | instance Element (Complex Float) where |
276 | transdata = transdataAux ctransQ | 280 | transdata = transdataAux ctransQ |
277 | constantD = constantAux cconstantQ | 281 | constantD = constantAux cconstantQ |
278 | -- conjugateD = conjugateQ | ||
279 | 282 | ||
280 | instance Element (Complex Double) where | 283 | instance Element (Complex Double) where |
281 | transdata = transdataAux ctransC | 284 | transdata = transdataAux ctransC |
282 | constantD = constantAux cconstantC | 285 | constantD = constantAux cconstantC |
283 | -- conjugateD = conjugateC | ||
284 | 286 | ||
285 | ------------------------------------------------------------------- | 287 | ------------------------------------------------------------------- |
286 | 288 | ||
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs index 1fa8903..50a321d 100644 --- a/lib/Data/Packed/Matrix.hs +++ b/lib/Data/Packed/Matrix.hs | |||
@@ -7,7 +7,7 @@ | |||
7 | ----------------------------------------------------------------------------- | 7 | ----------------------------------------------------------------------------- |
8 | -- | | 8 | -- | |
9 | -- Module : Data.Packed.Matrix | 9 | -- Module : Data.Packed.Matrix |
10 | -- Copyright : (c) Alberto Ruiz 2007 | 10 | -- Copyright : (c) Alberto Ruiz 2007-10 |
11 | -- License : GPL-style | 11 | -- License : GPL-style |
12 | -- | 12 | -- |
13 | -- Maintainer : Alberto Ruiz <aruiz@um.es> | 13 | -- Maintainer : Alberto Ruiz <aruiz@um.es> |
@@ -16,11 +16,14 @@ | |||
16 | -- | 16 | -- |
17 | -- A Matrix representation suitable for numerical computations using LAPACK and GSL. | 17 | -- A Matrix representation suitable for numerical computations using LAPACK and GSL. |
18 | -- | 18 | -- |
19 | -- This module provides basic functions for manipulation of structure. | ||
20 | |||
19 | ----------------------------------------------------------------------------- | 21 | ----------------------------------------------------------------------------- |
20 | 22 | ||
21 | module Data.Packed.Matrix ( | 23 | module Data.Packed.Matrix ( |
24 | Matrix, | ||
22 | Element, | 25 | Element, |
23 | Matrix,rows,cols, | 26 | rows,cols, |
24 | (><), | 27 | (><), |
25 | trans, | 28 | trans, |
26 | reshape, flatten, | 29 | reshape, flatten, |
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs index 2e0a9f5..eaf4b9c 100644 --- a/lib/Data/Packed/Vector.hs +++ b/lib/Data/Packed/Vector.hs | |||
@@ -11,6 +11,8 @@ | |||
11 | -- | 11 | -- |
12 | -- 1D arrays suitable for numeric computations using external libraries. | 12 | -- 1D arrays suitable for numeric computations using external libraries. |
13 | -- | 13 | -- |
14 | -- This module provides basic functions for manipulation of structure. | ||
15 | -- | ||
14 | ----------------------------------------------------------------------------- | 16 | ----------------------------------------------------------------------------- |
15 | 17 | ||
16 | module Data.Packed.Vector ( | 18 | module Data.Packed.Vector ( |
diff --git a/lib/Graphics/Plot.hs b/lib/Graphics/Plot.hs index c5b5a4c..0bdd803 100644 --- a/lib/Graphics/Plot.hs +++ b/lib/Graphics/Plot.hs | |||
@@ -3,15 +3,13 @@ | |||
3 | -- Module : Graphics.Plot | 3 | -- Module : Graphics.Plot |
4 | -- Copyright : (c) Alberto Ruiz 2005-8 | 4 | -- Copyright : (c) Alberto Ruiz 2005-8 |
5 | -- License : GPL-style | 5 | -- License : GPL-style |
6 | -- | 6 | -- |
7 | -- Maintainer : Alberto Ruiz (aruiz at um dot es) | 7 | -- Maintainer : Alberto Ruiz (aruiz at um dot es) |
8 | -- Stability : provisional | 8 | -- Stability : provisional |
9 | -- Portability : uses gnuplot and ImageMagick | 9 | -- Portability : uses gnuplot and ImageMagick |
10 | -- | 10 | -- |
11 | -- Very basic (and provisional) drawing tools using gnuplot and imageMagick. | 11 | -- This module is deprecated. It can be replaced by improved drawing tools |
12 | -- | 12 | -- available in the plot\\plot-gtk packages by Vivian McPhail or Gnuplot by Henning Thielemann. |
13 | -- This module is deprecated. It will be replaced by improved drawing tools based | ||
14 | -- on the Gnuplot package by Henning Thielemann. | ||
15 | ----------------------------------------------------------------------------- | 13 | ----------------------------------------------------------------------------- |
16 | 14 | ||
17 | module Graphics.Plot( | 15 | module Graphics.Plot( |
@@ -20,7 +18,7 @@ module Graphics.Plot( | |||
20 | 18 | ||
21 | plot, parametricPlot, | 19 | plot, parametricPlot, |
22 | 20 | ||
23 | splot, mesh, mesh', meshdom, | 21 | splot, mesh, meshdom, |
24 | 22 | ||
25 | matrixToPGM, imshow, | 23 | matrixToPGM, imshow, |
26 | 24 | ||
@@ -32,35 +30,14 @@ import Numeric.Matrix | |||
32 | import Data.List(intersperse) | 30 | import Data.List(intersperse) |
33 | import System.Process (system) | 31 | import System.Process (system) |
34 | 32 | ||
35 | size = dim | ||
36 | |||
37 | -- | Loads a real matrix from a formatted ASCII text file | ||
38 | --fromFile :: FilePath -> IO Matrix | ||
39 | --fromFile filename = readFile filename >>= return . readMatrix read | ||
40 | |||
41 | -- | Saves a real matrix to a formatted ascii text file | ||
42 | toFile' :: FilePath -> Matrix Double -> IO () | ||
43 | toFile' filename matrix = writeFile filename (unlines . map unwords. map (map show) . toLists $ matrix) | ||
44 | |||
45 | ------------------------------------------------------------------------ | ||
46 | |||
47 | |||
48 | -- | From vectors x and y, it generates a pair of matrices to be used as x and y arguments for matrix functions. | 33 | -- | From vectors x and y, it generates a pair of matrices to be used as x and y arguments for matrix functions. |
49 | meshdom :: Vector Double -> Vector Double -> (Matrix Double , Matrix Double) | 34 | meshdom :: Vector Double -> Vector Double -> (Matrix Double , Matrix Double) |
50 | meshdom r1 r2 = (outer r1 (constant 1 (size r2)), outer (constant 1 (size r1)) r2) | 35 | meshdom r1 r2 = (outer r1 (constant 1 (dim r2)), outer (constant 1 (dim r1)) r2) |
51 | |||
52 | gnuplotX :: String -> IO () | ||
53 | gnuplotX command = do { _ <- system cmdstr; return()} where | ||
54 | cmdstr = "echo \""++command++"\" | gnuplot -persist" | ||
55 | |||
56 | datafollows = "\\\"-\\\"" | ||
57 | |||
58 | prep = (++"e\n\n") . unlines . map (unwords . (map show)) | ||
59 | 36 | ||
60 | 37 | ||
61 | {- | Draws a 3D surface representation of a real matrix. | 38 | {- | Draws a 3D surface representation of a real matrix. |
62 | 39 | ||
63 | > > mesh (hilb 20) | 40 | > > mesh $ build (10,10) (\\i j -> i + (j-5)^2) |
64 | 41 | ||
65 | In certain versions you can interactively rotate the graphic using the mouse. | 42 | In certain versions you can interactively rotate the graphic using the mouse. |
66 | 43 | ||
@@ -70,15 +47,6 @@ mesh m = gnuplotX (command++dat) where | |||
70 | command = "splot "++datafollows++" matrix with lines\n" | 47 | command = "splot "++datafollows++" matrix with lines\n" |
71 | dat = prep $ toLists $ m | 48 | dat = prep $ toLists $ m |
72 | 49 | ||
73 | mesh' :: Matrix Double -> IO () | ||
74 | mesh' m = do | ||
75 | writeFile "splot-gnu-command" "splot \"splot-tmp.txt\" matrix with lines; pause -1"; | ||
76 | toFile' "splot-tmp.txt" m | ||
77 | putStr "Press [Return] to close the graphic and continue... " | ||
78 | _ <- system "gnuplot -persist splot-gnu-command" | ||
79 | _ <- system "rm splot-tmp.txt splot-gnu-command" | ||
80 | return () | ||
81 | |||
82 | {- | Draws the surface represented by the function f in the desired ranges and number of points, internally using 'mesh'. | 50 | {- | Draws the surface represented by the function f in the desired ranges and number of points, internally using 'mesh'. |
83 | 51 | ||
84 | > > let f x y = cos (x + y) | 52 | > > let f x y = cos (x + y) |
@@ -86,11 +54,15 @@ mesh' m = do | |||
86 | 54 | ||
87 | -} | 55 | -} |
88 | splot :: (Matrix Double->Matrix Double->Matrix Double) -> (Double,Double) -> (Double,Double) -> Int -> IO () | 56 | splot :: (Matrix Double->Matrix Double->Matrix Double) -> (Double,Double) -> (Double,Double) -> Int -> IO () |
89 | splot f rx ry n = mesh' z where | 57 | splot f rx ry n = mesh z where |
90 | (x,y) = meshdom (linspace n rx) (linspace n ry) | 58 | (x,y) = meshdom (linspace n rx) (linspace n ry) |
91 | z = f x y | 59 | z = f x y |
92 | 60 | ||
93 | {- | plots several vectors against the first one -} | 61 | {- | plots several vectors against the first one |
62 | |||
63 | > > let t = linspace 100 (-3,3) in mplot [t, sin t, exp (-t^2)] | ||
64 | |||
65 | -} | ||
94 | mplot :: [Vector Double] -> IO () | 66 | mplot :: [Vector Double] -> IO () |
95 | mplot m = gnuplotX (commands++dats) where | 67 | mplot m = gnuplotX (commands++dats) where |
96 | commands = if length m == 1 then command1 else commandmore | 68 | commands = if length m == 1 then command1 else commandmore |
@@ -102,26 +74,6 @@ mplot m = gnuplotX (commands++dats) where | |||
102 | dats = concat (replicate (length m-1) dat) | 74 | dats = concat (replicate (length m-1) dat) |
103 | 75 | ||
104 | 76 | ||
105 | {- | ||
106 | mplot' m = do | ||
107 | writeFile "plot-gnu-command" (commands++endcmd) | ||
108 | toFile "plot-tmp.txt" (fromColumns m) | ||
109 | putStr "Press [Return] to close the graphic and continue... " | ||
110 | system "gnuplot plot-gnu-command" | ||
111 | system "rm plot-tmp.txt plot-gnu-command" | ||
112 | return () | ||
113 | where | ||
114 | commands = if length m == 1 then command1 else commandmore | ||
115 | command1 = "plot \"plot-tmp.txt\" with lines\n" | ||
116 | commandmore = "plot " ++ plots ++ "\n" | ||
117 | plots = concat $ intersperse ", " (map cmd [2 .. length m]) | ||
118 | cmd k = "\"plot-tmp.txt\" using 1:"++show k++" with lines" | ||
119 | endcmd = "pause -1" | ||
120 | -} | ||
121 | |||
122 | -- apply several functions to one object | ||
123 | mapf fs x = map ($ x) fs | ||
124 | |||
125 | {- | Draws a list of functions over a desired range and with a desired number of points | 77 | {- | Draws a list of functions over a desired range and with a desired number of points |
126 | 78 | ||
127 | > > plot [sin, cos, sin.(3*)] (0,2*pi) 1000 | 79 | > > plot [sin, cos, sin.(3*)] (0,2*pi) 1000 |
@@ -129,7 +81,8 @@ mapf fs x = map ($ x) fs | |||
129 | -} | 81 | -} |
130 | plot :: [Vector Double->Vector Double] -> (Double,Double) -> Int -> IO () | 82 | plot :: [Vector Double->Vector Double] -> (Double,Double) -> Int -> IO () |
131 | plot fs rx n = mplot (x: mapf fs x) | 83 | plot fs rx n = mplot (x: mapf fs x) |
132 | where x = linspace n rx | 84 | where x = linspace n rx |
85 | mapf gs y = map ($ y) gs | ||
133 | 86 | ||
134 | {- | Draws a parametric curve. For instance, to draw a spiral we can do something like: | 87 | {- | Draws a parametric curve. For instance, to draw a spiral we can do something like: |
135 | 88 | ||
@@ -165,6 +118,15 @@ imshow m = do | |||
165 | 118 | ||
166 | ---------------------------------------------------- | 119 | ---------------------------------------------------- |
167 | 120 | ||
121 | gnuplotX :: String -> IO () | ||
122 | gnuplotX command = do { _ <- system cmdstr; return()} where | ||
123 | cmdstr = "echo \""++command++"\" | gnuplot -persist" | ||
124 | |||
125 | datafollows = "\\\"-\\\"" | ||
126 | |||
127 | prep = (++"e\n\n") . unlines . map (unwords . (map show)) | ||
128 | |||
129 | |||
168 | gnuplotpdf :: String -> String -> [([[Double]], String)] -> IO () | 130 | gnuplotpdf :: String -> String -> [([[Double]], String)] -> IO () |
169 | gnuplotpdf title command ds = gnuplot (prelude ++ command ++" "++ draw) >> postproc where | 131 | gnuplotpdf title command ds = gnuplot (prelude ++ command ++" "++ draw) >> postproc where |
170 | prelude = "set terminal epslatex color; set output '"++title++".tex';" | 132 | prelude = "set terminal epslatex color; set output '"++title++".tex';" |
diff --git a/lib/Numeric/Container.hs b/lib/Numeric/Container.hs index 1c542b8..6b73a4e 100644 --- a/lib/Numeric/Container.hs +++ b/lib/Numeric/Container.hs | |||
@@ -15,7 +15,13 @@ | |||
15 | -- Stability : provisional | 15 | -- Stability : provisional |
16 | -- Portability : portable | 16 | -- Portability : portable |
17 | -- | 17 | -- |
18 | -- Numeric classes for containers of numbers, including conversion routines | 18 | -- Basic numeric operations on 'Vector' and 'Matrix', including conversion routines. |
19 | -- | ||
20 | -- The 'Container' class is used to define optimized generic functions which work | ||
21 | -- on 'Vector' and 'Matrix' with real or complex elements. | ||
22 | -- | ||
23 | -- Some of these functions are also available in the instances of the standard | ||
24 | -- numeric Haskell classes provided by "Numeric.Vector" and "Numeric.Matrix". | ||
19 | -- | 25 | -- |
20 | ----------------------------------------------------------------------------- | 26 | ----------------------------------------------------------------------------- |
21 | 27 | ||
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs index 64deba2..c49bec7 100644 --- a/lib/Numeric/LinearAlgebra/Algorithms.hs +++ b/lib/Numeric/LinearAlgebra/Algorithms.hs | |||
@@ -82,7 +82,10 @@ import Data.Array | |||
82 | import Numeric.Container hiding ((.*),(*/)) | 82 | import Numeric.Container hiding ((.*),(*/)) |
83 | import Numeric.MatrixBoot | 83 | import Numeric.MatrixBoot |
84 | 84 | ||
85 | -- | Auxiliary typeclass used to define generic computations for both real and complex matrices. | 85 | {- | Auxiliary typeclass used to define generic linear algebra computations for both real and complex matrices. Only double precision is supported in this version (we can |
86 | transform single precision objects using 'single' and 'double'). | ||
87 | |||
88 | -} | ||
86 | class (Product t, | 89 | class (Product t, |
87 | Convert t, | 90 | Convert t, |
88 | Container Vector t, | 91 | Container Vector t, |