graphviz 2999.10.0.0 → 2999.10.0.1

raw patch · 4 files changed

+19/−19 lines, 4 files

Files

• Changelog +12/−1
• Data/GraphViz/Testing/Instances.hs +5/−16
• Data/GraphViz/Types/State.hs +1/−1
• graphviz.cabal +1/−1

@@ -7,6 +7,17 @@ The following is information about what major changes have gone into each release. +Changes in 2999.10.0.1+----------------------++* Fixed a mistake in one of the source files that was made just to+  make+  [haskell-src-exts](http://hackage.haskell.org/package/haskell-src-exts)+  happier.++* Fix the `Arbitrary` instance for `Point` in the testsuite (since+  there's only one constructor now).+ Changes in 2999.10.0.0 ---------------------- @@ -19,7 +30,7 @@   by the primed functions is now achieved by using the   `setDirectedness` function. -  There are three default `GraphvizParams` available:+    There are three default `GraphvizParams` available:      - `defaultParams` provides some sensible defaults (no attributes       or clustering).

@@ -30,7 +30,7 @@ import Data.List(nub, delete, groupBy) import qualified Data.Sequence as Seq import qualified Data.Map as Map-import Control.Monad(liftM, liftM2, liftM3, liftM4, guard)+import Control.Monad(liftM, liftM2, liftM3, liftM4) import Data.Word(Word8, Word16)  -- -----------------------------------------------------------------------------@@ -645,19 +645,11 @@  instance Arbitrary Point where   -- Pretty sure points have to be positive...-  arbitrary = oneof [ liftM2 Point  posArbitrary posArbitrary-                    , liftM (uncurry PointD)-                      $ suchThat (liftM2 (,) posArbitrary posArbitrary)-                                 notBothInt-                    ]+  arbitrary = liftM2 Point posArbitrary posArbitrary -  shrink (Point  v1 v2) = do v1s <- shrink v1-                             v2s <- shrink v2-                             return $ Point v1s v2s-  shrink (PointD v1 v2) = do v1s <- shrink v1-                             v2s <- shrink v2-                             guard $ notBothInt (v1s,v2s)-                             return $ PointD v1s v2s+  shrink (Point v1 v2) = do v1s <- shrink v1+                            v2s <- shrink v2+                            return $ Point v1s v2s  instance Arbitrary ClusterMode where   arbitrary = arbBounded@@ -1238,9 +1230,6 @@  notInt   :: Double -> Bool notInt d = fromIntegral (round d :: Int) /= d--notBothInt         :: (Double, Double) -> Bool-notBothInt (p1,p2) = notInt p1 && notInt p2  returnCheck     :: (Eq a) => a -> a -> [a] returnCheck o n = if o == n

@@ -140,7 +140,7 @@ type ClusterInfo = (DList Path, SAttrs)  getGraphInfo :: GraphState a -> (GlobalAttributes, ClusterLookup)-getGraphInfo = (toGlobal . (globalAttrs &&& convert) . value)+getGraphInfo = ((toGlobal . globalAttrs) &&& (convert . value))                . flip execState initState   where     convert = Map.map ((uniq . toList) *** toGlobal)

@@ -1,5 +1,5 @@ Name:               graphviz-Version:            2999.10.0.0+Version:            2999.10.0.1 Stability:          Beta Synopsis:           Graphviz bindings for Haskell. Description: {