redundancy feature is now mostly ready #722

iVis-at-Bilkent · Jul 3, 2024 · f78289d · f78289d
1 parent e16731a
commit f78289d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/app/js/app-utilities.js b/app/js/app-utilities.js
@@ -3834,6 +3834,16 @@ appUtilities.removeDuplicateProcessesAfterQuery = function() {
   var cy = appUtilities.getActiveCy();
   var chiseInstance = appUtilities.getActiveChiseInstance();
 
+  var appendFullNodeInformation = function (node, neighborhoodDescriptorString) {
+    while(node.length != 0){
+      node.forEach( (node_) => {
+        neighborhoodDescriptorString += (node_.data("label") || node_.data("class"));
+      });
+      node = node.parent();
+    }
+    return neighborhoodDescriptorString;
+  }
+
   var processes = cy.filter('node[class="process"],[class="omitted process"],[class="uncertain process"],[class="association"],[class="dissociation"]');
   let processMap = new Map();
   var deletion = cy.collection();
@@ -3852,18 +3862,17 @@ appUtilities.removeDuplicateProcessesAfterQuery = function() {
     });
 
     collectionArray.forEach( (item) => {
-      neighborhoodDescriptorString += (item.filter("node").data("label") || item.filter("node").data("class"));
+      neighborhoodDescriptorString = appendFullNodeInformation(item.filter("node"), neighborhoodDescriptorString);
       neighborhoodDescriptorString += (item.filter("edge").data("label") || item.filter("edge").data("class"));
     })
-    neighborhoodDescriptorString += process.data("class");
+    neighborhoodDescriptorString = appendFullNodeInformation(process, neighborhoodDescriptorString);
     if(processMap.has(neighborhoodDescriptorString)){
       deletion.merge(process);
     }
     else{
       processMap.set(neighborhoodDescriptorString, true);
     }
   });
-
   chiseInstance.deleteElesSimple(deletion);
 }
 

diff --git a/app/js/backbone-views.js b/app/js/backbone-views.js
@@ -3049,6 +3049,9 @@ var PathsByURIQueryView = Backbone.View.extend({
         var removeDisconnected =  document.getElementById(
           "query-pathsbyURI-checkbox"
         ).checked;
+        var removeRedundant =  document.getElementById(
+          "query-pathsbyURI-redundant-checkbox"
+        ).checked;
 
         if (uri.length === 0) {
           document.getElementById("query-pathsbyURI-URI").focus();
@@ -3104,6 +3107,8 @@ var PathsByURIQueryView = Backbone.View.extend({
                   );
                   currentGeneralProperties.inferNestingOnLoad =
                     currentInferNestingOnLoad;
+                  if(removeRedundant)
+                    appUtilities.removeDuplicateProcessesAfterQuery();
                   if(removeDisconnected)
                     appUtilities.removeDisconnectedNodesAfterQuery([]);
                   $(document).trigger("sbgnvizLoadFileEnd", [filename, cy]);

diff --git a/index.html b/index.html
@@ -3585,7 +3585,7 @@ <h4 class="modal-title">Neighborhood Query</h4>
                 <td><input id="query-neighborhood-checkbox" type="checkbox" class="layout-text" checked></td>
               </tr>
               <tr>
-                <td class="caption-style-text" style="padding-left: 0;">Remove Redundant Nodes:</td>
+                <td class="caption-style-text" style="padding-left: 0;">Remove Redundant Processes:</td>
                 <td><input id="query-neighborhood-redundant-checkbox" type="checkbox" class="layout-text" checked></td>
               </tr>
             </tbody>
@@ -3651,7 +3651,7 @@ <h4 class="modal-title">Paths Between Query</h4>
                                   <td><input id="query-pathsbetween-checkbox" type="checkbox" class="layout-text" checked></td>
                                 </tr>
                                 <tr>
-                                  <td class="caption-style-text" style="padding-left: 0;">Remove Redundant Nodes:</td>
+                                  <td class="caption-style-text" style="padding-left: 0;">Remove Redundant Processes:</td>
                                   <td><input id="query-pathsbetween-redundant-checkbox" type="checkbox" class="layout-text" checked></td>
                                 </tr>
                               </tbody>
@@ -3731,7 +3731,7 @@ <h4 class="modal-title">Paths From To Query</h4>
                                     <td><input id="query-pathsfromto-checkbox" type="checkbox" class="layout-text" checked></td>
                                   </tr>
                                   <tr>
-                                    <td class="caption-style-text" style="padding-left: 0;">Remove Redundant Nodes:</td>
+                                    <td class="caption-style-text" style="padding-left: 0;">Remove Redundant Processes:</td>
                                     <td><input id="query-pathsfromto-redundant-checkbox" type="checkbox" class="layout-text" checked></td>
                                   </tr>
                                 </tbody>
@@ -3798,7 +3798,7 @@ <h4 class="modal-title">Common Stream Query</h4>
                                     <td><input id="query-commonstream-checkbox" type="checkbox" class="layout-text" checked></td>
                                   </tr>
                                   <tr>
-                                    <td class="caption-style-text" style="padding-left: 0;">Remove Redundant Nodes:</td>
+                                    <td class="caption-style-text" style="padding-left: 0;">Remove Redundant Processes:</td>
                                     <td><input id="query-commonstream-redundant-checkbox" type="checkbox" class="layout-text" checked></td>
                                   </tr>
                                 </tbody>
@@ -3841,7 +3841,9 @@ <h4 class="modal-title">Paths By URI</h4>
                         <td colspan=2>
                           <div style="display: flex; flex-direction: row; column-gap: 5px;">
                             <div class="caption-style-text">Remove Disconnected Nodes:</div>
-                            <input id="query-pathsbyURI-checkbox" type="checkbox" class="layout-text" style="margin: 0 0;" checked>
+                            <input id="query-pathsbyURI-checkbox" type="checkbox" class="layout-text" style="margin: 0 0; padding-left: 50px" checked>
+                            <div class="caption-style-text" style="padding-left: 65px">Remove Redundant Processes:</div>
+                            <input id="query-pathsbyURI-redundant-checkbox" type="checkbox" class="layout-text" style="margin: 0 0;" checked>
                           </div>
                         </td>
                       </tr>