Adapted checks for implicit final class.

atalon-lip6 · Dec 19, 2023 · 1030c8a · 1030c8a
1 parent ffe6c91
commit 1030c8a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/core/base/persistenceDiagram/PersistenceDiagram.h b/core/base/persistenceDiagram/PersistenceDiagram.h
@@ -723,14 +723,21 @@ int ttk::PersistenceDiagram::executeFTM(
   return 0;
 }
 
+//TODO et si pas classe finale, renvoie erreur et constexpr
 template <class triangulationType>
 void ttk::PersistenceDiagram::checkProgressivityRequirement(
   const triangulationType *ttkNotUsed(triangulation)) {
 
   if((BackEnd == BACKEND::PROGRESSIVE_TOPOLOGY
       || BackEnd == BACKEND::APPROXIMATE_TOPOLOGY)
      && !std::is_same<ttk::ImplicitWithPreconditions<0>, triangulationType>::value
-     && !std::is_same<ttk::ImplicitNoPreconditions<0>, triangulationType>::value) {
+     && !std::is_same<ttk::ImplicitWithPreconditions<1>, triangulationType>::value
+     && !std::is_same<ttk::ImplicitWithPreconditions<2>, triangulationType>::value
+     && !std::is_same<ttk::ImplicitWithPreconditions<3>, triangulationType>::value
+     && !std::is_same<ttk::ImplicitNoPreconditions<0>, triangulationType>::value 
+     && !std::is_same<ttk::ImplicitNoPreconditions<1>, triangulationType>::value 
+     && !std::is_same<ttk::ImplicitNoPreconditions<2>, triangulationType>::value 
+     && !std::is_same<ttk::ImplicitNoPreconditions<3>, triangulationType>::value) {
 
     printWrn("Explicit, Compact or Periodic triangulation detected.");
     printWrn("Defaulting to the FTM backend.");

diff --git a/core/base/scalarFieldCriticalPoints/ScalarFieldCriticalPoints.h b/core/base/scalarFieldCriticalPoints/ScalarFieldCriticalPoints.h
@@ -612,14 +612,19 @@ char ttk::ScalarFieldCriticalPoints::getCriticalType(
   return (char)(CriticalType::Regular);
 }
 
-//Todo
+//Todo et si implicittriangulation simple va échouer...
 template <class triangulationType>
 void ttk::ScalarFieldCriticalPoints::checkProgressivityRequirement(
   const triangulationType *ttkNotUsed(triangulation)) {
   if(BackEnd == BACKEND::PROGRESSIVE_TOPOLOGY
      && !std::is_same<ttk::ImplicitWithPreconditions<0>, triangulationType>::value
-     && !std::is_same<ttk::ImplicitNoPreconditions<0>, triangulationType>::value) {
-
+     && !std::is_same<ttk::ImplicitWithPreconditions<1>, triangulationType>::value
+     && !std::is_same<ttk::ImplicitWithPreconditions<2>, triangulationType>::value
+     && !std::is_same<ttk::ImplicitWithPreconditions<3>, triangulationType>::value
+     && !std::is_same<ttk::ImplicitNoPreconditions<0>, triangulationType>::value 
+     && !std::is_same<ttk::ImplicitNoPreconditions<1>, triangulationType>::value 
+     && !std::is_same<ttk::ImplicitNoPreconditions<2>, triangulationType>::value 
+     && !std::is_same<ttk::ImplicitNoPreconditions<3>, triangulationType>::value) {
     printMsg(ttk::debug::Separator::L2);
     printWrn("Explicit, Compact or Periodic");
     printWrn("triangulation detected.");