implement freeze and delEdges

haskell-igraph.cabal

--- Initial igraph-bindings.cabal generated by cabal init.  For further 
+-- Initial igraph-bindings.cabal generated by cabal init.  For further
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                haskell-igraph
 version:             0.1.0
--- synopsis:            
--- description:         
+-- synopsis:
+-- description:
 license:             MIT
 license-file:        LICENSE
 author:              Kai Zhang
 maintainer:          kai@kzhang.org
--- copyright:           
+-- copyright:
 category:            Math
 build-type:          Simple
-extra-source-files:  cbits
+extra-source-files:  cbits/haskelligraph.c
 cabal-version:       >=1.22
 
 library
-  exposed-modules:     
+  exposed-modules:
     IGraph.Internal.Initialization
     IGraph.Internal.Constants
     IGraph.Internal.Arpack
@@ -35,8 +35,8 @@ library
     IGraph.Community
     IGraph.Read
     IGraph.Layout
-  -- other-modules:       
-  -- other-extensions:    
+  -- other-modules:
+  -- other-extensions:
   build-depends:
       base >=4.0 && <5.0
     , bytestring >=0.9
@@ -58,12 +58,12 @@ test-suite tests
   type: exitcode-stdio-1.0
   hs-source-dirs: tests
   main-is: test.hs
-  other-modules:       
+  other-modules:
     Test.Basic
     Test.Utils
 
   default-language:    Haskell2010
-  build-depends: 
+  build-depends:
       base
     , haskell-igraph
     , tasty

src/IGraph.hs

@@ -9,6 +9,7 @@ module IGraph
     , fromLabeledEdges
 
     , unsafeFreeze
+    , freeze
     , unsafeThaw
     , thaw
 
@@ -101,6 +102,11 @@ unsafeFreeze (MLGraph g) = return $ LGraph g labToId
     nV = igraphVcount g
     labels = map (read . igraphCattributeVAS g vertexAttr) [0 .. nV-1]
 
+freeze :: (Hashable v, Eq v, Read v, PrimMonad m) => MLGraph (PrimState m) d v e -> m (LGraph d v e)
+freeze (MLGraph g) = do
+    g' <- unsafePrimToPrim $ igraphCopy g
+    unsafeFreeze (MLGraph g')
+
 unsafeThaw :: PrimMonad m => LGraph d v e -> m (MLGraph (PrimState m) d v e)
 unsafeThaw (LGraph g _) = return $ MLGraph g
 
@@ -130,4 +136,3 @@ pre gr i = unsafePerformIO $ do
     igraphVsAdj vs i IgraphIn
     vit <- igraphVitNew (_graph gr) vs
     vitToList vit
-

src/IGraph/Internal/Selector.chs

@@ -80,6 +80,8 @@ vitToList vit = do
 
 {#fun igraph_es_all as ^ { +, `EdgeOrderType' } -> `IGraphEsPtr' #}
 
+{# fun igraph_es_vector as ^ { +, `VectorPtr' } -> `IGraphEsPtr' #}
+
 
 -- Edge iterator
 
@@ -124,3 +126,6 @@ eitToList eit = do
         acc <- eitToList eit
         return $ cur : acc
 
+-- delete edges
+
+{# fun igraph_delete_edges as ^ { `IGraphPtr', %`IGraphEsPtr' } -> `Int' #}

src/IGraph/Mutable.hs

@@ -5,6 +5,7 @@ import Foreign
 import Control.Monad.Primitive
 
 import IGraph.Internal.Graph
+import IGraph.Internal.Selector
 import IGraph.Internal.Data
 import IGraph.Internal.Attribute
 import IGraph.Internal.Initialization
@@ -44,6 +45,8 @@ class MGraph d where
 
     addLEdges :: (PrimMonad m, Show e) => [LEdge e] -> MLGraph (PrimState m) d v e -> m ()
 
+    delEdges :: PrimMonad m => [(Int, Int)] -> MLGraph (PrimState m) d v e -> m ()
+
 data U
 data D
 
@@ -66,6 +69,14 @@ instance MGraph U where
       where
         (xs, vs) = unzip $ map ( \(a,b,v) -> ([fromIntegral a, fromIntegral b], v) ) es
 
+    delEdges es (MLGraph g) = unsafePrimToPrim $ do
+        vptr <- listToVector $ map fromIntegral eids
+        esptr <- igraphEsVector vptr
+        igraphDeleteEdges g esptr
+        return ()
+      where
+        eids = flip map es $ \(fr, to) -> igraphGetEid g fr to False True
+
 instance MGraph D where
     new n = unsafePrimToPrim $ igraphInit >>= igraphNew n True >>= return . MLGraph
 
@@ -84,3 +95,11 @@ instance MGraph D where
             withVectorPPtr vptr $ \p -> igraphAddEdges g vec $ castPtr p
       where
         (xs, vs) = unzip $ map ( \(a,b,v) -> ([fromIntegral a, fromIntegral b], v) ) es
+
+    delEdges es (MLGraph g) = unsafePrimToPrim $ do
+        vptr <- listToVector $ map fromIntegral eids
+        esptr <- igraphEsVector vptr
+        igraphDeleteEdges g esptr
+        return ()
+      where
+        eids = flip map es $ \(fr, to) -> igraphGetEid g fr to True True

tests/Test/Basic.hs

@@ -2,6 +2,7 @@ module Test.Basic
     ( tests
     ) where
 
+import Control.Monad.ST
 import Test.Tasty
 import Test.Tasty.HUnit
 import Test.Utils
@@ -9,10 +10,12 @@ import System.IO.Unsafe
 import Data.List
 
 import IGraph
+import IGraph.Mutable
 
 tests :: TestTree
 tests = testGroup "Basic tests"
     [ graphCreation
+    , graphEdit
     ]
 
 graphCreation :: TestTree
@@ -26,3 +29,13 @@ graphCreation = testGroup "Graph creation"
     edgeList = sort $ unsafePerformIO $ randEdges 1000 100
     gr = mkGraph (100,Nothing) (edgeList, Nothing) :: LGraph D () ()
     simple = mkGraph (3,Nothing) ([(0,1),(1,2),(2,0)],Nothing) :: LGraph D () ()
+
+graphEdit :: TestTree
+graphEdit = testGroup "Graph editing"
+    [ testCase "" $ [(1,2)] @=? (sort $ edges simple') ]
+  where
+    simple = mkGraph (3,Nothing) ([(0,1),(1,2),(2,0)],Nothing) :: LGraph U () ()
+    simple' = runST $ do
+        g <- thaw simple
+        delEdges [(0,1),(0,2)] g
+        freeze g