multipers 2.2.3__cp310-cp310-win_amd64.whl → 2.3.1__cp310-cp310-win_amd64.whl

multipers/multiparameter_module_approximation/combinatory.h

@@ -1,129 +1,129 @@
-/*    This file is part of the MMA Library - https://gitlab.inria.fr/dloiseau/multipers - which is released under MIT.
- *    See file LICENSE for full license details.
- *    Author(s):       David Loiseaux
- *
- *    Copyright (C) 2021 Inria
- *
- *    Modification(s):
- *      - 2022/03 Hannah Schreiber: Integration of the new Vineyard_persistence class, renaming and cleanup.
- */
-/**
- * @file combinatory.h
- * @author David Loiseaux, Hannah Schreiber
- * @brief Combinatorial and sorting functions
- */
-
-#ifndef COMBINATORY_H_INCLUDED
-#define COMBINATORY_H_INCLUDED
-
-#include <vector>
-#include <iostream>
-#include <functional>
-#include <algorithm>
-#include <climits>
-#include <assert.h>
-#include "utilities.h"
-#include "debug.h"
-
-namespace Gudhi::multiparameter::mma::Combinatorics {
-
-using Gudhi::multiparameter::mma::permutation_type;
-
-template<typename T> void compose(std::vector<T> &p, const permutation_type &q);
-unsigned int prod(const std::vector<unsigned int>& toMultiply,
-                  unsigned int until = UINT_MAX);
-template<typename T>
-permutation_type sort_and_return_permutation(
-        std::vector<T>& toSort,
-        std::function<bool(T&, T&)> lessOrEqualComparator);
-template<typename T>
-void quicksort_and_record_permutation(
-        std::vector<T>& toSort,
-        permutation_type& p,
-        unsigned int low,
-        unsigned int high,
-        std::function<bool(T&, T&)> lessOrEqualComparator);
-
-template<typename T>
-void compose(std::vector<T> &p,const permutation_type &q){
-    unsigned int n = p.size();
-//     assert(q.size() == n);
-    std::vector<T> r(n);
-    for(unsigned int i = 0; i< n; i++){
-        r[i] = p[q[i]];
-    }
-    p.swap(r);
-}
-
-template<typename T>
-std::vector<T> inverse(const std::vector<T> &p){
-    unsigned int n = p.size();
-    std::vector<T> inv(n);
-    for(unsigned int i = 0; i< n; i++)
-        inv[p[i]] = i;
-	
-    return inv;
-}
-
-unsigned int prod(const std::vector<unsigned int>& toMultiply,
-                  unsigned int until)
-{
-    unsigned int output = 1;
-    for (unsigned int i = 0; i < toMultiply.size() && i <= until; i++){
-        output *= toMultiply[i];
-    }
-    return output;
-}
-
-template<typename T>
-permutation_type sort_and_return_permutation(
-        std::vector<T>& toSort, std::function<bool(T&, T&)> lessOrEqualComparator)
-{
-    unsigned int n = toSort.size();
-
-    // initialize p as the identity
-    permutation_type p(n);
-    for (unsigned int i = 0; i < n ; i++) p[i] = i;
-
-    // call the recursive function doing the job
-    quicksort_and_record_permutation<T>(toSort, p, 0, n - 1, lessOrEqualComparator);
-
-    return p;
-}
-
-template<typename T>
-void quicksort_and_record_permutation(
-        std::vector<T>& toSort,
-        permutation_type& p,
-        unsigned int low,
-        unsigned int high,
-        std::function<bool(T&, T&)> lessOrEqualComparator)
-{
-    // compatibility check
-    assert(toSort.size() == p.size());
-    assert(high < toSort.size());
-
-    if (high <= low) return;
-
-    // take the last element as pivot.
-    T pivot = toSort[high];
-
-    int i = low - 1 ;
-
-    for (unsigned int j = low; j < high; j++){
-        if (lessOrEqualComparator(toSort[j], pivot)){
-            i++;
-            std::swap(toSort[i], toSort[j]);
-            std::swap(p[i], p[j]);
-        }
-    }
-    std::swap(toSort[i+1], toSort[high]);
-    std::swap(p[i+1], p[high]);
-
-    quicksort_and_record_permutation<T>(toSort, p, low, std::max(i, 0), lessOrEqualComparator);
-    quicksort_and_record_permutation<T>(toSort, p, i + 2, high, lessOrEqualComparator);
-}
-
-} //namespace Combinatorics
-
-#endif // COMBINATORY_H_INCLUDED
+/*    This file is part of the MMA Library - https://gitlab.inria.fr/dloiseau/multipers - which is released under MIT.
+ *    See file LICENSE for full license details.
+ *    Author(s):       David Loiseaux
+ *
+ *    Copyright (C) 2021 Inria
+ *
+ *    Modification(s):
+ *      - 2022/03 Hannah Schreiber: Integration of the new Vineyard_persistence class, renaming and cleanup.
+ */
+/**
+ * @file combinatory.h
+ * @author David Loiseaux, Hannah Schreiber
+ * @brief Combinatorial and sorting functions
+ */
+
+#ifndef COMBINATORY_H_INCLUDED
+#define COMBINATORY_H_INCLUDED
+
+#include <vector>
+#include <iostream>
+#include <functional>
+#include <algorithm>
+#include <climits>
+#include <assert.h>
+#include "utilities.h"
+#include "debug.h"
+
+namespace Gudhi::multiparameter::mma::Combinatorics {
+
+using Gudhi::multiparameter::mma::permutation_type;
+
+template<typename T> void compose(std::vector<T> &p, const permutation_type &q);
+unsigned int prod(const std::vector<unsigned int>& toMultiply,
+                  unsigned int until = UINT_MAX);
+template<typename T>
+permutation_type sort_and_return_permutation(
+        std::vector<T>& toSort,
+        std::function<bool(T&, T&)> lessOrEqualComparator);
+template<typename T>
+void quicksort_and_record_permutation(
+        std::vector<T>& toSort,
+        permutation_type& p,
+        unsigned int low,
+        unsigned int high,
+        std::function<bool(T&, T&)> lessOrEqualComparator);
+
+template<typename T>
+void compose(std::vector<T> &p,const permutation_type &q){
+    unsigned int n = p.size();
+//     assert(q.size() == n);
+    std::vector<T> r(n);
+    for(unsigned int i = 0; i< n; i++){
+        r[i] = p[q[i]];
+    }
+    p.swap(r);
+}
+
+template<typename T>
+std::vector<T> inverse(const std::vector<T> &p){
+    unsigned int n = p.size();
+    std::vector<T> inv(n);
+    for(unsigned int i = 0; i< n; i++)
+        inv[p[i]] = i;
+	
+    return inv;
+}
+
+unsigned int prod(const std::vector<unsigned int>& toMultiply,
+                  unsigned int until)
+{
+    unsigned int output = 1;
+    for (unsigned int i = 0; i < toMultiply.size() && i <= until; i++){
+        output *= toMultiply[i];
+    }
+    return output;
+}
+
+template<typename T>
+permutation_type sort_and_return_permutation(
+        std::vector<T>& toSort, std::function<bool(T&, T&)> lessOrEqualComparator)
+{
+    unsigned int n = toSort.size();
+
+    // initialize p as the identity
+    permutation_type p(n);
+    for (unsigned int i = 0; i < n ; i++) p[i] = i;
+
+    // call the recursive function doing the job
+    quicksort_and_record_permutation<T>(toSort, p, 0, n - 1, lessOrEqualComparator);
+
+    return p;
+}
+
+template<typename T>
+void quicksort_and_record_permutation(
+        std::vector<T>& toSort,
+        permutation_type& p,
+        unsigned int low,
+        unsigned int high,
+        std::function<bool(T&, T&)> lessOrEqualComparator)
+{
+    // compatibility check
+    assert(toSort.size() == p.size());
+    assert(high < toSort.size());
+
+    if (high <= low) return;
+
+    // take the last element as pivot.
+    T pivot = toSort[high];
+
+    int i = low - 1 ;
+
+    for (unsigned int j = low; j < high; j++){
+        if (lessOrEqualComparator(toSort[j], pivot)){
+            i++;
+            std::swap(toSort[i], toSort[j]);
+            std::swap(p[i], p[j]);
+        }
+    }
+    std::swap(toSort[i+1], toSort[high]);
+    std::swap(p[i+1], p[high]);
+
+    quicksort_and_record_permutation<T>(toSort, p, low, std::max(i, 0), lessOrEqualComparator);
+    quicksort_and_record_permutation<T>(toSort, p, i + 2, high, lessOrEqualComparator);
+}
+
+} //namespace Combinatorics
+
+#endif // COMBINATORY_H_INCLUDED

