[HyperGraph] functions properties (mv).

src/Data/Graph/Clustering/HLouvain.hs

@@ -194,7 +194,7 @@ modularity gr ns = coverage - edgeDensity
     coverage  = sizeSubGraph / sizeAllGraph 
       where
           sizeSubGraph :: Double
-          sizeSubGraph = fromIntegral ( G.size $ subgraph ns gr )
+          sizeSubGraph = fromIntegral ( G.size $ subgraph' ns gr )
 
           sizeAllGraph :: Double
           sizeAllGraph = fromIntegral (G.size gr)
@@ -208,8 +208,8 @@ modularity gr ns = coverage - edgeDensity
           links :: Double
           links       = fromIntegral (2 * (G.size gr))
 
-subgraph :: DynGraph gr => Set Node -> gr a b -> gr a b
-subgraph ns = G.subgraph (Set.toList ns)
+subgraph' :: DynGraph gr => Set Node -> gr a b -> gr a b
+subgraph' ns = G.subgraph (Set.toList ns)
 
 exclusion :: Ord a => Set a -> Set a -> Set a
 exclusion a b = (Set.\\) b a

src/Data/Graph/Clustering/ILouvain.hs

@@ -27,7 +27,10 @@ import Data.Graph.Inductive
 ------------------------------------------------------------------------
 -- HyperGraph Definition
 type HyperGraph   a b = Gr (Gr () a) b
+type HyperContext a b = Context (Gr () a) b
 
+-- TODO Later (hypothesis still)
+-- type StreamGraph  a b = Gr a (Gr () b)
 ------------------------------------------------------------------------
 -- Spoon Graph
 --    1
@@ -52,12 +55,45 @@ spoon = mkGraph ns es
          , (4, 5, 1.0)
          ]
 
--- | Work in progress:
-mvNode :: HyperGraph a a -> Node -> Node -> HyperGraph a a
-mvNode g n1 n2 =  buildGr $ catMaybes [c1, c2]
+-- | Needed functions (WIP)
+-- mv: a Node elsewhere in the HyperGraph
+
+-- Move Properties:
+-- mv Node into another Node and remove it again should be equal to
+-- identity
+
+-- property test:
+-- mv (mv g [a] [b]) [b,a] [] = identity
+-- mv g [a] [] == g
+-- mv g [a,b] [] /= g
+-- mv (mv spoon [1] [4]) [4,1] [] = identity
+
+-- Move target type
+mv' :: HyperGraph a a
+   -> [Node] -> [Node]
+   -> HyperGraph a a
+mv' g []  [] = g
+mv' g [_] [] = g
+mv' g (x:xs) [] = undefined
+
+-- | Start simple (without path)
+mv :: HyperGraph a a
+   -> Node -> Node
+   -> HyperGraph a a
+mv g n1 n2 =  delNode n1 g
+-- buildGr $ catMaybes [c1, c2]
   where
     (c1, g1) = match n1 g
-    (c2, g2) = match n2 g1
+
+
+
+{-
+insertContext :: HyperContext a b
+              -> HyperContext a b
+              -> HyperContext a b
+insertContext (a1,n,l,a2) (a1',n',l',a2') = (a1,n,l&l',a2)
+
+--}
 
 ------------------------------------------------------------------------
 -- | Recursive Node of Graph