TreeSet adding higher and lower methods

Author: larrydiamond

definitions/spec/TestTreeSet.spec.d.ts

@@ -1,6 +1,6 @@
 /**
 * @license
-* Copyright Larry Diamond 2017 All Rights Reserved.
+* Copyright Larry Diamond 2019 All Rights Reserved.
 *
 * Use of this source code is governed by an MIT-style license that can be
 * found in the LICENSE file at https://github.com/larrydiamond/typescriptcollectionsframework/LICENSE

definitions/src/TreeSet.d.ts

@@ -1,6 +1,6 @@
 /**
 * @license
-* Copyright Larry Diamond 2018 All Rights Reserved.
+* Copyright Larry Diamond 2019 All Rights Reserved.
 *
 * Use of this source code is governed by an MIT-style license that can be
 * found in the LICENSE file at https://github.com/larrydiamond/typescriptcollectionsframework/blob/master/LICENSE
@@ -61,13 +61,25 @@ export declare class TreeSet<K> implements NavigableSet<K> {
      * @return {K} the greatest element less than or equal to e, or null if there is no such element
      */
     floor(item: K): K;
+    /**
+    * Returns the highest key lower than the given key, or null if there is no such key.
+    * @param {K} key the key
+    * @return {K} the highest key lower than key, or null if there is no such key
+    */
+    lower(item: K): K;
     /**
      * Returns the least element in this set greater than or equal to the given element, or null if there is no such element.
      * @param {K} item to find ceiling node for
      * @return {K} the least element greater than or equal to item, or null if there is no such element
      */
     ceiling(item: K): K;
     /**
+    * Returns the least key greater than the given key, or null if there is no such key.
+    * @param {K} key the key
+    * @return {K} the least key greater than key, or null if there is no such key
+    */
+    higher(item: K): K;
+    /**
     * Returns the first (lowest) element currently in this set.
     * @return {K} the first (lowest) element currently in this set, null if there are no elements in this set
     */

dist/spec/TestTreeSet.spec.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
 * @license
-* Copyright Larry Diamond 2017 All Rights Reserved.
+* Copyright Larry Diamond 2019 All Rights Reserved.
 *
 * Use of this source code is governed by an MIT-style license that can be
 * found in the LICENSE file at https://github.com/larrydiamond/typescriptcollectionsframework/LICENSE
@@ -313,6 +313,46 @@ describe("Test TreeSet functionality", function () {
         expect(TreeSet2.ceiling(16)).toEqual(17); // 16 isnt there, 17 is
         expect(TreeSet2.ceiling(17)).toEqual(17); // 17 is there
     });
+    it("Test higher", function () {
+        var TreeSet2 = new TreeSet_1.TreeSet(Collections_1.Collections.getNumberComparator());
+        expect(TreeSet2.add(44)).toEqual(true);
+        expect(TreeSet2.add(5)).toEqual(true);
+        expect(TreeSet2.add(20)).toEqual(true);
+        expect(TreeSet2.add(88)).toEqual(true);
+        expect(TreeSet2.add(50)).toEqual(true);
+        expect(TreeSet2.add(30)).toEqual(true);
+        expect(TreeSet2.add(1)).toEqual(true);
+        expect(TreeSet2.add(48)).toEqual(true);
+        expect(TreeSet2.add(62)).toEqual(true);
+        expect(TreeSet2.add(78)).toEqual(true);
+        expect(TreeSet2.add(17)).toEqual(true);
+        expect(TreeSet2.add(70)).toEqual(true);
+        expect(TreeSet2.add(80)).toEqual(true);
+        expect(TreeSet2.add(32)).toEqual(true);
+        expect(TreeSet2.higher(16)).toEqual(17); // 16 isnt there, 17 is
+        expect(TreeSet2.higher(16)).toEqual(17); // 16 isnt there, 17 is
+        expect(TreeSet2.higher(17)).toEqual(20); // 17 is there, 20 is next
+    });
+    it("Test lower", function () {
+        var TreeSet2 = new TreeSet_1.TreeSet(Collections_1.Collections.getNumberComparator());
+        expect(TreeSet2.add(44)).toEqual(true);
+        expect(TreeSet2.add(5)).toEqual(true);
+        expect(TreeSet2.add(20)).toEqual(true);
+        expect(TreeSet2.add(88)).toEqual(true);
+        expect(TreeSet2.add(50)).toEqual(true);
+        expect(TreeSet2.add(30)).toEqual(true);
+        expect(TreeSet2.add(1)).toEqual(true);
+        expect(TreeSet2.add(48)).toEqual(true);
+        expect(TreeSet2.add(62)).toEqual(true);
+        expect(TreeSet2.add(78)).toEqual(true);
+        expect(TreeSet2.add(17)).toEqual(true);
+        expect(TreeSet2.add(70)).toEqual(true);
+        expect(TreeSet2.add(80)).toEqual(true);
+        expect(TreeSet2.add(32)).toEqual(true);
+        expect(TreeSet2.lower(38)).toEqual(32); // 38 isnt there, 32 is next
+        expect(TreeSet2.lower(31)).toEqual(30); // 31 isnt there, 30 is next
+        expect(TreeSet2.lower(17)).toEqual(5); // 17 is there, 16 is next
+    });
     it("Test lots", function () {
         var tset = new TreeSet_1.TreeSet(Collections_1.Collections.getStringComparator());
         for (var loop1 = 1; loop1 <= 26; loop1++) {

dist/src/TreeSet.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
 * @license
-* Copyright Larry Diamond 2018 All Rights Reserved.
+* Copyright Larry Diamond 2019 All Rights Reserved.
 *
 * Use of this source code is governed by an MIT-style license that can be
 * found in the LICENSE file at https://github.com/larrydiamond/typescriptcollectionsframework/blob/master/LICENSE
@@ -99,6 +99,17 @@ var TreeSet = /** @class */ (function () {
             return null;
         return tmp;
     };
+    /**
+    * Returns the highest key lower than the given key, or null if there is no such key.
+    * @param {K} key the key
+    * @return {K} the highest key lower than key, or null if there is no such key
+    */
+    TreeSet.prototype.lower = function (item) {
+        var tmp = this.datastore.lowerKey(item);
+        if (tmp === undefined)
+            return null;
+        return tmp;
+    };
     /**
      * Returns the least element in this set greater than or equal to the given element, or null if there is no such element.
      * @param {K} item to find ceiling node for
@@ -111,6 +122,17 @@ var TreeSet = /** @class */ (function () {
         return tmp;
     };
     /**
+    * Returns the least key greater than the given key, or null if there is no such key.
+    * @param {K} key the key
+    * @return {K} the least key greater than key, or null if there is no such key
+    */
+    TreeSet.prototype.higher = function (item) {
+        var tmp = this.datastore.higherKey(item);
+        if (tmp === undefined)
+            return null;
+        return tmp;
+    };
+    /**
     * Returns the first (lowest) element currently in this set.
     * @return {K} the first (lowest) element currently in this set, null if there are no elements in this set
     */