Graphalyze 0.13.0.1 → 0.14.0.0

raw patch · 3 files changed

+11/−10 lines, 3 filesdep ~graphviz

Dependency ranges changed: graphviz

Files

• Data/Graph/Analysis/Reporting.hs +6/−6
• Data/Graph/Analysis/Visualisation.hs +3/−2
• Graphalyze.cabal +2/−2

@@ -31,7 +31,7 @@  import Data.Graph.Inductive(Node) import Data.GraphViz-import Data.GraphViz.Attributes.Complete(Attribute(Size), Point(..), createPoint)+import qualified Data.GraphViz.Attributes.Complete as AC import Data.GraphViz.Exception import Data.GraphViz.Commands.IO(writeDotFile) @@ -108,7 +108,7 @@  -- | Specify the 'DotGraph' to turn into an image, its filename (sans --   extension) and its caption.  The 'DotGraph' should not have a---   'Size' set.+--   'AC.Size' set. data DocGraph = DG {  -- | What name to provide the image file                       --   (without an extension).                      imageFile   :: FilePath@@ -141,8 +141,8 @@                    deriving (Eq, Ord, Show, Read)  -- | Specify the size the 'DotGraph' should be at.-data GraphSize = GivenSize Point  -- ^ Specify the size to use.-               | DefaultSize      -- ^ Let GraphViz choose an appropriate size.+data GraphSize = GivenSize AC.GraphSize -- ^ Specify the size to use.+               | DefaultSize            -- ^ Let GraphViz choose an appropriate size.                deriving (Eq, Ord, Show, Read)  -- -----------------------------------------------------------------------------@@ -272,12 +272,12 @@   where     setS s = stmts { attrStmts = sizeA s : attrStmts stmts }     stmts = graphStatements g-    sizeA s = GraphAttrs [Size s]+    sizeA s = GraphAttrs [AC.Size s]  -- | Using a 6:4 ratio, create the given 'Point' representing --   width,height from the width. createSize   :: Double -> GraphSize-createSize w = GivenSize $ createPoint w (w*4/6)+createSize w = GivenSize $ AC.GSize w (Just $ w*4/6) True  -- | Replace all @.@ with @-@ in the given 'FilePath', since some output --   formats (e.g. LaTeX) don't like extraneous @.@'s in the filename.

@@ -61,8 +61,9 @@                        -> GraphData nl el -> DotGraph Node graphvizClusters ps = graphviz params   where-    params = ps { clusterBy = assignCluster-                , clusterID = toGraphID+    params = ps { clusterBy    = assignCluster+                , isDotCluster = const True+                , clusterID    = toGraphID                 }  -- | A function to convert an 'LNode' to the required 'LNodeCluster'

@@ -1,5 +1,5 @@ Name:                Graphalyze-Version:             0.13.0.1+Version:             0.14.0.0 Synopsis:            Graph-Theoretic Analysis library. Description:         A library to use graph theory to analyse the relationships                         inherent in discrete data.@@ -30,7 +30,7 @@                          time,                          bktrees >= 0.2 && <0.4,                          fgl >= 5.4.2.3 && < 5.5,-                         graphviz >= 2999.13 && < 2999.15,+                         graphviz >= 2999.15 && < 2999.16,                          pandoc >= 1.8 && < 1.10,                          text