Merge pull request #1106 from Geode-solutions/fix/vertex-cycle-containers

fix(VertexCycle): allow comparison of different containers

Author: MelchiorSchuh

include/geode/mesh/core/detail/vertex_cycle.hpp

@@ -96,8 +96,9 @@ namespace geode
                 return vertices_;
             }
 
+            template < typename OtherContainer >
             [[nodiscard]] bool is_opposite(
-                const OrientedVertexCycle& other ) const
+                const OrientedVertexCycle< OtherContainer >& other ) const
             {
                 const auto& other_vertices = other.vertices();
                 if( vertices().size() != other_vertices.size()
@@ -117,20 +118,23 @@ namespace geode
                 return true;
             }
 
+            template < typename OtherContainer >
             [[nodiscard]] bool operator==(
-                const OrientedVertexCycle& other ) const
+                const OrientedVertexCycle< OtherContainer >& other ) const
             {
-                return this->vertices() == other.vertices();
+                return absl::c_equal( this->vertices(), other.vertices() );
             }
 
+            template < typename OtherContainer >
             [[nodiscard]] bool operator!=(
-                const OrientedVertexCycle& other ) const
+                const OrientedVertexCycle< OtherContainer >& other ) const
             {
                 return !operator==( other );
             }
 
+            template < typename OtherContainer >
             [[nodiscard]] bool operator<(
-                const OrientedVertexCycle& other ) const
+                const OrientedVertexCycle< OtherContainer >& other ) const
             {
                 return this->vertices() < other.vertices();
             }

tests/mesh/test-vertex-cycle.cpp

@@ -110,11 +110,29 @@ void test_oriented_vertex_cycle()
         "[Test] Wrong result for operator!= with cycle5 and cycle7" );
 }
 
+void test_several_containers()
+{
+    const geode::detail::VertexCycle< std::vector< geode::index_t > > cycle1{
+        { 0, 1, 2, 3 }
+    };
+    const geode::detail::VertexCycle< absl::InlinedVector< geode::index_t, 4 > >
+        cycle2{ { 2, 3, 0, 1 } };
+    const geode::detail::VertexCycle< std::array< geode::index_t, 3 > > cycle3{
+        { 2, 3, 1 }
+    };
+
+    OPENGEODE_EXCEPTION( cycle1 == cycle2,
+        "[Test] Wrong result for operator== with cycle1 and cycle2" );
+    OPENGEODE_EXCEPTION( cycle1 != cycle3,
+        "[Test] Wrong result for operator!= with cycle1 and cycle3" );
+}
+
 void test()
 {
     test_vertex_cycle();
     test_oriented_vertex_cycle();
     test_single_vertex_cycle();
+    test_several_containers();
 }
 
 OPENGEODE_TEST( "vertex-cycle" )