diff options
author | Alberto Ruiz <aruiz@um.es> | 2015-05-05 21:21:28 +0200 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2015-05-05 21:21:28 +0200 |
commit | 2c8a5bc753e5787d2a11487c2a598f3cfbe2cecf (patch) | |
tree | 68718ce16ba6e6cd5459fa53189c6bb22ee2dd9f /packages/gsl/src/Numeric/GSL | |
parent | 6a6b9136a582988f6817b39a14538b39c830cb64 (diff) |
updated Interpolation imports
Diffstat (limited to 'packages/gsl/src/Numeric/GSL')
-rw-r--r-- | packages/gsl/src/Numeric/GSL/Interpolation.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/gsl/src/Numeric/GSL/Interpolation.hs b/packages/gsl/src/Numeric/GSL/Interpolation.hs index 4d72ee2..fb49e40 100644 --- a/packages/gsl/src/Numeric/GSL/Interpolation.hs +++ b/packages/gsl/src/Numeric/GSL/Interpolation.hs | |||
@@ -32,8 +32,7 @@ module Numeric.GSL.Interpolation ( | |||
32 | , evaluateIntegralV | 32 | , evaluateIntegralV |
33 | ) where | 33 | ) where |
34 | 34 | ||
35 | import Data.Packed.Vector(Vector, fromList, dim) | 35 | import Numeric.LinearAlgebra(Vector, fromList, size, Numeric) |
36 | import Data.Packed.Foreign(appVector) | ||
37 | import Foreign.C.Types | 36 | import Foreign.C.Types |
38 | import Foreign.Marshal.Alloc(alloca) | 37 | import Foreign.Marshal.Alloc(alloca) |
39 | import Foreign.Ptr(Ptr) | 38 | import Foreign.Ptr(Ptr) |
@@ -57,6 +56,9 @@ methodToInt CSplinePeriodic = 3 | |||
57 | methodToInt Akima = 4 | 56 | methodToInt Akima = 4 |
58 | methodToInt AkimaPeriodic = 5 | 57 | methodToInt AkimaPeriodic = 5 |
59 | 58 | ||
59 | dim :: Numeric t => Vector t -> Int | ||
60 | dim = size | ||
61 | |||
60 | applyCFun hsname cname fun mth xs ys x | 62 | applyCFun hsname cname fun mth xs ys x |
61 | | dim xs /= dim ys = error $ | 63 | | dim xs /= dim ys = error $ |
62 | "Error: Vectors of unequal sizes " ++ | 64 | "Error: Vectors of unequal sizes " ++ |