Merge pull request #16 from NHLStenden-ISAL/operator-overloading

Added comparison operator overloading for vec2 and segment: <, <=, >,…
NHLStenden-ISAL · Oct 30, 2023 · cc1ca8a · cc1ca8a
2 parents 4802941 + 6a0ccc6
commit cc1ca8a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/Trajectory_Hotspots/Trajectory_Hotspots/segment.cpp b/Trajectory_Hotspots/Trajectory_Hotspots/segment.cpp
@@ -287,7 +287,9 @@ bool Segment::operator==(const Segment& operand) const
     return (start == operand.start && end == operand.end) || (end == operand.start && start == operand.end);
 }
 
-bool Segment::operator!=(const Segment& operand) const
-{
-    return !(*this == operand);;
-}
+bool Segment::operator!=(const Segment& operand) const { return !(*this == operand); }
+
+bool Segment::operator<(const Segment& operand) const { return start < operand.start && end < operand.end; }
+bool Segment::operator<=(const Segment& operand) const { return start <= operand.start && end <= operand.end; }
+bool Segment::operator>(const Segment& operand) const { return start > operand.start && end > operand.end; }
+bool Segment::operator>=(const Segment& operand) const { return start >= operand.start && end >= operand.end; }
diff --git a/Trajectory_Hotspots/Trajectory_Hotspots/segment.h b/Trajectory_Hotspots/Trajectory_Hotspots/segment.h
@@ -37,6 +37,11 @@ class Segment
 
     bool operator==(const Segment& operand) const;
     bool operator!=(const Segment& operand) const;
+
+    bool operator<(const Segment& operand) const;
+    bool operator<=(const Segment& operand) const;
+    bool operator>(const Segment& operand) const;
+    bool operator>=(const Segment& operand) const;
 
     Float length() const;
     Float squared_length() const;

diff --git a/Trajectory_Hotspots/Trajectory_Hotspots/trapezoidal_map.cpp b/Trajectory_Hotspots/Trajectory_Hotspots/trapezoidal_map.cpp
@@ -829,7 +829,7 @@ void Trapezoidal_Map::add_overlapping_segment(const std::vector<Trapezoidal_Leaf
 //Returns the intersected trapezoids ordered from bottom to top
 std::vector<Trapezoidal_Leaf_Node*> Trapezoidal_Map::follow_segment(const Segment& query_segment)
 {
-    assert(query_segment.start.y < query_segment.end.y);
+    assert(query_segment.start.y <= query_segment.end.y);
 
     std::vector<Trapezoidal_Leaf_Node*> intersecting_trapezoids;
 

diff --git a/Trajectory_Hotspots/Trajectory_Hotspots/vec2.cpp b/Trajectory_Hotspots/Trajectory_Hotspots/vec2.cpp
@@ -51,5 +51,10 @@ Vec2 Vec2::operator/=(const Float& scalar) const { return Vec2(x / scalar, y / s
 bool Vec2::operator==(const Vec2& operand) const { return x == operand.x && y == operand.y; }
 bool Vec2::operator!=(const Vec2& operand) const { return !(*this == operand); }
 
+bool Vec2::operator<(const Vec2& operand) const { return x < operand.x && y < operand.y; }
+bool Vec2::operator<=(const Vec2& operand) const { return x <= operand.x && y <= operand.y; }
+bool Vec2::operator>(const Vec2& operand) const { return x > operand.x && y > operand.y; }
+bool Vec2::operator>=(const Vec2& operand) const { return x >= operand.x && y >= operand.y; }
+
 Vec2 operator*(const Float& scalar, const Vec2& vec) { return Vec2(vec.x * scalar, vec.y * scalar); }
 Vec2 operator/(const Float& scalar, const Vec2& vec) { return Vec2(vec.x / scalar, vec.y / scalar); }
diff --git a/Trajectory_Hotspots/Trajectory_Hotspots/vec2.h b/Trajectory_Hotspots/Trajectory_Hotspots/vec2.h
@@ -34,9 +34,14 @@ class Vec2
     Vec2 operator-=(const Vec2& other) const;
     Vec2 operator*=(const Float& scalar) const;
     Vec2 operator/=(const Float& scalar) const;
-
+    
     bool operator==(const Vec2& operand) const;
     bool operator!=(const Vec2& operand) const;
+
+    bool operator<(const Vec2& operand) const;
+    bool operator<=(const Vec2& operand) const;
+    bool operator>(const Vec2& operand) const;
+    bool operator>=(const Vec2& operand) const;
 
     Float x;
     Float y;