Merge pull request #4 from iVis-at-Bilkent/unstable

Merge unstable to master
iVis-at-Bilkent · May 19, 2020 · 9fc90db · 9fc90db
2 parents 24736f8 + 23e7615
commit 9fc90db
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 12 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 
+Copyright (c) 2019 - present, iVis@Bilkent.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/cose-base.js b/cose-base.js
@@ -104,6 +104,7 @@ CoSEConstants.DEFAULT_COMPONENT_SEPERATION = 60;
 CoSEConstants.TILE = true;
 CoSEConstants.TILING_PADDING_VERTICAL = 10;
 CoSEConstants.TILING_PADDING_HORIZONTAL = 10;
+CoSEConstants.TREE_REDUCTION_ON_INCREMENTAL = false; // make this true when cose is used incrementally as a part of other non-incremental layout
 
 module.exports = CoSEConstants;
 
@@ -395,6 +396,18 @@ CoSELayout.prototype.classicLayout = function () {
 
         this.positionNodesRandomly();
       }
+  } else {
+    if (CoSEConstants.TREE_REDUCTION_ON_INCREMENTAL) {
+      // Reduce the trees in incremental mode if only this constant is set to true 
+      this.reduceTrees();
+      // Update nodes that gravity will be applied
+      this.graphManager.resetAllNodesToApplyGravitation();
+      var allNodes = new Set(this.getAllNodes());
+      var intersection = this.nodesWithGravity.filter(function (x) {
+        return allNodes.has(x);
+      });
+      this.graphManager.setAllNodesToApplyGravitation(intersection);
+    }
   }
 
   this.initSpringEmbedder();

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/CoSEConstants.js b/src/CoSEConstants.js
@@ -14,5 +14,6 @@ CoSEConstants.DEFAULT_COMPONENT_SEPERATION = 60;
 CoSEConstants.TILE = true;
 CoSEConstants.TILING_PADDING_VERTICAL = 10;
 CoSEConstants.TILING_PADDING_HORIZONTAL = 10;
+CoSEConstants.TREE_REDUCTION_ON_INCREMENTAL = false;  // make this true when cose is used incrementally as a part of other non-incremental layout
 
 module.exports = CoSEConstants;
diff --git a/src/CoSELayout.js b/src/CoSELayout.js
@@ -130,6 +130,17 @@ CoSELayout.prototype.classicLayout = function () {
       this.positionNodesRandomly();
     }
   }
+  else {
+    if(CoSEConstants.TREE_REDUCTION_ON_INCREMENTAL){
+      // Reduce the trees in incremental mode if only this constant is set to true 
+      this.reduceTrees();
+      // Update nodes that gravity will be applied
+      this.graphManager.resetAllNodesToApplyGravitation();
+      var allNodes = new Set(this.getAllNodes());
+      var intersection = this.nodesWithGravity.filter(x => allNodes.has(x));
+      this.graphManager.setAllNodesToApplyGravitation(intersection);        
+    }
+  }
 
   this.initSpringEmbedder();
   this.runSpringEmbedder();