Component extract_subset

components/wmtk_components/extract_subset/extract_subset.cpp

@@ -3,19 +3,31 @@
 
 namespace wmtk{
 namespace components {
-wmtk::TriMesh extract_subset(long dimension, const wmtk::TriMesh& m, std::vector<size_t> tag){
+// wmtk::TriMesh extract_subset(const wmtk::TriMesh& m, std::vector<size_t> tag, long dimension){
+//     switch (dimension){
+//         case 2: {
+//             // return internal::extrace_subset_2d();
+//             std::vector<Tuple> vertices = m.get_all(wmtk::PrimitiveType::Vertex);
+//             std::vector<Tuple> triangles = m.get_all(wmtk::PrimitiveType::Face);
+//             return internal::extract_subset_2d(vertices, triangles, tag);
+//         }
+//         case 3: {
+//             // to be implemented
+//             throw std::runtime_error("not implemented");
+//         }
+//     }
+// }
+
+wmtk::TriMesh extract_subset(wmtk::TriMesh m, wmtk::MeshAttributeHandle<long> tag_handle, long dimension){
     switch (dimension){
         case 2: {
-            // return internal::extrace_subset_2d();
-            std::vector<Tuple> vertices = m.get_all(wmtk::PrimitiveType::Vertex);
-            std::vector<Tuple> triangles = m.get_all(wmtk::PrimitiveType::Face);
-            return internal::extract_subset_2d(vertices, triangles, tag);
+            return internal::extract_subset_2d(m, tag_handle);
         }
         case 3: {
             // to be implemented
+            throw std::runtime_error("not implemented");
         }
     }
-
 }
 
 }

components/wmtk_components/extract_subset/extract_subset.hpp

@@ -5,7 +5,12 @@
 #include <wmtk/TriMesh.hpp>
 #include "wmtk/Primitive.hpp"
 #include "internal/extract_subset_2d.hpp"
+#include <wmtk/attribute/AttributeHandle.hpp>
 
-namespace wmtk::components{
-    wmtk::TriMesh extract_subset(long dimension, const wmtk::TriMesh& m, std::vector<size_t> tag);
+namespace wmtk{
+
+namespace components{
+    // wmtk::TriMesh extract_subset(const wmtk::TriMesh& m, std::vector<size_t> tag, long dimension);
+    wmtk::TriMesh extract_subset(wmtk::TriMesh m, wmtk::MeshAttributeHandle<long> tag_handle, long dimension);
+}
 } // namespace wmtk::components

components/wmtk_components/extract_subset/internal/extract_subset_2d.cpp

@@ -1,5 +1,8 @@
 #include "extract_subset_2d.hpp"
 
+
+namespace wmtk::components::internal {
+
 wmtk::TriMesh extract_subset_2d(
     const std::vector<Eigen::Vector2d>& points,
     Eigen::MatrixXi& triangles, std::vector<size_t> tag){
@@ -15,10 +18,10 @@ wmtk::TriMesh extract_subset_2d(
     faces_in.resize(nb_tri_in, 3);
 
     //tag the preserved ones and count number of vertex in new extraction
-    for (size_t k = 0; k < nb_tri_in; ++k){
-        for (size_t k2 = 0; k2 < 3; ++k2) {
+    for (size_t i = 0; i < nb_tri_in; ++i){
+        for (size_t j = 0; j < 3; ++j) {
             // faces_in(k, k2) = triangles(tag[k], k2);
-            vertices_in_bool[triangles(tag[k], k2)] = true;
+            vertices_in_bool[triangles(tag[i], j)] = true;
         }
     }
     for (bool b: vertices_in_bool) {
@@ -27,16 +30,16 @@ wmtk::TriMesh extract_subset_2d(
 
     // construct a map from old vertex id to new new id
     std::map<int, int> old2new;
-    int j = 0;
+    int counter_in = 0;
     for (int i = 0; i < nb_vertex; ++i){
         // ignore the not extracted vertices
         if (vertices_in_bool[i]){
             // old vertex id i map to new vertex id j, where j increases by count
-            old2new.insert({i, j});
-            j++;
+            old2new.insert({i, counter_in});
+            counter_in++;
         }
     }
-    assert(j == nb_vertex_in);
+    assert(counter_in == nb_vertex_in);
 
     wmtk::TriMesh mesh;
     wmtk::RowVectors3l tris;
@@ -127,4 +130,15 @@ wmtk::TriMesh extract_subset_2d(std::vector<wmtk::Tuple> vertices, std::vector<w
 //     }
 //     wmtk::mesh_utils::set_matrix_attribute(points_in, "position", wmtk::PrimitiveType::Vertex, mesh);
     return mesh;
+}
+
+wmtk::TriMesh extract_subset_2d(
+    wmtk::TriMesh m, 
+    wmtk::MeshAttributeHandle<long> taghandle){
+
+    return m;
+    // auto tag_accessor = m.create_accessor(taghandle);
+    // int nb_vertex = m.capacity(wmtk::PrimitiveType::Vertex);
+    // int nb_vertex_in = 0;
+}
 }

components/wmtk_components/extract_subset/internal/extract_subset_2d.hpp

@@ -8,17 +8,22 @@
 #include "wmtk/Tuple.hpp"
 #include <wmtk/Accessor.hpp>
 #include <wmtk/attribute/AttributeHandle.hpp>
+#include <wmtk/Accessor.hpp>
 
 namespace wmtk::components::internal {
-wmtk::TriMesh extract_subset_2d(
-    const std::vector<Eigen::Vector2d>& points,
-    Eigen::MatrixXd& vertices,
-    Eigen::MatrixXi& triangles, std::vector<size_t> tag);
+// wmtk::TriMesh extract_subset_2d(
+//     const std::vector<Eigen::Vector2d>& points,
+//     Eigen::MatrixXd& vertices,
+//     Eigen::MatrixXi& triangles, std::vector<size_t> tag);
+
+// wmtk::TriMesh extract_subset_2d(
+//     std::vector<Tuple> vertices,
+//     std::vector<Tuple> triangles,
+//     std::vector<size_t> tag);
 
 wmtk::TriMesh extract_subset_2d(
-    std::vector<Tuple> vertices,
-    std::vector<Tuple> triangles,
-    std::vector<size_t> tag);
+    wmtk::TriMesh m, 
+    wmtk::MeshAttributeHandle<long> taghandle);
 } 
 
 // namespace wmtk::components::internal

tests/components/test_component_extract_subset.cpp

@@ -1,8 +1,25 @@
 #include <wmtk_components/extract_subset/internal/extract_subset_2d.hpp>
+#include <wmtk_components/extract_subset/extract_subset.hpp>
 #include <catch2/catch_test_macros.hpp>
+#include "../tools/TriMesh_examples.hpp"
+#include "wmtk/attribute/Attribute.hpp"
+#include "wmtk/Primitive.hpp"
+#include "wmtk/attribute/AttributeHandle.hpp"
+#include "wmtk/Mesh.hpp"
 
-
-TEST_CASE("manual test case", "[components][extract_subset][2D]")
+TEST_CASE("3 neighbors test case", "[components][extract_subset][2D]")
 {
+    wmtk::TriMesh tm;
+    tm = wmtk::tests::three_neighbors(); // start with 4 tri
+    Eigen::Vector<long, 10> V; // init the data vector with any static length, then resize
+    V.resize(tm.capacity( wmtk::PrimitiveType::Face), 1);
+    V.row(0) << 1;
+    V.row(1) << 0; // ont tri is not tagged
+    V.row(2) << 1;
+    V.row(3) << 1;
+    auto tag_handle = wmtk::mesh_utils::set_matrix_attribute(V, "tag", wmtk::PrimitiveType::Face, tm);
 
+    // NOTE: I don't know why the following line gives me a linking error of undefined reference...
+    // wmtk::TriMesh new_tm = wmtk::components::extract_subset(tm, tag_handle, 2);
+    wmtk::TriMesh new_tm = wmtk::components::internal::extract_subset_2d(tm, tag_handle);
 }