remove static comparable less than

Author: dan-on

src/Interval.php

@@ -82,9 +82,4 @@ public function getMax(): Interval
     {
         return $this;
     }
-
-    public static function comparableLessThan(int $val1, int $val2): bool
-    {
-        return $val1 < $val2;
-    }
 }

src/IntervalTree.php

@@ -34,7 +34,7 @@ public function getSize(): int
     /**
      * Returns true if tree is empty
      *
-     * @return boolean
+     * @return bool
      */
     public function isEmpty(): bool
     {
@@ -58,7 +58,7 @@ public function iterateIntersections(Interval $interval): Iterator
      * Check that interval has intersections
      *
      * @param Interval $interval
-     * @return boolean
+     * @return bool
      */
     public function hasIntersection(Interval $interval): bool
     {
@@ -366,7 +366,7 @@ private function localMinimum(Node $node): Node
         return $nodeMin;
     }
 
-    public function treeSuccessor(Node $node): ?Node
+    private function treeSuccessor(Node $node): ?Node
     {
         if ($node->getRight() !== $this->nilNode) {
             $nodeSuccessor = $this->localMinimum($node->getRight());

src/Node.php

@@ -22,14 +22,16 @@ class Node
     /**
      * @var NodeColor
      */
-    public $color;
+    private $color;
 
     /**
      * @var Pair
      */
     private $pair;
 
-    /** @var null|Interval */
+    /**
+     * @var null|Interval
+     */
     private $max;
 
     private function __construct()
@@ -47,7 +49,7 @@ public static function withPair(Pair $pair): self
 
     public static function nil(): self
     {
-        $self = new self;
+        $self = new self();
         $self->color = NodeColor::black();
         return $self;
     }
@@ -136,16 +138,15 @@ public function updateMax(): void
     // Other_node does not intersect any node of left subtree, if this.left.max < other_node.item.key.low
     public function notIntersectLeftSubtree(Node $searchNode): bool
     {
-        //const comparable_less_than = this.item.key.constructor.comparable_less_than;  // static method
-        $high = $this->left->max->getHigh() ?? $this->left->max;
-        return Interval::comparableLessThan($high, $searchNode->getPair()->getInterval()->getLow());
+        $high = $this->getLeft()->max->getHigh() ?? $this->getLeft()->getPair()->getInterval()->getHigh();
+        return $high < $searchNode->getPair()->getInterval()->getLow();
     }
 
     // Other_node does not intersect right subtree if other_node.item.key.high < this.right.key.low
     public function notIntersectRightSubtree(Node $searchNode): bool
     {
         //const comparable_less_than = this.item.key.constructor.comparable_less_than;  // static method
-        $low = $this->right->max->getLow() ?? $this->right->getPair()->getInterval()->getLow();
-        return Interval::comparableLessThan($searchNode->getPair()->getInterval()->getHigh(), $low);
+        $low = $this->right->max->getLow() ?? $this->getRight()->getPair()->getInterval()->getLow();
+        return $searchNode->getPair()->getInterval()->getHigh() < $low;
     }
 }