Resolved Bug on collapseEdges function #31

iVis-at-Bilkent · Sep 28, 2023 · 74458c5 · 74458c5
1 parent 307a163
commit 74458c5
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 40 deletions.
diff --git a/dist/cytoscape-complexity-management.cjs.js b/dist/cytoscape-complexity-management.cjs.js
@@ -659,19 +659,33 @@ function complexityManagement(cy) {
     actOnInvisible([].concat(_toConsumableArray(returnedElements.edgeIDListToRemove), cleanup), cy);
   };
   api.collapseEdges = function (edges) {
-    var edgeIDList = [];
+    var groupedEdges = new Map();
+
+    // Iterate through the edges and group them by their end nodes (regardless of direction)
     edges.forEach(function (edge) {
-      edgeIDList.push(edge.id());
+      var edgeKey = [edge.source().id(), edge.target().id()].sort().join('-');
+      // If the edge key is not in the Map, create a new entry
+      if (!groupedEdges.has(edgeKey)) {
+        groupedEdges.set(edgeKey, [edge.id()]);
+      } else {
+        // If the edge key is already in the Map, append the edge to the existing list
+        groupedEdges.get(edgeKey).push(edge.id());
+      }
     });
-    if (edgeIDList.length > 1) {
-      var metaEdgeID = compMgrInstance.collapseEdges(edgeIDList);
 
-      // Remove required elements from cy instance
-      actOnInvisible(edgeIDList, cy);
+    // Convert the Map to an array of arrays
+    var ListOfEdgeIDList = Array.from(groupedEdges.values());
+    ListOfEdgeIDList.forEach(function (edgeIDList) {
+      if (edgeIDList.length > 1) {
+        var metaEdgeID = compMgrInstance.collapseEdges(edgeIDList);
 
-      // Add required meta edges to cy instance
-      actOnVisibleForMetaEdge(metaEdgeID, cy);
-    }
+        // Remove required elements from cy instance
+        actOnInvisible(edgeIDList, cy);
+
+        // Add required meta edges to cy instance
+        actOnVisibleForMetaEdge(metaEdgeID, cy);
+      }
+    });
   };
   api.collapseEdgesBetweenNodes = function (nodes) {
     var nodeIDList = [];

diff --git a/dist/cytoscape-complexity-management.esm.js b/dist/cytoscape-complexity-management.esm.js
@@ -657,19 +657,33 @@ function complexityManagement(cy) {
     actOnInvisible([].concat(_toConsumableArray(returnedElements.edgeIDListToRemove), cleanup), cy);
   };
   api.collapseEdges = function (edges) {
-    var edgeIDList = [];
+    var groupedEdges = new Map();
+
+    // Iterate through the edges and group them by their end nodes (regardless of direction)
     edges.forEach(function (edge) {
-      edgeIDList.push(edge.id());
+      var edgeKey = [edge.source().id(), edge.target().id()].sort().join('-');
+      // If the edge key is not in the Map, create a new entry
+      if (!groupedEdges.has(edgeKey)) {
+        groupedEdges.set(edgeKey, [edge.id()]);
+      } else {
+        // If the edge key is already in the Map, append the edge to the existing list
+        groupedEdges.get(edgeKey).push(edge.id());
+      }
     });
-    if (edgeIDList.length > 1) {
-      var metaEdgeID = compMgrInstance.collapseEdges(edgeIDList);
 
-      // Remove required elements from cy instance
-      actOnInvisible(edgeIDList, cy);
+    // Convert the Map to an array of arrays
+    var ListOfEdgeIDList = Array.from(groupedEdges.values());
+    ListOfEdgeIDList.forEach(function (edgeIDList) {
+      if (edgeIDList.length > 1) {
+        var metaEdgeID = compMgrInstance.collapseEdges(edgeIDList);
 
-      // Add required meta edges to cy instance
-      actOnVisibleForMetaEdge(metaEdgeID, cy);
-    }
+        // Remove required elements from cy instance
+        actOnInvisible(edgeIDList, cy);
+
+        // Add required meta edges to cy instance
+        actOnVisibleForMetaEdge(metaEdgeID, cy);
+      }
+    });
   };
   api.collapseEdgesBetweenNodes = function (nodes) {
     var nodeIDList = [];

diff --git a/dist/cytoscape-complexity-management.umd.js b/dist/cytoscape-complexity-management.umd.js
@@ -5021,19 +5021,33 @@
       actOnInvisible([].concat(_toConsumableArray(returnedElements.edgeIDListToRemove), cleanup), cy);
     };
     api.collapseEdges = function (edges) {
-      var edgeIDList = [];
+      var groupedEdges = new Map();
+
+      // Iterate through the edges and group them by their end nodes (regardless of direction)
       edges.forEach(function (edge) {
-        edgeIDList.push(edge.id());
+        var edgeKey = [edge.source().id(), edge.target().id()].sort().join('-');
+        // If the edge key is not in the Map, create a new entry
+        if (!groupedEdges.has(edgeKey)) {
+          groupedEdges.set(edgeKey, [edge.id()]);
+        } else {
+          // If the edge key is already in the Map, append the edge to the existing list
+          groupedEdges.get(edgeKey).push(edge.id());
+        }
       });
-      if (edgeIDList.length > 1) {
-        var metaEdgeID = compMgrInstance.collapseEdges(edgeIDList);
 
-        // Remove required elements from cy instance
-        actOnInvisible(edgeIDList, cy);
+      // Convert the Map to an array of arrays
+      var ListOfEdgeIDList = Array.from(groupedEdges.values());
+      ListOfEdgeIDList.forEach(function (edgeIDList) {
+        if (edgeIDList.length > 1) {
+          var metaEdgeID = compMgrInstance.collapseEdges(edgeIDList);
 
-        // Add required meta edges to cy instance
-        actOnVisibleForMetaEdge(metaEdgeID, cy);
-      }
+          // Remove required elements from cy instance
+          actOnInvisible(edgeIDList, cy);
+
+          // Add required meta edges to cy instance
+          actOnVisibleForMetaEdge(metaEdgeID, cy);
+        }
+      });
     };
     api.collapseEdgesBetweenNodes = function (nodes) {
       var nodeIDList = [];

diff --git a/src/complexity-management.js b/src/complexity-management.js
@@ -658,20 +658,35 @@ export function complexityManagement(cy) {
   };
 
   api.collapseEdges = (edges) => {
-    let edgeIDList = [];
-
-    edges.forEach((edge) => {
-      edgeIDList.push(edge.id());
-    });
-    if (edgeIDList.length > 1) {
-      let metaEdgeID = compMgrInstance.collapseEdges(edgeIDList);
-
-      // Remove required elements from cy instance
-      actOnInvisible(edgeIDList, cy);
+    const groupedEdges = new Map();
+
+      // Iterate through the edges and group them by their end nodes (regardless of direction)
+      edges.forEach(edge => {
+        const edgeKey = [edge.source().id(), edge.target().id()].sort().join('-');
+        // If the edge key is not in the Map, create a new entry
+        if (!groupedEdges.has(edgeKey)) {
+          groupedEdges.set(edgeKey, [edge.id()]);
+        } else {
+          // If the edge key is already in the Map, append the edge to the existing list
+          groupedEdges.get(edgeKey).push(edge.id());
+        }
+      });
 
-      // Add required meta edges to cy instance
-      actOnVisibleForMetaEdge(metaEdgeID, cy);
-    }
+      // Convert the Map to an array of arrays
+      const ListOfEdgeIDList = Array.from(groupedEdges.values());
+
+      ListOfEdgeIDList.forEach(edgeIDList => {
+        if (edgeIDList.length > 1) {
+          let metaEdgeID = compMgrInstance.collapseEdges(edgeIDList);
+
+          // Remove required elements from cy instance
+          actOnInvisible(edgeIDList, cy);
+
+          // Add required meta edges to cy instance
+          actOnVisibleForMetaEdge(metaEdgeID, cy);
+        }
+      })
+
   };
 
   api.collapseEdgesBetweenNodes = (nodes) => {