fix: finds the lowest intersecting interval #47

alexbol99 · Sep 17, 2023 · 0b3e296 · 0b3e296
1 parent 45bcbbf
commit 0b3e296
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/dist/main.cjs.js b/dist/main.cjs.js
@@ -403,7 +403,7 @@ class IntervalTree {
     }
 
     /**
-     * @param {Interval} interval - optional if the iterator is intended to start from the beginning or end
+     * @param {Interval} interval - optional if the iterator is intended to start from the beginning
      * @param outputMapperFn(value,key) - optional function that maps (value, key) to custom output
      * @returns {Iterator}
      */
@@ -657,8 +657,12 @@ class IntervalTree {
         let curr = node;
         while (curr && curr != this.nil_node) {
             if (curr.less_than(search_node)) {
-                if (curr.intersect(search_node) && (!best || curr.less_than(best))) best = curr;
-                curr = curr.right;
+                if (curr.intersect(search_node)) {
+                    best = curr;
+                    curr = curr.left;
+                } else {
+                    curr = curr.right;
+                }
             } else {
                 if (!best || curr.less_than(best)) best = curr;
                 curr = curr.left;

diff --git a/dist/main.esm.js b/dist/main.esm.js
@@ -399,7 +399,7 @@ class IntervalTree {
     }
 
     /**
-     * @param {Interval} interval - optional if the iterator is intended to start from the beginning or end
+     * @param {Interval} interval - optional if the iterator is intended to start from the beginning
      * @param outputMapperFn(value,key) - optional function that maps (value, key) to custom output
      * @returns {Iterator}
      */
@@ -653,8 +653,12 @@ class IntervalTree {
         let curr = node;
         while (curr && curr != this.nil_node) {
             if (curr.less_than(search_node)) {
-                if (curr.intersect(search_node) && (!best || curr.less_than(best))) best = curr;
-                curr = curr.right;
+                if (curr.intersect(search_node)) {
+                    best = curr;
+                    curr = curr.left;
+                } else {
+                    curr = curr.right;
+                }
             } else {
                 if (!best || curr.less_than(best)) best = curr;
                 curr = curr.left;

diff --git a/dist/main.umd.js b/dist/main.umd.js
@@ -405,7 +405,7 @@
         }
 
         /**
-         * @param {Interval} interval - optional if the iterator is intended to start from the beginning or end
+         * @param {Interval} interval - optional if the iterator is intended to start from the beginning
          * @param outputMapperFn(value,key) - optional function that maps (value, key) to custom output
          * @returns {Iterator}
          */
@@ -659,8 +659,12 @@
             let curr = node;
             while (curr && curr != this.nil_node) {
                 if (curr.less_than(search_node)) {
-                    if (curr.intersect(search_node) && (!best || curr.less_than(best))) best = curr;
-                    curr = curr.right;
+                    if (curr.intersect(search_node)) {
+                        best = curr;
+                        curr = curr.left;
+                    } else {
+                        curr = curr.right;
+                    }
                 } else {
                     if (!best || curr.less_than(best)) best = curr;
                     curr = curr.left;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@flatten-js/interval-tree",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Interval search tree",
   "author": "Alex Bol",
   "license": "MIT",