Changeset 11196

Timestamp:

31.12.2008 12:29:35 (15 months ago)

Author:

maeder

Message:

allow to re-insert an existing edge, fails for contradicting edge ids

Files:

• trunk/Proofs/EdgeUtils.hs (modified) (2 diffs)

trunk/Proofs/EdgeUtils.hs

@@ -113 +113 @@
     InsertNode n -> (insLNodeDG n g, InsertNode n)
     DeleteNode n -> (delLNodeDG n g, DeleteNode n)
-    InsertEdge e -> let (newEdge, ng) = insLEdgeDG e g in
-       (ng, InsertEdge newEdge)
+    InsertEdge e -> case tryToGetEdge e g of
+      Nothing -> let (newEdge, ng) = insLEdgeDG e g in
+        (ng, InsertEdge newEdge)
+      Just ne ->
+        if elem (getEdgeId e) [defaultEdgeId, getEdgeId ne]
+        then (g, InsertEdge ne)
+        else error "Proofs.EdgeUtils.updateDGOnly"
     DeleteEdge e -> (delLEdgeDG e g, DeleteEdge e)
     SetNodeLab _ n -> let (newG, o) = labelNodeDG n g in (newG, SetNodeLab o n)
@@ -226 +231 @@
   case tryToGetEdge edge dgraph of
     Nothing -> changeDGH dgraph $ InsertEdge edge
-    Just e@(src, tgt, label) -> let eid = getEdgeId edge in
-        if eid == defaultEdgeId
+    Just ne ->
+        if elem (getEdgeId edge) [defaultEdgeId, getEdgeId ne]
         then dgraph
-        else let nid = assert (dgl_id label == eid) eid
-                 newEdge = (src, tgt,
-                   label { dgl_id = nid })
-             in changesDGH dgraph [DeleteEdge e, InsertEdge newEdge]
+        else error "Proofs.EdgeUtils.insertDGLEdge"
 
 {- | get the edge id out of a given edge -}