packing check more than one level neighbors after first component pla…

…cing
iVis-at-Bilkent · Sep 2, 2019 · 43916e1 · 43916e1
1 parent d063ac4
commit 43916e1
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 6 deletions.
diff --git a/cytoscape-layout-utilities.js b/cytoscape-layout-utilities.js
@@ -213,7 +213,7 @@ var Grid = function () {
 
     _createClass(Grid, [{
         key: 'getDirectNeighbors',
-        value: function getDirectNeighbors(cells) {
+        value: function getDirectNeighbors(cells, level) {
             var resultPoints = [];
             if (cells.length == 0) {
                 for (var i = 0; i < this.width; i++) {
@@ -223,6 +223,20 @@ var Grid = function () {
                         }
                     }
                 }
+                var startIndex = 0;
+                var endIndex = resultPoints.length - 1;
+
+                for (var i = 2; i <= level; i++) {
+
+                    if (endIndex >= startIndex) {
+                        for (var j = startIndex; j <= endIndex; j++) {
+                            resultPoints = resultPoints.concat(this.getCellNeighbors(resultPoints[j].x, resultPoints[j].y));
+                        }
+                    }
+
+                    startIndex = endIndex + 1;
+                    endIndex = resultPoints.length - 1;
+                }
             } else {
                 cells.forEach(function (cell) {
                     resultPoints = resultPoints.concat(this.getCellNeighbors(cell.x, cell.y));
@@ -873,7 +887,12 @@ var layoutUtilities = function layoutUtilities(cy, options) {
       var cells = [];
       var resultLocation = {};
       while (!placementFound) {
-        cells = mainGrid.getDirectNeighbors(cells);
+        if (i == 1) {
+          cells = mainGrid.getDirectNeighbors(cells, Math.ceil(Math.max(polyominos[i].width, polyominos[i].height) / 2));
+        } else {
+          cells = mainGrid.getDirectNeighbors(cells, 1);
+        }
+
         cells.forEach(function (cell) {
           if (mainGrid.tryPlacingPolyomino(polyominos[i], cell.x, cell.y)) {
             placementFound = true;
@@ -971,7 +990,8 @@ var __WEBPACK_AMD_DEFINE_RESULT__;
       offset: 20,
       desiredAspectRatio: 1,
       polyominoGridSizeFactor: 1,
-      utilityFunction: 1 // Maximize adjusted Fullness   2: maximizes weighted function of fullness and aspect ratio
+      utilityFunction: 1, // Maximize adjusted Fullness   2: maximizes weighted function of fullness and aspect ratio
+      componentSpacing: 0
     };
 
     var layoutUtilities = __webpack_require__(2);

diff --git a/src/core/index.js b/src/core/index.js
@@ -14,10 +14,39 @@
       offset: 20,
       desiredAspectRatio: 1,
       polyominoGridSizeFactor: 1,
-      utilityFunction: 1  // Maximize adjusted Fullness   2: maximizes weighted function of fullness and aspect ratio
+      utilityFunction: 1,  // Maximize adjusted Fullness   2: maximizes weighted function of fullness and aspect ratio
+      componentSpacing : 0
     };
 
 
+   /*  function extend(defaults, options) {
+      var obj = {};
+
+      for (var i in defaults) {
+        obj[i] = defaults[i];
+      }
+
+      for (var i in options) {
+        if(i == "desiredAspectRatio"){
+          var value = options[i];
+           if(!isNaN(value))
+           {
+              if(value >= 0 && value <= 20){
+                obj[i] = options[i];
+              }else if(value < 0){
+                obj[i] = 0
+              }else{
+                obj[i] = 20
+              }
+           }
+        }else{
+          obj[i] = options[i];
+        }
+
+      }
+
+      return obj;
+     }; */
     var layoutUtilities = require("./layout-utilities");
 
     cytoscape('core', 'layoutUtilities', function (opts) {
@@ -28,6 +57,7 @@
         return getScratch(cy).instance;
       }
 
+
       $.extend(true, options, opts);
 
       function getScratch(eleOrCy) {

diff --git a/src/core/layout-utilities.js b/src/core/layout-utilities.js
@@ -492,7 +492,8 @@ var layoutUtilities = function (cy, options) {
       var cells = [];
       var resultLocation = {};
       while(!placementFound){
-        cells = mainGrid.getDirectNeighbors(cells);
+
+        cells = mainGrid.getDirectNeighbors(cells, Math.ceil(Math.max(polyominos[i].width,polyominos[i].height) / 2));
         cells.forEach(function(cell){
             if(mainGrid.tryPlacingPolyomino(polyominos[i], cell.x, cell.y)){
               placementFound = true;

diff --git a/src/core/polyomino-packing.js b/src/core/polyomino-packing.js
@@ -61,7 +61,7 @@ class Grid{
     }
 
     //function given a list of cells it returns the direct unvisited unoccupied neighboring cells 
-    getDirectNeighbors(cells){
+    getDirectNeighbors(cells, level){
         var resultPoints = [];
         if(cells.length == 0){
             for(var i = 0 ; i< this.width;i++){
@@ -71,6 +71,22 @@ class Grid{
                     }
                 }
             }
+            var startIndex = 0 ;
+            var endIndex = resultPoints.length -1 ;
+
+            for(var i = 2 ; i<=level ; i++){
+
+                if(endIndex >= startIndex){
+                    for(var j = startIndex ; j<= endIndex ; j++){
+                        resultPoints = resultPoints.concat(this.getCellNeighbors(resultPoints[j].x,resultPoints[j].y));
+                    }
+                }             
+
+                startIndex = endIndex +1;
+                endIndex = resultPoints.length - 1;
+
+            }
+
         }else{
             cells.forEach(function(cell){
                     resultPoints = resultPoints.concat(this.getCellNeighbors(cell.x,cell.y));