Remove TupleInspector and other files that are not used anymore.

Author: daniel-zint

components/tests/test_component_isotropic_remeshing.cpp

@@ -2,7 +2,6 @@
 #include <nlohmann/json.hpp>
 #include <tools/DEBUG_EdgeMesh.hpp>
 #include <tools/DEBUG_TriMesh.hpp>
-#include <tools/DEBUG_Tuple.hpp>
 #include <tools/EdgeMesh_examples.hpp>
 #include <tools/TriMesh_examples.hpp>
 #include <wmtk/Scheduler.hpp>

src/wmtk/CMakeLists.txt

@@ -28,6 +28,7 @@ set(SRC_FILES
     Primitive.cpp
     Tuple.hxx
     Tuple.hpp
+    Tuple.cpp
     Types.hpp
     Scheduler.hpp
     Scheduler.cpp

src/wmtk/EdgeMesh.hpp

@@ -51,18 +51,18 @@ class EdgeMesh : public MeshCRTP<EdgeMesh>
     std::vector<std::vector<TypedAttributeHandle<int64_t>>> connectivity_attributes()
         const override;
 
+
     Tuple switch_vertex(const Tuple& tuple) const;
     Tuple switch_edge(const Tuple& tuple) const;
 
     std::vector<Tuple> orient_vertices(const Tuple& tuple) const override;
-
-protected:
     int64_t id(const Tuple& tuple, PrimitiveType type) const;
     using MeshCRTP<EdgeMesh>::id; // getting the (simplex) prototype
 
     int64_t id_vertex(const Tuple& tuple) const { return id(tuple, PrimitiveType::Vertex); }
     int64_t id_edge(const Tuple& tuple) const { return id(tuple, PrimitiveType::Edge); }
 
+protected:
     /**
      * @brief internal function that returns the tuple of requested type, and has the global index
      * cid

src/wmtk/PointMesh.hpp

@@ -43,10 +43,10 @@ class PointMesh : public MeshCRTP<PointMesh>
 
     std::vector<Tuple> orient_vertices(const Tuple& tuple) const override;
 
-protected:
     using MeshCRTP<PointMesh>::id; // getting the (simplex) prototype
     int64_t id(const Tuple& tuple, PrimitiveType type) const;
 
+protected:
     /**
      * @brief internal function that returns the tuple of requested type, and has the global index
      * cid

src/wmtk/TetMesh.hpp

@@ -61,8 +61,6 @@ class TetMesh : public MeshCRTP<TetMesh>
     std::vector<Tuple> orient_vertices(const Tuple& t) const override;
 
 
-protected:
-    void make_cached_accessors();
     int64_t id(const Tuple& tuple, PrimitiveType type) const;
     using MeshCRTP<TetMesh>::id; // getting the (simplex) prototype
 
@@ -72,6 +70,8 @@ class TetMesh : public MeshCRTP<TetMesh>
     int64_t id_face(const Tuple& tuple) const { return id(tuple, PrimitiveType::Triangle); }
     int64_t id_tet(const Tuple& tuple) const { return id(tuple, PrimitiveType::Tetrahedron); }
 
+protected:
+    void make_cached_accessors();
     /**
      * @brief internal function that returns the tuple of requested type, and has the global index
      * cid

src/wmtk/TetMeshOperationExecutor.cpp

@@ -10,7 +10,6 @@
 #include <wmtk/simplex/top_dimension_cofaces.hpp>
 #include <wmtk/simplex/top_dimension_cofaces_iterable.hpp>
 #include <wmtk/utils/Logger.hpp>
-#include <wmtk/utils/TupleInspector.hpp>
 
 namespace wmtk {
 namespace {

src/wmtk/TriMesh.hpp

@@ -67,14 +67,14 @@ class TriMesh : public MeshCRTP<TriMesh>
 
     std::vector<Tuple> orient_vertices(const Tuple& t) const override;
 
-protected:
     int64_t id(const Tuple& tuple, PrimitiveType type) const;
     using MeshCRTP<TriMesh>::id; // getting the (simplex) prototype
 
     int64_t id_vertex(const Tuple& tuple) const { return id(tuple, PrimitiveType::Vertex); }
     int64_t id_edge(const Tuple& tuple) const { return id(tuple, PrimitiveType::Edge); }
     int64_t id_face(const Tuple& tuple) const { return id(tuple, PrimitiveType::Triangle); }
 
+protected:
     /**
      * @brief internal function that returns the tuple of requested type, and has the global index
      * cid

src/wmtk/Tuple.cpp

@@ -0,0 +1,28 @@
+#include "Tuple.hpp"
+
+#include <fmt/format.h>
+
+namespace wmtk {
+
+std::string Tuple::as_string() const
+{
+    return fmt::format(
+        "(gid {} : lids[v{},e{},f{}])",
+        global_cid(),
+        local_vid(),
+        local_eid(),
+        local_fid());
+}
+
+Tuple::operator std::string() const
+{
+    return as_string();
+}
+
+std::ostream& operator<<(std::ostream& os, const Tuple& t)
+{
+    os << t.as_string();
+    return os;
+}
+
+} // namespace wmtk

src/wmtk/Tuple.hpp

@@ -2,7 +2,10 @@
 
 #include <array>
 #include <cstdint>
+#include <iostream>
+#include <string>
 #include <tuple>
+#include <wmtk/PrimitiveType.hpp>
 
 namespace wmtk {
 
@@ -53,7 +56,16 @@ class Tuple
     int8_t local_vid() const;
     int8_t local_eid() const;
     int8_t local_fid() const;
+
+    int8_t local_id(const PrimitiveType pt) const;
+
+    std::string as_string() const;
+    explicit operator std::string() const;
+
+    friend std::ostream& operator<<(std::ostream& os, const Tuple& t);
 };
 
+std::ostream& operator<<(std::ostream& os, const Tuple& t);
+
 } // namespace wmtk
 #include "Tuple.hxx"

src/wmtk/Tuple.hxx

@@ -1,3 +1,7 @@
+#include "Tuple.hpp"
+
+#include <cassert>
+
 namespace wmtk {
 
 //         v2
@@ -60,4 +64,16 @@ inline int8_t Tuple::local_fid() const
     return m_local_fid;
 }
 
+inline int8_t Tuple::local_id(const PrimitiveType pt) const
+{
+    switch (pt) {
+    case PrimitiveType::Vertex: return local_vid();
+    case PrimitiveType::Edge: return local_eid();
+    case PrimitiveType::Triangle: return local_fid();
+    case PrimitiveType::Tetrahedron:
+    default: assert(false);
+    }
+    return -1;
+}
+
 } // namespace wmtk