diff --git a/CHANGES b/CHANGES --- a/CHANGES +++ b/CHANGES @@ -40,3 +40,6 @@ 0.2.0.2: * allow pango/cairo v0.13 + +0.2.0.3: + * update for hmatrix 0.17 diff --git a/lib/Graphics/Rendering/Plot/HMatrix.hs b/lib/Graphics/Rendering/Plot/HMatrix.hs --- a/lib/Graphics/Rendering/Plot/HMatrix.hs +++ b/lib/Graphics/Rendering/Plot/HMatrix.hs @@ -32,7 +32,8 @@ ----------------------------------------------------------------------------- {- Function signatures copied from hmatrix, (c) A. Ruiz -} -import Numeric.LinearAlgebra +import Numeric.LinearAlgebra hiding(matrix) +import Numeric.LinearAlgebra.Data() {- COMPATABILITY -} import Data.List(intersperse) @@ -46,6 +47,7 @@ ----------------------------------------------------------------------------- +--nohandle :: forall (m :: * -> *) a. Monad m => m a -> m () nohandle m = m >> return () ----------------------------------------------------------------------------- @@ -63,6 +65,7 @@ ----------------------------------------------------------------------------- -- apply several functions to one object +--mapf :: forall b a. [a -> b] -> a -> [b] mapf fs x = map ($ x) fs {- | Draws a list of functions over a desired range and with a desired number of points @@ -112,7 +115,7 @@ -- | From vectors x and y, it generates a pair of matrices to be used as x and y arguments for matrix functions. meshdom :: Vector Double -> Vector Double -> (Matrix Double , Matrix Double) -meshdom r1 r2 = (outer r1 (constant 1 (dim r2)), outer (constant 1 (dim r1)) r2) +meshdom r1 r2 = (outer r1 (konst 1 (size r2)), outer (konst 1 (size r1)) r2) gnuplotX :: String -> IO () gnuplotX command = do { _ <- system cmdstr; return()} where diff --git a/plot-gtk.cabal b/plot-gtk.cabal --- a/plot-gtk.cabal +++ b/plot-gtk.cabal @@ -1,8 +1,8 @@ Name: plot-gtk -Version: 0.2.0.2 +Version: 0.2.0.3 License: BSD3 License-file: LICENSE -Copyright: (c) A.V.H. McPhail 2010, 2012, 2014 +Copyright: (c) A.V.H. McPhail 2010, 2012, 2014, 2015 Author: Vivian McPhail Maintainer: haskell.vivian.mcphail gmail com Stability: experimental @@ -29,7 +29,7 @@ process, glib >= 0.11 && < 0.14, gtk >= 0.11 && < 0.14, - hmatrix >= 0.10, + hmatrix >= 0.17, plot < 0.3 Extensions: