gnuplot 0.5.4 → 0.5.4.1

raw patch · 7 files changed

+18/−21 lines, 7 filesdep ~processdep ~timedep ~transformersPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: process, time, transformers

API changes (from Hackage documentation)

- Graphics.Gnuplot.File: content :: T -> String

- Graphics.Gnuplot.File: instance C T

- Graphics.Gnuplot.File: instance Eq T

- Graphics.Gnuplot.File: instance Show T

- Graphics.Gnuplot.File: name :: T -> FilePath

- Graphics.Gnuplot.MultiPlot: instance C T

- Graphics.Gnuplot.Simple: lineSpec :: PlotStyle -> LineSpec

- Graphics.Gnuplot.Simple: plotType :: PlotStyle -> PlotType

- Graphics.Gnuplot.Terminal.Default: instance C T

- Graphics.Gnuplot.Terminal.PNG: instance C T

- Graphics.Gnuplot.Terminal.PostScript: instance C T

- Graphics.Gnuplot.Terminal.SVG: instance C T

- Graphics.Gnuplot.Terminal.WXT: instance C T

- Graphics.Gnuplot.Terminal.X11: instance C T

- Graphics.Gnuplot.Value.Atom: instance C Day

- Graphics.Gnuplot.Value.Atom: instance C Double

- Graphics.Gnuplot.Value.Atom: instance C Float

- Graphics.Gnuplot.Value.Atom: instance C Int

- Graphics.Gnuplot.Value.Atom: instance C Int16

- Graphics.Gnuplot.Value.Atom: instance C Int32

- Graphics.Gnuplot.Value.Atom: instance C Int64

- Graphics.Gnuplot.Value.Atom: instance C Int8

- Graphics.Gnuplot.Value.Atom: instance C Integer

- Graphics.Gnuplot.Value.Atom: instance C UTCTime

- Graphics.Gnuplot.Value.Atom: instance C Word16

- Graphics.Gnuplot.Value.Atom: instance C Word32

- Graphics.Gnuplot.Value.Atom: instance C Word64

- Graphics.Gnuplot.Value.Atom: instance C Word8

- Graphics.Gnuplot.Value.Atom: instance Integral a => C (Ratio a)

- Graphics.Gnuplot.Value.Atom: optData :: OptionSet a -> [String]

- Graphics.Gnuplot.Value.Atom: optFormat :: OptionSet a -> [String]

- Graphics.Gnuplot.Value.Atom: optOthers :: OptionSet a -> [(T, [String])]

- Graphics.Gnuplot.Value.Tuple: instance (C a, C b) => C (a, b)

- Graphics.Gnuplot.Value.Tuple: instance (C a, C b, C c) => C (a, b, c)

- Graphics.Gnuplot.Value.Tuple: instance (C a, C b, C c, C d) => C (a, b, c, d)

- Graphics.Gnuplot.Value.Tuple: instance C Day

- Graphics.Gnuplot.Value.Tuple: instance C Double

- Graphics.Gnuplot.Value.Tuple: instance C Float

- Graphics.Gnuplot.Value.Tuple: instance C Int

- Graphics.Gnuplot.Value.Tuple: instance C Int16

- Graphics.Gnuplot.Value.Tuple: instance C Int32

- Graphics.Gnuplot.Value.Tuple: instance C Int64

- Graphics.Gnuplot.Value.Tuple: instance C Int8

- Graphics.Gnuplot.Value.Tuple: instance C Integer

- Graphics.Gnuplot.Value.Tuple: instance C UTCTime

- Graphics.Gnuplot.Value.Tuple: instance C Word16

- Graphics.Gnuplot.Value.Tuple: instance C Word32

- Graphics.Gnuplot.Value.Tuple: instance C Word64

- Graphics.Gnuplot.Value.Tuple: instance C Word8

- Graphics.Gnuplot.Value.Tuple: instance Eq (ColumnCount a)

- Graphics.Gnuplot.Value.Tuple: instance Integral a => C (Ratio a)

- Graphics.Gnuplot.Value.Tuple: instance Ord (ColumnCount a)

- Graphics.Gnuplot.Value.Tuple: instance Show (ColumnCount a)

+ Graphics.Gnuplot.File: [content] :: T -> String

+ Graphics.Gnuplot.File: [name] :: T -> FilePath

+ Graphics.Gnuplot.File: instance GHC.Classes.Eq Graphics.Gnuplot.File.T

+ Graphics.Gnuplot.File: instance GHC.Show.Show Graphics.Gnuplot.File.T

+ Graphics.Gnuplot.File: instance Graphics.Gnuplot.Private.File.C Graphics.Gnuplot.File.T

+ Graphics.Gnuplot.MultiPlot: instance Graphics.Gnuplot.Private.Display.C Graphics.Gnuplot.MultiPlot.T

+ Graphics.Gnuplot.Simple: [lineSpec] :: PlotStyle -> LineSpec

+ Graphics.Gnuplot.Simple: [plotType] :: PlotStyle -> PlotType

+ Graphics.Gnuplot.Terminal.Default: instance Graphics.Gnuplot.Private.Terminal.C Graphics.Gnuplot.Terminal.Default.T

+ Graphics.Gnuplot.Terminal.PNG: instance Graphics.Gnuplot.Private.Terminal.C Graphics.Gnuplot.Terminal.PNG.T

+ Graphics.Gnuplot.Terminal.PostScript: instance Graphics.Gnuplot.Private.Terminal.C Graphics.Gnuplot.Terminal.PostScript.T

+ Graphics.Gnuplot.Terminal.SVG: instance Graphics.Gnuplot.Private.Terminal.C Graphics.Gnuplot.Terminal.SVG.T

+ Graphics.Gnuplot.Terminal.WXT: instance Graphics.Gnuplot.Private.Terminal.C Graphics.Gnuplot.Terminal.WXT.T

+ Graphics.Gnuplot.Terminal.X11: instance Graphics.Gnuplot.Private.Terminal.C Graphics.Gnuplot.Terminal.X11.T

+ Graphics.Gnuplot.Value.Atom: [optData] :: OptionSet a -> [String]

+ Graphics.Gnuplot.Value.Atom: [optFormat] :: OptionSet a -> [String]

+ Graphics.Gnuplot.Value.Atom: [optOthers] :: OptionSet a -> [(T, [String])]

+ Graphics.Gnuplot.Value.Atom: instance GHC.Real.Integral a => Graphics.Gnuplot.Value.Atom.C (GHC.Real.Ratio a)

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C Data.Time.Calendar.Days.Day

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C Data.Time.Clock.UTC.UTCTime

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Int.Int16

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Int.Int32

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Int.Int64

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Int.Int8

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Integer.Type.Integer

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Types.Double

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Types.Float

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Types.Int

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Word.Word16

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Word.Word32

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Word.Word64

+ Graphics.Gnuplot.Value.Atom: instance Graphics.Gnuplot.Value.Atom.C GHC.Word.Word8

+ Graphics.Gnuplot.Value.Tuple: instance (Graphics.Gnuplot.Value.Tuple.C a, Graphics.Gnuplot.Value.Tuple.C b) => Graphics.Gnuplot.Value.Tuple.C (a, b)

+ Graphics.Gnuplot.Value.Tuple: instance (Graphics.Gnuplot.Value.Tuple.C a, Graphics.Gnuplot.Value.Tuple.C b, Graphics.Gnuplot.Value.Tuple.C c) => Graphics.Gnuplot.Value.Tuple.C (a, b, c)

+ Graphics.Gnuplot.Value.Tuple: instance (Graphics.Gnuplot.Value.Tuple.C a, Graphics.Gnuplot.Value.Tuple.C b, Graphics.Gnuplot.Value.Tuple.C c, Graphics.Gnuplot.Value.Tuple.C d) => Graphics.Gnuplot.Value.Tuple.C (a, b, c, d)

+ Graphics.Gnuplot.Value.Tuple: instance GHC.Classes.Eq (Graphics.Gnuplot.Value.Tuple.ColumnCount a)

+ Graphics.Gnuplot.Value.Tuple: instance GHC.Classes.Ord (Graphics.Gnuplot.Value.Tuple.ColumnCount a)

+ Graphics.Gnuplot.Value.Tuple: instance GHC.Real.Integral a => Graphics.Gnuplot.Value.Tuple.C (GHC.Real.Ratio a)

+ Graphics.Gnuplot.Value.Tuple: instance GHC.Show.Show (Graphics.Gnuplot.Value.Tuple.ColumnCount a)

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C Data.Time.Calendar.Days.Day

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C Data.Time.Clock.UTC.UTCTime

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Int.Int16

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Int.Int32

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Int.Int64

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Int.Int8

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Integer.Type.Integer

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Types.Double

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Types.Float

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Types.Int

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Word.Word16

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Word.Word32

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Word.Word64

+ Graphics.Gnuplot.Value.Tuple: instance Graphics.Gnuplot.Value.Tuple.C GHC.Word.Word8

- Graphics.Gnuplot.Advanced: plotDefault :: C gfx => gfx -> IO ExitCode

+ Graphics.Gnuplot.Advanced: plotDefault :: (C gfx) => gfx -> IO ExitCode

- Graphics.Gnuplot.Frame.OptionSet: boxwidthAbsolute :: C graph => Double -> T graph -> T graph

+ Graphics.Gnuplot.Frame.OptionSet: boxwidthAbsolute :: (C graph) => Double -> T graph -> T graph

- Graphics.Gnuplot.Frame.OptionSet: boxwidthRelative :: C graph => Double -> T graph -> T graph

+ Graphics.Gnuplot.Frame.OptionSet: boxwidthRelative :: (C graph) => Double -> T graph -> T graph

- Graphics.Gnuplot.Graph.TwoDimensional: histograms :: C y => T Int y y

+ Graphics.Gnuplot.Graph.TwoDimensional: histograms :: (C y) => T Int y y

- Graphics.Gnuplot.Graph.TwoDimensional: listDots :: C y => T Int y y

+ Graphics.Gnuplot.Graph.TwoDimensional: listDots :: (C y) => T Int y y

- Graphics.Gnuplot.Graph.TwoDimensional: listImpulses :: C y => T Int y y

+ Graphics.Gnuplot.Graph.TwoDimensional: listImpulses :: (C y) => T Int y y

- Graphics.Gnuplot.Graph.TwoDimensional: listLines :: C y => T Int y y

+ Graphics.Gnuplot.Graph.TwoDimensional: listLines :: (C y) => T Int y y

- Graphics.Gnuplot.Graph.TwoDimensional: listLinesPoints :: C y => T Int y y

+ Graphics.Gnuplot.Graph.TwoDimensional: listLinesPoints :: (C y) => T Int y y

- Graphics.Gnuplot.Graph.TwoDimensional: listPoints :: C y => T Int y y

+ Graphics.Gnuplot.Graph.TwoDimensional: listPoints :: (C y) => T Int y y

- Graphics.Gnuplot.Simple: plotList :: C a => [Attribute] -> [a] -> IO ()

+ Graphics.Gnuplot.Simple: plotList :: (C a) => [Attribute] -> [a] -> IO ()

- Graphics.Gnuplot.Simple: plotListStyle :: C a => [Attribute] -> PlotStyle -> [a] -> IO ()

+ Graphics.Gnuplot.Simple: plotListStyle :: (C a) => [Attribute] -> PlotStyle -> [a] -> IO ()

- Graphics.Gnuplot.Simple: plotLists :: C a => [Attribute] -> [[a]] -> IO ()

+ Graphics.Gnuplot.Simple: plotLists :: (C a) => [Attribute] -> [[a]] -> IO ()

- Graphics.Gnuplot.Simple: plotListsStyle :: C a => [Attribute] -> [(PlotStyle, [a])] -> IO ()

+ Graphics.Gnuplot.Simple: plotListsStyle :: (C a) => [Attribute] -> [(PlotStyle, [a])] -> IO ()

- Graphics.Gnuplot.Simple: plotPath :: C a => [Attribute] -> [(a, a)] -> IO ()

+ Graphics.Gnuplot.Simple: plotPath :: (C a) => [Attribute] -> [(a, a)] -> IO ()

- Graphics.Gnuplot.Simple: plotPathStyle :: C a => [Attribute] -> PlotStyle -> [(a, a)] -> IO ()

+ Graphics.Gnuplot.Simple: plotPathStyle :: (C a) => [Attribute] -> PlotStyle -> [(a, a)] -> IO ()

- Graphics.Gnuplot.Simple: plotPaths :: C a => [Attribute] -> [[(a, a)]] -> IO ()

+ Graphics.Gnuplot.Simple: plotPaths :: (C a) => [Attribute] -> [[(a, a)]] -> IO ()

- Graphics.Gnuplot.Simple: plotPathsStyle :: C a => [Attribute] -> [(PlotStyle, [(a, a)])] -> IO ()

+ Graphics.Gnuplot.Simple: plotPathsStyle :: (C a) => [Attribute] -> [(PlotStyle, [(a, a)])] -> IO ()

Files

gnuplot.cabal +6/−7
src/Graphics/Gnuplot/Plot/TwoDimensional.hs +4/−6
src/Graphics/Gnuplot/Private/Graph.hs +3/−1
src/Graphics/Gnuplot/Private/Graph2D.hs +1/−1
src/Graphics/Gnuplot/Private/Graph3D.hs +1/−1
src/Graphics/Gnuplot/Private/GraphEmpty.hs +1/−1
src/Graphics/Gnuplot/Private/Plot.hs +2/−4

