add directed graph instance

haskell-igraph.cabal

@@ -59,6 +59,8 @@ test-suite tests
   hs-source-dirs: tests
   main-is: test.hs
   other-modules:       
+    Test.Basic
+    Test.Utils
 
   default-language:    Haskell2010
   build-depends: 
@@ -67,6 +69,7 @@ test-suite tests
     , tasty
     , tasty-golden
     , tasty-hunit
+    , random
 
 source-repository  head
   type: git

src/IGraph.hs

@@ -46,12 +46,19 @@ class MGraph d => Graph d where
     nEdges :: LGraph d v e -> Int
     nEdges (LGraph g _) = igraphEcount g
 
+{-
     edges :: LGraph d v e -> [Edge]
     edges (LGraph g _) = unsafePerformIO $ do
         es <- igraphEsAll IgraphEdgeorderFrom
         eit <- igraphEitNew g es
         eids <- eitToList eit
         mapM (igraphEdge g) eids
+        -}
+
+    edges :: LGraph d v e -> [Edge]
+    edges gr@(LGraph g _) = unsafePerformIO $ mapM (igraphEdge g) [0..n-1]
+      where
+        n = nEdges gr
 
     nodeLab :: Read v => LGraph d v e -> Node -> v
     nodeLab (LGraph g _) i = read $ igraphCattributeVAS g vertexAttr i
@@ -64,6 +71,7 @@ class MGraph d => Graph d where
 
 
 instance Graph U where
+instance Graph D where
 
 
 mkGraph :: (Graph d, Hashable v, Read v, Eq v, Show v, Show e) => (Node, Maybe [v]) -> ([Edge], Maybe [e]) -> LGraph d v e

src/IGraph/Mutable.hs

@@ -25,11 +25,20 @@ class MGraph d where
     new :: PrimMonad m => Int -> m (MLGraph (PrimState m) d v e)
 
     addNodes :: PrimMonad m => Int -> MLGraph(PrimState m) d v e -> m ()
+    addNodes n (MLGraph g) = unsafePrimToPrim $ igraphAddVertices g n nullPtr
 
     addLNodes :: (Show v, PrimMonad m)
                  => Int  -- ^ the number of new vertices add to the graph
                  -> [v]  -- ^ vertices' labels
                  -> MLGraph (PrimState m) d v e -> m ()
+    addLNodes n labels (MLGraph g)
+        | n /= length labels = error "addLVertices: incorrect number of labels"
+        | otherwise = unsafePrimToPrim $ do
+            let attr = makeAttributeRecord vertexAttr labels
+            alloca $ \ptr -> do
+                poke ptr attr
+                vptr <- listToVectorP [castPtr ptr]
+                withVectorPPtr vptr $ \p -> igraphAddVertices g n $ castPtr p
 
     addEdges :: PrimMonad m => [(Int, Int)] -> MLGraph (PrimState m) d v e -> m ()
 
@@ -41,16 +50,24 @@ data D
 instance MGraph U where
     new n = unsafePrimToPrim $ igraphInit >>= igraphNew n False >>= return . MLGraph
 
-    addNodes n (MLGraph g) = unsafePrimToPrim $ igraphAddVertices g n nullPtr
+    addEdges es (MLGraph g) = unsafePrimToPrim $ do
+        vec <- listToVector xs
+        igraphAddEdges g vec nullPtr
+      where
+        xs = concatMap ( \(a,b) -> [fromIntegral a, fromIntegral b] ) es
 
-    addLNodes n labels (MLGraph g)
-        | n /= length labels = error "addLVertices: incorrect number of labels"
-        | otherwise = unsafePrimToPrim $ do
-            let attr = makeAttributeRecord vertexAttr labels
-            alloca $ \ptr -> do
-                poke ptr attr
-                vptr <- listToVectorP [castPtr ptr]
-                withVectorPPtr vptr $ \p -> igraphAddVertices g n $ castPtr p
+    addLEdges es (MLGraph g) = unsafePrimToPrim $ do
+        vec <- listToVector $ concat xs
+        let attr = makeAttributeRecord edgeAttr vs
+        alloca $ \ptr -> do
+            poke ptr attr
+            vptr <- listToVectorP [castPtr ptr]
+            withVectorPPtr vptr $ \p -> igraphAddEdges g vec $ castPtr p
+      where
+        (xs, vs) = unzip $ map ( \(a,b,v) -> ([fromIntegral a, fromIntegral b], v) ) es
+
+instance MGraph D where
+    new n = unsafePrimToPrim $ igraphInit >>= igraphNew n True >>= return . MLGraph
 
     addEdges es (MLGraph g) = unsafePrimToPrim $ do
         vec <- listToVector xs