feat(grid-iterators): make row args optional

thi-ng · Oct 25, 2019 · 60dccfc · 60dccfc
1 parent 4eb9c7e
commit 60dccfc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/packages/grid-iterators/src/columns2d.ts b/packages/grid-iterators/src/columns2d.ts
@@ -9,7 +9,7 @@
  * @param rows
  *
  */
-export function* zigzagColumns2d(cols: number, rows: number) {
+export function* zigzagColumns2d(cols: number, rows = cols) {
     const num = cols * rows;
     for (let i = 0; i < num; i++) {
         const x = (i / rows) | 0;

diff --git a/packages/grid-iterators/src/diagonal2d.ts b/packages/grid-iterators/src/diagonal2d.ts
@@ -12,16 +12,18 @@ export function* diagonal2d(cols: number, rows: number) {
     const num = cols * rows - 1;
     for (let x = 0, y = 0, nx = 1, ny = 0, i = 0; i <= num; i++) {
         yield [x, y];
-        do {
-            if (y === ny) {
-                y = 0;
-                x = nx;
-                ny++;
-                nx++;
-            } else {
-                x--;
-                y++;
-            }
-        } while ((y >= rows || x >= cols) && i != num);
+        if (i != num) {
+            do {
+                if (y === ny) {
+                    y = 0;
+                    x = nx;
+                    ny++;
+                    nx++;
+                } else {
+                    x--;
+                    y++;
+                }
+            } while (y >= rows || x >= cols);
+        }
     }
 }
diff --git a/packages/grid-iterators/src/hilbert2d.ts b/packages/grid-iterators/src/hilbert2d.ts
@@ -8,7 +8,7 @@
  * @param cols
  * @param rows
  */
-export function* hilbert2d(cols: number, rows: number) {
+export function* hilbert2d(cols: number, rows = cols) {
     let hIndex = 0; // hilbert curve index
     let hOrder = 0; // hilbert curve order
     // fit to number of buckets

diff --git a/packages/grid-iterators/src/rows2d.ts b/packages/grid-iterators/src/rows2d.ts
@@ -9,7 +9,7 @@
  * @param rows
  *
  */
-export function* zigzagRows2d(cols: number, rows: number) {
+export function* zigzagRows2d(cols: number, rows = cols) {
     const num = cols * rows;
     for (let i = 0; i < num; i++) {
         let x = i % cols;

diff --git a/packages/grid-iterators/src/spiral2d.ts b/packages/grid-iterators/src/spiral2d.ts
@@ -8,7 +8,7 @@
  * @param cols
  * @param rows
  */
-export function* spiral2d(cols: number, rows: number) {
+export function* spiral2d(cols: number, rows = cols) {
     const num = cols * rows;
     const center = (Math.min(cols, rows) - 1) >> 1;
     for (let i = 0; i < num; i++) {