gnuplot.cabal view

@@ -1,5 +1,5 @@ Name:             gnuplot-Version:          0.5.4+Version:          0.5.4.1 License:          BSD3 License-File:     LICENSE Author:           Henning Thielemann <haskell@henning-thielemann.de>@@ -35,8 +35,7 @@    of feeding gnuplot with a script.    .    Alternative packages: @plot@, @HPlot@, @Chart@, @textPlot@, @easyplot@-Tested-With:       GHC==6.8.2, GHC==6.12.3-Tested-With:       GHC==7.0.2, GHC==7.4.2, GHC==7.6.3+Tested-With:       GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.3 Cabal-Version:     >=1.6 Build-Type:        Simple Extra-Source-Files:@@ -50,7 +49,7 @@   data/runtime.data  Source-Repository this-  Tag:         0.5.4+  Tag:         0.5.4.1   Type:        darcs   Location:    http://code.haskell.org/gnuplot/ @@ -82,12 +81,12 @@     utility-ht >=0.0.8 && <0.1,     data-accessor-transformers >=0.2.1 && <0.3,     data-accessor >=0.2.2 && <0.3,-    transformers >=0.3 && <0.5,+    transformers >=0.3 && <0.6,     deepseq >=1.0 && <1.5   If flag(splitBase)     Build-Depends:-      process >=1.0 && <1.3,-      time >=1.5 && <1.6,+      process >=1.0 && <1.5,+      time >=1.5 && <1.7,       base >=2 && <5   Else     Build-Depends:

src/Graphics/Gnuplot/Plot/TwoDimensional.hs view

@@ -69,12 +69,10 @@    Type.T x y (a,b) -> [a] -> [a -> b] -> T x y functions typ args fs =    let dat = map (\x -> (x, map ($ x) fs)) args-       typA :: Type.T x y (a,b) -> Type.T x y a-       typA = undefined-       typB :: Type.T x y (a,b) -> Type.T x y b-       typB = undefined-       Tuple.ColumnCount na = Type.tupleSize (typA typ)-       Tuple.ColumnCount nb = Type.tupleSize (typB typ)+       mapType :: (a -> b) -> Type.T x y a -> Type.T x y b+       mapType _ (Type.Cons str) = Type.Cons str+       Tuple.ColumnCount na = Type.tupleSize $ mapType fst typ+       Tuple.ColumnCount nb = Type.tupleSize $ mapType snd typ    in  Plot.withUniqueFile           (assembleCells               (map (\(a,b) -> Tuple.text a ++ concatMap Tuple.text b) dat))

src/Graphics/Gnuplot/Private/Graph.hs view

@@ -3,6 +3,8 @@ import qualified Graphics.Gnuplot.Private.FrameOptionSet as OptionSet  class C graph where-   command :: graph -> String+   command :: Command graph    toString :: graph -> String    defltOptions :: OptionSet.T graph++newtype Command graph = Command {commandString :: String}

src/Graphics/Gnuplot/Private/Graph2D.hs view

@@ -64,7 +64,7 @@   instance (Atom.C x, Atom.C y) => Graph.C (T x y) where-   command _ = "plot"+   command = Graph.Command "plot"    toString = toString    defltOptions = defltOptions

src/Graphics/Gnuplot/Private/Graph3D.hs view

@@ -60,7 +60,7 @@   instance (Atom.C x, Atom.C y, Atom.C z) => Graph.C (T x y z) where-   command _ = "splot"+   command = Graph.Command "splot"    toString = toString    defltOptions = defltOptions

src/Graphics/Gnuplot/Private/GraphEmpty.hs view

@@ -14,7 +14,7 @@   instance Graph.C T where-   command _ = "clear"+   command = Graph.Command "clear"    toString = const ""    defltOptions =       OptionSet.Cons OptionSet.deflt

src/Graphics/Gnuplot/Private/Plot.hs view

@@ -110,7 +110,7 @@              blocks       return $          Display.Body files-            [plotCmd p undefined ++ " " ++ commaConcat graphs]+            [Graph.commandString (plotCmd p) ++ " " ++ commaConcat graphs]  optionsToScript :: Graph.C graph => OptionSet.T graph -> Display.Script optionsToScript opts =@@ -130,7 +130,5 @@    toScript plot =       optionsToScript (defltOpts plot)  `mappend`  toScript plot -plotCmd ::-   Graph.C graph =>-   T graph -> graph -> String+plotCmd :: Graph.C graph => T graph -> Graph.Command graph plotCmd _plot = Graph.command