namespaces

Author: MClemot

core/base/delaunayRipsPersistenceDiagram/DelaunayRipsPersistenceDiagram.cpp

@@ -1,5 +1,7 @@
 #include <DelaunayRipsPersistenceDiagram.h>
 
+using namespace ttk::rpd;
+
 ttk::DelaunayRipsPersistenceDiagram::DelaunayRipsPersistenceDiagram() {
   // inherited from Debug: prefix will be printed at the beginning of every msg
   this->setDebugMsgPrefix("DelaunayRipsPD");

core/base/delaunayRipsPersistenceDiagram/DelaunayRipsPersistenceDiagram.h

@@ -40,7 +40,8 @@ namespace ttk {
      * @param[in] points Input point cloud
      * @param[out] ph Persistence diagram
      */
-    int execute(const PointCloud &points, MultidimensionalDiagram &ph) const;
+    int execute(const rpd::PointCloud &points,
+                rpd::MultidimensionalDiagram &ph) const;
 
     /**
      * @brief Main entry point (with generators)
@@ -50,10 +51,10 @@ namespace ttk {
      * @param[out] generators1 1-dimensional persistent generators
      * @param[out] generators2 2-dimensional persistent generators
      */
-    int execute(const PointCloud &points,
-                MultidimensionalDiagram &ph,
-                std::vector<Generator1> &generators1,
-                std::vector<Generator2> &generators2) const;
+    int execute(const rpd::PointCloud &points,
+                rpd::MultidimensionalDiagram &ph,
+                std::vector<rpd::Generator1> &generators1,
+                std::vector<rpd::Generator2> &generators2) const;
 
   }; // DelaunayRipsPersistenceDiagram class
 

core/base/delaunayRipsPersistenceDiagram/geoPH3.h

@@ -9,10 +9,17 @@
 #include <CGAL/Triangulation_cell_base_with_info_3.h>
 #include <CGAL/Triangulation_vertex_base_with_info_3.h>
 
-using namespace ttk::rpd;
-
 namespace ttk::gph {
 
+  using rpd::Edge;
+  using rpd::FiltratedEdge;
+  using rpd::FiltratedSimplex;
+  using rpd::Generator1;
+  using rpd::Generator2;
+  using rpd::inf;
+  using rpd::MultidimensionalDiagram;
+  using rpd::UnionFind;
+
   using Facet = std::array<id_t, 3>;
 
   struct FiltratedFacet {
@@ -1186,7 +1193,11 @@ namespace ttk::gph {
     for(unsigned i = 0; i < points.size(); ++i)
       p[i] = {points[i][0], points[i][1], points[i][2]};
     if(threads > 1) {
+#ifdef TTK_GPH_PARALLEL
       DRPersistence3_p drpd(p, threads);
+#else
+      DRPersistence3 drpd(p);
+#endif
       drpd.run(diagram);
     } else {
       DRPersistence3 drpd(p);

core/base/delaunayRipsPersistenceDiagram/geoPHd.h

@@ -11,15 +11,22 @@
 
 namespace ttk::gph {
 
+  using rpd::Diagram;
+  using rpd::inf;
+  using rpd::MultidimensionalDiagram;
+  using rpd::Simplex;
+  using rpd::UnionFind;
+
   constexpr static unsigned DYN_DIM = 0;
 
   template <unsigned D>
   using DSimplex = std::
     conditional_t<D == DYN_DIM, std::vector<id_t>, std::array<id_t, D + 1>>;
 
   template <unsigned D>
-  using ValueArray = std::
-    conditional_t<D == DYN_DIM, std::vector<value_t>, std::array<value_t, D>>;
+  using ValueArray = std::conditional_t<D == DYN_DIM,
+                                        std::vector<rpd::value_t>,
+                                        std::array<rpd::value_t, D>>;
 
   template <unsigned D>
   using ConnectivityHashMap

core/vtk/ttkDelaunayRipsPersistenceDiagram/ttkDelaunayRipsPersistenceDiagram.cpp

@@ -12,6 +12,8 @@
 
 vtkStandardNewMacro(ttkDelaunayRipsPersistenceDiagram);
 
+using namespace ttk::rpd;
+
 ttkDelaunayRipsPersistenceDiagram::ttkDelaunayRipsPersistenceDiagram() {
   this->SetNumberOfInputPorts(1);
   this->SetNumberOfOutputPorts(1);

core/vtk/ttkDelaunayRipsPersistenceGenerators/ttkDelaunayRipsPersistenceGenerators.cpp

@@ -13,6 +13,8 @@
 
 vtkStandardNewMacro(ttkDelaunayRipsPersistenceGenerators);
 
+using namespace ttk::rpd;
+
 static void MakeVtkPoints(vtkPoints *vtkPoints,
                           const std::vector<std::vector<double>> &pointsData) {
 

core/vtk/ttkDelaunayRipsPersistenceGenerators/ttkDelaunayRipsPersistenceGenerators.h

@@ -37,7 +37,7 @@
 
 void GeneratorsToVTU(vtkUnstructuredGrid *vtu,
                      vtkPoints *inputPoints,
-                     const std::vector<Generator2> &generators);
+                     const std::vector<ttk::rpd::Generator2> &generators);
 
 class TTKDELAUNAYRIPSPERSISTENCEGENERATORS_EXPORT
   ttkDelaunayRipsPersistenceGenerators