multipers/multiparameter_module_approximation/debug.h

@@ -1,107 +1,107 @@
-/*    This file is part of the MMA Library -
- * https://gitlab.inria.fr/dloiseau/multipers - which is released under MIT. See
- * file LICENSE for full license details. Author(s):       David Loiseaux
- *
- *    Copyright (C) 2021 Inria
- *
- *    Modification(s):
- *      - 2022/03 Hannah Schreiber: Integration of the new Vineyard_persistence
- * class, renaming and cleanup.
- */
-/**
- * @file debug.h
- * @author David Loiseaux, Hannah Schreiber
- * @brief Display functions for debug purposes
- */
-
-#ifndef DEBUG_H_INCLUDED
-#define DEBUG_H_INCLUDED
-
-#include <chrono>
-#include <iostream>
-#include <list>
-#include <vector>
-
-namespace Gudhi::multiparameter::mma::Debug {
-
-using clk = std::chrono::high_resolution_clock;
-using tp = clk::time_point;
-
-constexpr bool debug = false;
-
-class Timer {
-public:
-  Timer() : activated_(false) {}
-  Timer(const std::string &string, bool verbose)
-      : timer_(clk::now()), activated_(verbose) {
-    if (verbose) {
-      std::cout << string << std::flush;
-    }
-  }
-  ~Timer() {
-    if (activated_) {
-      std::chrono::duration<double> elapsed =
-          std::chrono::duration_cast<std::chrono::duration<double>>(clk::now() -
-                                                                    timer_);
-      std::cout << " Done ! (" << elapsed.count() << " s)." << std::endl;
-    }
-  }
-
-private:
-  tp timer_;
-  bool activated_;
-};
-
-template <typename T> void disp_vect(std::vector<T> v) {
-  for (auto i = 0u; i < v.size(); i++) {
-    std::cout << v[i] << " ";
-  }
-  std::cout << std::endl;
-}
-
-template <typename T> void disp_vect(std::list<T> v) {
-  while (!v.empty()) {
-    std::cout << v.front() << " ";
-    v.pop_front();
-  }
-  std::cout << std::endl;
-}
-
-template <typename T> void disp_vect(std::vector<std::pair<T, T>> v) {
-  for (unsigned int i = 0; i < v.size(); i++) {
-    std::cout << "(" << v[i].first << " " << v[i].second << ")  ";
-  }
-}
-
-template <typename T>
-void disp_vect(std::vector<std::vector<T>> v, bool show_small = true) {
-  for (auto i = 0u; i < v.size(); i++) {
-    if (v[i].size() <= 1 && !show_small)
-      continue;
-    std::cout << "(";
-    for (auto j = 0u; j < v[i].size(); j++) {
-      std::cout << v[i][j];
-      if (j < v[i].size() - 1)
-        std::cout << " ";
-    }
-    std::cout << ") ";
-  }
-  std::cout << std::endl;
-}
-
-} // namespace Gudhi::multiparameter::mma::Debug
-namespace std {
-template <typename T>
-std::ostream &operator<<(std::ostream &stream, const std::vector<T> truc) {
-  stream << "[";
-  for (unsigned int i = 0; i < truc.size() - 1; i++) {
-    stream << truc[i] << ", ";
-  }
-  if (!truc.empty())
-    stream << truc.back();
-  stream << "]";
-  return stream;
-}
-} // namespace std
-
-#endif // DEBUG_H_INCLUDED
+/*    This file is part of the MMA Library -
+ * https://gitlab.inria.fr/dloiseau/multipers - which is released under MIT. See
+ * file LICENSE for full license details. Author(s):       David Loiseaux
+ *
+ *    Copyright (C) 2021 Inria
+ *
+ *    Modification(s):
+ *      - 2022/03 Hannah Schreiber: Integration of the new Vineyard_persistence
+ * class, renaming and cleanup.
+ */
+/**
+ * @file debug.h
+ * @author David Loiseaux, Hannah Schreiber
+ * @brief Display functions for debug purposes
+ */
+
+#ifndef DEBUG_H_INCLUDED
+#define DEBUG_H_INCLUDED
+
+#include <chrono>
+#include <iostream>
+#include <list>
+#include <vector>
+
+namespace Gudhi::multiparameter::mma::Debug {
+
+using clk = std::chrono::high_resolution_clock;
+using tp = clk::time_point;
+
+constexpr bool debug = false;
+
+class Timer {
+public:
+  Timer() : activated_(false) {}
+  Timer(const std::string &string, bool verbose)
+      : timer_(clk::now()), activated_(verbose) {
+    if (verbose) {
+      std::cout << string << std::flush;
+    }
+  }
+  ~Timer() {
+    if (activated_) {
+      std::chrono::duration<double> elapsed =
+          std::chrono::duration_cast<std::chrono::duration<double>>(clk::now() -
+                                                                    timer_);
+      std::cout << " Done ! (" << elapsed.count() << " s)." << std::endl;
+    }
+  }
+
+private:
+  tp timer_;
+  bool activated_;
+};
+
+template <typename T> void disp_vect(std::vector<T> v) {
+  for (auto i = 0u; i < v.size(); i++) {
+    std::cout << v[i] << " ";
+  }
+  std::cout << std::endl;
+}
+
+template <typename T> void disp_vect(std::list<T> v) {
+  while (!v.empty()) {
+    std::cout << v.front() << " ";
+    v.pop_front();
+  }
+  std::cout << std::endl;
+}
+
+template <typename T> void disp_vect(std::vector<std::pair<T, T>> v) {
+  for (unsigned int i = 0; i < v.size(); i++) {
+    std::cout << "(" << v[i].first << " " << v[i].second << ")  ";
+  }
+}
+
+template <typename T>
+void disp_vect(std::vector<std::vector<T>> v, bool show_small = true) {
+  for (auto i = 0u; i < v.size(); i++) {
+    if (v[i].size() <= 1 && !show_small)
+      continue;
+    std::cout << "(";
+    for (auto j = 0u; j < v[i].size(); j++) {
+      std::cout << v[i][j];
+      if (j < v[i].size() - 1)
+        std::cout << " ";
+    }
+    std::cout << ") ";
+  }
+  std::cout << std::endl;
+}
+
+} // namespace Gudhi::multiparameter::mma::Debug
+namespace std {
+template <typename T>
+std::ostream &operator<<(std::ostream &stream, const std::vector<T> truc) {
+  stream << "[";
+  for (unsigned int i = 0; i < truc.size() - 1; i++) {
+    stream << truc[i] << ", ";
+  }
+  if (!truc.empty())
+    stream << truc.back();
+  stream << "]";
+  return stream;
+}
+} // namespace std
+
+#endif // DEBUG_H_INCLUDED