Fix for #22. Removing edges is now reflected in the internal represen…

…tation of adjacency.
brunomnsilva · Aug 3, 2021 · 0878b88 · 0878b88
1 parent 7b3cd99
commit 0878b88
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/releases/JavaFXSmartGraph-0.9.4.jar b/releases/JavaFXSmartGraph-0.9.4.jar
diff --git a/releases/JavaFXSmartGraph-0.9.4.zip b/releases/JavaFXSmartGraph-0.9.4.zip
diff --git a/src/com/brunomnsilva/smartgraph/Main.java b/src/com/brunomnsilva/smartgraph/Main.java
@@ -38,6 +38,7 @@
 import com.brunomnsilva.smartgraph.containers.SmartGraphDemoContainer;
 import com.brunomnsilva.smartgraph.graph.Digraph;
 import com.brunomnsilva.smartgraph.graph.DigraphEdgeList;
+import com.brunomnsilva.smartgraph.graph.Edge;
 import com.brunomnsilva.smartgraph.graphview.SmartCircularSortedPlacementStrategy;
 import com.brunomnsilva.smartgraph.graphview.SmartGraphVertex;
 import com.brunomnsilva.smartgraph.graphview.SmartStylableNode;

diff --git a/src/com/brunomnsilva/smartgraph/graphview/SmartGraphPanel.java b/src/com/brunomnsilva/smartgraph/graphview/SmartGraphPanel.java
@@ -116,6 +116,9 @@ public class SmartGraphPanel<V, E> extends Pane {
     private final double repulsionForce;
     private final double attractionForce;
     private final double attractionScale;
+
+    //This value was obtained experimentally
+    private static final int AUTOMATIC_LAYOUT_ITERATIONS = 20;
 
     /**
      * Constructs a visualization of the graph referenced by
@@ -226,13 +229,13 @@ public void handle(long now) {
     }
 
     private synchronized void runLayoutIteration() {
-        for (int i = 0; i < 20; i++) {
+        for (int i = 0; i < AUTOMATIC_LAYOUT_ITERATIONS; i++) {
             resetForces();
             computeForces();
             updateForces();
         }
         applyForces();
-    }
+    }    
 
     /**
      * Runs the initial current vertex placement strategy.
@@ -661,13 +664,26 @@ private void removeNodes() {
         for (Edge<E, V> e : removedEdges) {
             SmartGraphEdgeBase edgeToRemove = edgeNodes.get(e);
             edgeNodes.remove(e);
-            removeEdge(edgeToRemove);
+            removeEdge(edgeToRemove);            
+
+            //when edges are removed, the adjacency between vertices changes
+            //the adjacency is kept in parallel in an internal data structure
+            Vertex<V>[] vertices = e.vertices();
+
+            if( getTotalEdgesBetween(vertices[0], vertices[1]) == 0 ) {
+                SmartGraphVertexNode<V> v0 = vertexNodes.get(vertices[0]);
+                SmartGraphVertexNode<V> v1 = vertexNodes.get(vertices[1]);
+
+                v0.removeAdjacentVertex(v1);
+                v1.removeAdjacentVertex(v0);
+            }            
         }
 
         //remove adjacencies from remaining vertices
         for (SmartGraphVertexNode<V> v : vertexNodes.values()) {
             v.removeAdjacentVertices(verticesToRemove);
         }
+
     }
 
     private void removeEdge(SmartGraphEdgeBase e) {