Hackathon/edge mesh

src/wmtk/EdgeMesh.cpp

@@ -81,8 +81,9 @@ Tuple EdgeMesh::switch_tuple(const Tuple& tuple, PrimitiveType type) const
 
         // TODO: This is for special case self-loop, just to make sure the local vid of the returned
         // tuple is the same as the input. (When doing double-switch this is needed)
-        if (gcid_new == tuple.m_global_cid) return tuple;
-
+        if (gcid_new == tuple.m_global_cid) {
+            return tuple;
+        }
 
         long lvid_new = -1;
 

src/wmtk/EdgeMeshOperationExecutor.hpp

@@ -21,6 +21,8 @@ class EdgeMesh::EdgeMeshOperationExecutor
      * @brief gather all simplices that are deleted in a split
      *
      * The deleted simplex is the edge itself
+     * @return std::array<std::vector<long>, 2> first vector contains the vertex ids, second vector
+     * contains the edge ids
      */
     static const std::array<std::vector<long>, 2> get_split_simplices_to_delete(
         const Tuple& tuple,
@@ -30,6 +32,8 @@ class EdgeMesh::EdgeMeshOperationExecutor
      * @brief gather all simplices that are deleted in a collapse
      *
      * The deleted simplices are the vertex and the edge of the input tuple
+     * @return std::array<std::vector<long>, 2> first vector contains the vertex ids, second vector
+     * contains the edge ids
      */
     static const std::array<std::vector<long>, 2> get_collapse_simplices_to_delete(
         const Tuple& tuple,

tests/test_tuple_1d.cpp

@@ -109,24 +109,19 @@ TEST_CASE("1D_multiple_lines", "[tuple_generation], [tuple_1d]")
     {
         const std::vector<Tuple> vertices = m.get_all(PrimitiveType::Vertex);
         REQUIRE(vertices.size() == 6);
-        CHECK(m.id(vertices[0], PrimitiveType::Vertex) == 0);
-        CHECK(m.id(vertices[1], PrimitiveType::Vertex) == 1);
-        CHECK(m.id(vertices[2], PrimitiveType::Vertex) == 2);
-        CHECK(m.id(vertices[3], PrimitiveType::Vertex) == 3);
-        CHECK(m.id(vertices[4], PrimitiveType::Vertex) == 4);
-        CHECK(m.id(vertices[5], PrimitiveType::Vertex) == 5);
+        for (long i = 0; i < 6; ++i) {
+            CHECK(m.id(vertices[i], PrimitiveType::Vertex) == i);
+        }
         CHECK(m.id(vertices[0], PrimitiveType::Edge) == 0);
         CHECK(m.id(vertices[5], PrimitiveType::Edge) == 4);
     }
     SECTION("edges")
     {
         const std::vector<Tuple> edges = m.get_all(PrimitiveType::Edge);
         REQUIRE(edges.size() == 5);
-        CHECK(m.id(edges[0], PrimitiveType::Edge) == 0);
-        CHECK(m.id(edges[1], PrimitiveType::Edge) == 1);
-        CHECK(m.id(edges[2], PrimitiveType::Edge) == 2);
-        CHECK(m.id(edges[3], PrimitiveType::Edge) == 3);
-        CHECK(m.id(edges[4], PrimitiveType::Edge) == 4);
+        for (long i = 0; i < 5; ++i) {
+            CHECK(m.id(edges[i], PrimitiveType::Edge) == i);
+        }
     }
 }
 
@@ -138,23 +133,17 @@ TEST_CASE("1D_loop_lines", "[tuple_generation], [tuple_1d]")
     {
         const std::vector<Tuple> vertices = m.get_all(PrimitiveType::Vertex);
         REQUIRE(vertices.size() == 6);
-        CHECK(m.id(vertices[0], PrimitiveType::Vertex) == 0);
-        CHECK(m.id(vertices[1], PrimitiveType::Vertex) == 1);
-        CHECK(m.id(vertices[2], PrimitiveType::Vertex) == 2);
-        CHECK(m.id(vertices[3], PrimitiveType::Vertex) == 3);
-        CHECK(m.id(vertices[4], PrimitiveType::Vertex) == 4);
-        CHECK(m.id(vertices[5], PrimitiveType::Vertex) == 5);
+        for (long i = 0; i < 6; ++i) {
+            CHECK(m.id(vertices[i], PrimitiveType::Vertex) == i);
+        }
     }
     SECTION("edges")
     {
         const std::vector<Tuple> edges = m.get_all(PrimitiveType::Edge);
         REQUIRE(edges.size() == 6);
-        CHECK(m.id(edges[0], PrimitiveType::Edge) == 0);
-        CHECK(m.id(edges[1], PrimitiveType::Edge) == 1);
-        CHECK(m.id(edges[2], PrimitiveType::Edge) == 2);
-        CHECK(m.id(edges[3], PrimitiveType::Edge) == 3);
-        CHECK(m.id(edges[4], PrimitiveType::Edge) == 4);
-        CHECK(m.id(edges[5], PrimitiveType::Edge) == 5);
+        for (long i = 0; i < 6; ++i) {
+            CHECK(m.id(edges[i], PrimitiveType::Edge) == i);
+        }
     }
 }
 
@@ -179,7 +168,7 @@ TEST_CASE("1D_self_loop", "[tuple_generation], [tuple_1d]")
 TEST_CASE("1D_random_switches", "[tuple_operation],[tuple_1d]")
 {
     DEBUG_EdgeMesh m = loop_lines();
-
+    ConstAccessor<long> hash_accessor = m.get_const_cell_hash_accessor();
     SECTION("vertices")
     {
         const std::vector<Tuple> vertex_tuples = m.get_all(PrimitiveType::Vertex);
@@ -195,7 +184,7 @@ TEST_CASE("1D_random_switches", "[tuple_operation],[tuple_1d]")
                     break;
                 default: break;
                 }
-                CHECK(m.is_valid_slow(t));
+                CHECK(m.is_valid(t, hash_accessor));
             }
         }
     }
@@ -215,7 +204,7 @@ TEST_CASE("1D_random_switches", "[tuple_operation],[tuple_1d]")
                     break;
                 default: break;
                 }
-                CHECK(m.is_valid_slow(t));
+                CHECK(m.is_valid(t, hash_accessor));
             }
         }
     }

tests/tools/DEBUG_EdgeMesh.cpp

@@ -13,10 +13,12 @@ DEBUG_EdgeMesh::DEBUG_EdgeMesh(EdgeMesh&& m)
 
 bool DEBUG_EdgeMesh::operator==(const DEBUG_EdgeMesh& o) const
 {
-    return static_cast<const DEBUG_EdgeMesh&>(*this) == static_cast<const DEBUG_EdgeMesh&>(o);
+    throw("This function is not tested yet");
+    return static_cast<const EdgeMesh&>(*this) == static_cast<const EdgeMesh&>(o);
 }
 bool DEBUG_EdgeMesh::operator!=(const DEBUG_EdgeMesh& o) const
 {
+    throw("This function is not tested yet");
     return !(*this == o);
 }