Merge pull request #54 from kaitinghh/branch-ORS

Orthogonal Range Searching
4ndrelim · Mar 29, 2024 · f5bc79f · f5bc79f
2 parents 85ff02c + 05cacf2
commit f5bc79f
Show file tree

Hide file tree

Showing 15 changed files with 1,047 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ Gradle is used for development.
     * [Trie](src/main/java/dataStructures/trie)
     * [B-Tree](src/main/java/dataStructures/bTree)
     * Red-Black Tree (Not covered in CS2040s but useful!)
-    * Orthogonal Range Searching (**WIP**)
+    * [Orthogonal Range Searching](src/main/java/algorithms/orthogonalRangeSearching)
     * Interval Trees (**WIP**)
 5. [Binary Heap](src/main/java/dataStructures/heap) (Max heap)
 6. [Disjoint Set / Union Find](src/main/java/dataStructures/disjointSet)

diff --git a/docs/assets/images/1DORS.jpg b/docs/assets/images/1DORS.jpg
diff --git a/docs/assets/images/1DORSDynamicUpdates.jpg b/docs/assets/images/1DORSDynamicUpdates.jpg
diff --git a/docs/assets/images/1DORSQuery.jpeg b/docs/assets/images/1DORSQuery.jpeg
diff --git a/docs/assets/images/2DORS.jpg b/docs/assets/images/2DORS.jpg
diff --git a/docs/assets/images/2DORSQuery.jpg b/docs/assets/images/2DORSQuery.jpg
diff --git a/docs/assets/images/2DORSTrees.jpg b/docs/assets/images/2DORSTrees.jpg
diff --git a/docs/team/profiles.md b/docs/team/profiles.md
@@ -3,7 +3,7 @@
 | Name      | Description/About                                                 | Website (LinkedIn/GitHub/Personal)                                                                   | Contributions                                               |
 |-----------|-------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|-------------------------------------------------------------|
 | Andre     | Aspiring ML engineer. Developing this with wonderful ex-students. | You can find me [here](https://4ndrelim.github.io)!                                                  | Team lead                                                   |
-| Kai ting  | Likes algorithms and a committed TA!                              | [Hi](https://www.linkedin.com/in/kai-ting-ho-425181268/)                                             | Cool sorting and obscure trees! B-Trees, ORS..              |
+| Kai Ting  | Likes algorithms and a committed TA!                              | [Linkedin](https://www.linkedin.com/in/kai-ting-ho-425181268/)                                       | Cool sorting and obscure trees! B-Trees, ORS..              |
 | Changxian | DevOps is right up his alley!                                     | ...                                                                                                  | Hashing variants! BTS DevOps - configure Gradle & workflows |
 | Shu Heng  | Interested in ML, aspiring researcher.                            | No website but here's my [Linkedin](https://www.linkedin.com/in/yeoshuheng), please give me a job :< | CS Fundamentals! Stacks and queues! RB-tree.                |
 | Junneng   | Aspiring tech entrepreneur.                                       | [LinkedIn](https://www.linkedin.com/in/soo-jun-neng/)                                                | Binary Search variants, Minimum Spanning Trees!             |

diff --git a/src/main/java/algorithms/orthogonalRangeSearching/RangeTreeNode.java b/src/main/java/algorithms/orthogonalRangeSearching/RangeTreeNode.java
@@ -0,0 +1,96 @@
+package algorithms.orthogonalRangeSearching;
+
+/**
+ * This class is the node class for building a range tree.
+ * @param <T> Generic type of the node class
+ */
+public class RangeTreeNode<T> {
+    private T val;
+    private int height;
+    private RangeTreeNode<T> left = null;
+    private RangeTreeNode<T> right = null;
+    private RangeTreeNode<T> parent = null;
+    private RangeTreeNode<T> yTree = null;
+
+    public RangeTreeNode(T val) {
+        this.val = val;
+    }
+
+    /**
+     * Constructor for range tree node
+     * @param val value of node
+     * @param left left child of node
+     * @param right right child of node
+     */
+    public RangeTreeNode(T val, RangeTreeNode<T> left, RangeTreeNode<T> right) {
+        this.val = val;
+        this.left = left;
+        this.right = right;
+    }
+
+    public T getVal() {
+        return this.val;
+    }
+
+    public int getHeight() {
+        return this.height;
+    }
+
+    public RangeTreeNode<T> getLeft() {
+        return this.left;
+    }
+
+    public RangeTreeNode<T> getRight() {
+        return this.right;
+    }
+
+    public RangeTreeNode<T> getParent() {
+        return this.parent;
+    }
+
+    public RangeTreeNode<T> getYTree() {
+        return this.yTree;
+    }
+
+    public void setVal(T val) {
+        this.val = val;
+    }
+
+    public void setLeft(RangeTreeNode<T> left) {
+        this.left = left;
+    }
+
+    public void setRight(RangeTreeNode<T> right) {
+        this.right = right;
+    }
+
+    public void setParent(RangeTreeNode<T> parent) {
+        this.parent = parent;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public void setYTree(RangeTreeNode<T> yTree) {
+        this.yTree = yTree;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if (!(other instanceof RangeTreeNode)) {
+            return false;
+        }
+        RangeTreeNode<T> node = (RangeTreeNode<T>) other;
+        return this.val == node.val;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(this.val);
+    }
+
+}