add Binary instance

haskell-igraph.cabal

@@ -55,6 +55,7 @@ library
 
   build-depends:
       base >=4.0 && <5.0
+    , binary
     , bytestring >=0.9
     , bytestring-lexing >=0.5
     , colour

src/IGraph.hs

-{-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE FlexibleContexts      #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
 module IGraph
     ( LGraph(..)
     , U(..)
@@ -25,20 +25,21 @@ module IGraph
     ) where
 
 import           Control.Arrow             ((***))
-import Control.Monad (liftM, forM_)
-import Control.Monad.ST (runST)
+import           Control.Monad             (forM_, liftM)
 import           Control.Monad.Primitive
+import           Control.Monad.ST          (runST)
+import           Data.Hashable             (Hashable)
 import qualified Data.HashMap.Strict       as M
 import           Data.List                 (nub)
-import Data.Hashable (Hashable)
 import           Data.Maybe
+import Data.Binary
 import           System.IO.Unsafe          (unsafePerformIO)
 
-import IGraph.Mutable
-import IGraph.Internal.Graph
-import IGraph.Internal.Constants
 import           IGraph.Internal.Attribute
+import           IGraph.Internal.Constants
+import           IGraph.Internal.Graph
 import           IGraph.Internal.Selector
+import           IGraph.Mutable
 
 type Node = Int
 type Edge = (Node, Node)
@@ -49,6 +50,22 @@ data LGraph d v e = LGraph
     , _labelToNode :: M.HashMap v [Node]
     }
 
+instance ( Binary v, Hashable v, Read v, Show v, Eq v
+         , Binary e, Read e, Show e, Graph d) => Binary (LGraph d v e) where
+    put gr = do
+        put nlabs
+        put es
+        put elabs
+      where
+        nlabs = map (nodeLab gr) $ nodes gr
+        es = edges gr
+        elabs = map (edgeLab gr) es
+    get = do
+        nlabs <- get
+        es <- get
+        elabs <- get
+        return $ mkGraph nlabs $ zip es elabs
+
 class MGraph d => Graph d where
     isDirected :: LGraph d v e -> Bool
     isD :: d -> Bool
@@ -118,29 +135,23 @@ instance Graph D where
     isD = const True
 
 mkGraph :: (Graph d, Hashable v, Read v, Eq v, Show v, Show e)
-        => (Node, Maybe [v]) -> ([Edge], Maybe [e]) -> LGraph d v e
-mkGraph (n, vattr) (es,eattr) = runST $ do
+        => [v] -> [(Edge, e)] -> LGraph d v e
+mkGraph vattr es = runST $ do
     g <- new 0
-    let addV | isNothing vattr = addNodes n g
-             | otherwise = addLNodes n (fromJust vattr) g
-        addE | isNothing eattr = addEdges es g
-             | otherwise = addLEdges (zip' es (fromJust eattr)) g
-    addV
-    addE
+    addLNodes n vattr g
+    addLEdges (map (\((fr,to),x) -> (fr,to,x)) es) g
     unsafeFreeze g
   where
-    zip' a b | length a /= length b = error "incorrect length"
-             | otherwise = zipWith (\(x,y) z -> (x,y,z)) a b
+    n = length vattr
 
 fromLabeledEdges :: (Graph d, Hashable v, Read v, Eq v, Show v, Show e)
                  => [((v, v), e)] -> LGraph d v e
-fromLabeledEdges es = mkGraph (n, Just labels) (es', Just $ snd $ unzip es)
+fromLabeledEdges es = mkGraph labels es'
   where
-    es' = map (f *** f) $ fst $ unzip es
+    es' = flip map es $ \((fr, to), x) -> ((f fr, f to), x)
       where f x = M.lookupDefault undefined x labelToId
     labels = nub $ concat [ [a,b] | ((a,b),_) <- es ]
     labelToId = M.fromList $ zip labels [0..]
-    n = M.size labelToId
 
 unsafeFreeze :: (Hashable v, Eq v, Read v, PrimMonad m) => MLGraph (PrimState m) d v e -> m (LGraph d v e)
 unsafeFreeze (MLGraph g) = return $ LGraph g labToId

src/IGraph/Motif.hs

@@ -42,4 +42,4 @@ triad = map make xs
          ]
 
 make :: [(Int, Int)] -> LGraph D () ()
-make xs = mkGraph (length xs, Nothing) (xs, Nothing)
+make xs = mkGraph (replicate (length xs) ()) $ zip xs $ repeat ()

src/IGraph/Read.hs

@@ -26,7 +26,7 @@ fromAdjMatrix bs =
         ncol = length $ head mat
     in if nrow /= ncol
          then error "fromAdjMatrix: nrow != ncol"
-         else mkGraph (nrow, Just $ B.words header) (es, Nothing)
+         else mkGraph (B.words header) $ zip es $ repeat ()
   where
     f ((i,j),v) = i < j && v /= 0
 {-# INLINE fromAdjMatrix #-}
@@ -41,6 +41,6 @@ readAdjMatrixWeighted fl = do
         ncol = length $ head mat
     if nrow /= ncol
        then error "nrow != ncol"
-       else return $ mkGraph (nrow, Just $ B.words header) (es, Just ws)
+       else return $ mkGraph (B.words header) $ zip es ws
   where
     f ((i,j),v) = i < j && v /= 0