multipers 2.2.3__cp311-cp311-win_amd64.whl → 2.3.1__cp311-cp311-win_amd64.whl

multipers/multiparameter_module_approximation/set_column.h

@@ -1,135 +1,135 @@
-/*    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):       Hannah Schreiber
- *
- *    Copyright (C) 2022 Inria
- *
- *    Modification(s):
- *      - YYYY/MM Author: Description of the modification
- */
-
-#ifndef SETCOLUMN_H
-#define SETCOLUMN_H
-
-#include <iostream>
-#include <list>
-#include <set>
-
-#include "utilities.h"
-
-namespace Gudhi::multiparameter::mma {
-
-class Set_column
-{
-public:
-    Set_column();
-    Set_column(boundary_type& boundary);
-    Set_column(Set_column& column);
-    Set_column(Set_column&& column) noexcept;
-
-    void get_content(boundary_type& container);
-    bool contains(unsigned int value) const;
-    bool is_empty();
-    dimension_type get_dimension() const;
-    int get_pivot();
-    void clear();
-    void clear(unsigned int value);
-    void reorder(std::vector<index>& valueMap);
-    void add(Set_column& column);
-
-    Set_column& operator=(Set_column other);
-
-    friend void swap(Set_column& col1, Set_column& col2);
-
-private:
-    int dim_;
-    std::set<unsigned int> column_;
-};
-
-inline Set_column::Set_column() : dim_(0)
-{}
-
-inline Set_column::Set_column(boundary_type &boundary)
-    : dim_(boundary.size() == 0 ? 0 : boundary.size() - 1),
-      column_(boundary.begin(), boundary.end())
-{}
-
-inline Set_column::Set_column(Set_column &column)
-    : dim_(column.dim_),
-      column_(column.column_)
-{}
-
-inline Set_column::Set_column(Set_column &&column) noexcept
-    : dim_(std::exchange(column.dim_, 0)),
-      column_(std::move(column.column_))
-{}
-
-inline void Set_column::get_content(boundary_type &container)
-{
-    std::copy(column_.begin(), column_.end(), std::back_inserter(container));
-}
-
-inline bool Set_column::contains(unsigned int value) const
-{
-    return column_.find(value) != column_.end();
-}
-
-inline bool Set_column::is_empty()
-{
-    return column_.empty();
-}
-
-inline dimension_type Set_column::get_dimension() const
-{
-    return dim_;
-}
-
-inline int Set_column::get_pivot()
-{
-    if (column_.empty()) return -1;
-    return *(column_.rbegin());
-}
-
-inline void Set_column::clear()
-{
-    column_.clear();
-}
-
-inline void Set_column::clear(unsigned int value)
-{
-    column_.erase(value);
-}
-
-inline void Set_column::reorder(std::vector<index> &valueMap)
-{
-    std::set<unsigned int> newSet;
-    for (const unsigned int& v : column_) newSet.insert(valueMap.at(v));
-    column_.swap(newSet);
-}
-
-inline void Set_column::add(Set_column &column)
-{
-    for (const unsigned int& v : column.column_){
-        if (column_.find(v) != column_.end())
-            column_.erase(v);
-        else
-            column_.insert(v);
-    }
-}
-
-inline Set_column &Set_column::operator=(Set_column other)
-{
-    std::swap(dim_, other.dim_);
-    std::swap(column_, other.column_);
-    return *this;
-}
-
-inline void swap(Set_column& col1, Set_column& col2)
-{
-    std::swap(col1.dim_, col2.dim_);
-    col1.column_.swap(col2.column_);
-}
-
-}   //namespace Vineyard
-
-#endif // SETCOLUMN_H
+/*    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):       Hannah Schreiber
+ *
+ *    Copyright (C) 2022 Inria
+ *
+ *    Modification(s):
+ *      - YYYY/MM Author: Description of the modification
+ */
+
+#ifndef SETCOLUMN_H
+#define SETCOLUMN_H
+
+#include <iostream>
+#include <list>
+#include <set>
+
+#include "utilities.h"
+
+namespace Gudhi::multiparameter::mma {
+
+class Set_column
+{
+public:
+    Set_column();
+    Set_column(boundary_type& boundary);
+    Set_column(Set_column& column);
+    Set_column(Set_column&& column) noexcept;
+
+    void get_content(boundary_type& container);
+    bool contains(unsigned int value) const;
+    bool is_empty();
+    dimension_type get_dimension() const;
+    int get_pivot();
+    void clear();
+    void clear(unsigned int value);
+    void reorder(std::vector<index>& valueMap);
+    void add(Set_column& column);
+
+    Set_column& operator=(Set_column other);
+
+    friend void swap(Set_column& col1, Set_column& col2);
+
+private:
+    int dim_;
+    std::set<unsigned int> column_;
+};
+
+inline Set_column::Set_column() : dim_(0)
+{}
+
+inline Set_column::Set_column(boundary_type &boundary)
+    : dim_(boundary.size() == 0 ? 0 : boundary.size() - 1),
+      column_(boundary.begin(), boundary.end())
+{}
+
+inline Set_column::Set_column(Set_column &column)
+    : dim_(column.dim_),
+      column_(column.column_)
+{}
+
+inline Set_column::Set_column(Set_column &&column) noexcept
+    : dim_(std::exchange(column.dim_, 0)),
+      column_(std::move(column.column_))
+{}
+
+inline void Set_column::get_content(boundary_type &container)
+{
+    std::copy(column_.begin(), column_.end(), std::back_inserter(container));
+}
+
+inline bool Set_column::contains(unsigned int value) const
+{
+    return column_.find(value) != column_.end();
+}
+
+inline bool Set_column::is_empty()
+{
+    return column_.empty();
+}
+
+inline dimension_type Set_column::get_dimension() const
+{
+    return dim_;
+}
+
+inline int Set_column::get_pivot()
+{
+    if (column_.empty()) return -1;
+    return *(column_.rbegin());
+}
+
+inline void Set_column::clear()
+{
+    column_.clear();
+}
+
+inline void Set_column::clear(unsigned int value)
+{
+    column_.erase(value);
+}
+
+inline void Set_column::reorder(std::vector<index> &valueMap)
+{
+    std::set<unsigned int> newSet;
+    for (const unsigned int& v : column_) newSet.insert(valueMap.at(v));
+    column_.swap(newSet);
+}
+
+inline void Set_column::add(Set_column &column)
+{
+    for (const unsigned int& v : column.column_){
+        if (column_.find(v) != column_.end())
+            column_.erase(v);
+        else
+            column_.insert(v);
+    }
+}
+
+inline Set_column &Set_column::operator=(Set_column other)
+{
+    std::swap(dim_, other.dim_);
+    std::swap(column_, other.column_);
+    return *this;
+}
+
+inline void swap(Set_column& col1, Set_column& col2)
+{
+    std::swap(col1.dim_, col2.dim_);
+    col1.column_.swap(col2.column_);
+}
+
+}   //namespace Vineyard
+
+#endif // SETCOLUMN_H

multipers/multiparameter_module_approximation/structure_higher_dim_barcode.h

@@ -1,36 +1,36 @@
-/*    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 structure_higher_dim_barcode.h
- * @author David Loiseaux, Hannah Schreiber
- * @brief Structures to handle higher dimensional persistence.
- */
-
-#ifndef STRUCTURE_HIGHER_DIM_BARCODE_H_INCLUDED
-#define STRUCTURE_HIGHER_DIM_BARCODE_H_INCLUDED
-
-#include <vector>
-
-unsigned int get_index_from_position_and_size(
-        const std::vector<unsigned int> &position,
-        const std::vector<unsigned int> &size)
-{
-    unsigned int indice = 0;
-    assert(position.size() == size.size() &&
-           "Position and Size vector must be of the same size !");
-    unsigned int last_product = 1;
-    for (unsigned int i = 0; i < position.size(); i++){
-        indice += last_product * position[i];
-        last_product *= size[i];
-    }
-    return indice;
-}
-
-#endif // STRUCTURE_HIGHER_DIM_BARCODE_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 structure_higher_dim_barcode.h
+ * @author David Loiseaux, Hannah Schreiber
+ * @brief Structures to handle higher dimensional persistence.
+ */
+
+#ifndef STRUCTURE_HIGHER_DIM_BARCODE_H_INCLUDED
+#define STRUCTURE_HIGHER_DIM_BARCODE_H_INCLUDED
+
+#include <vector>
+
+unsigned int get_index_from_position_and_size(
+        const std::vector<unsigned int> &position,
+        const std::vector<unsigned int> &size)
+{
+    unsigned int indice = 0;
+    assert(position.size() == size.size() &&
+           "Position and Size vector must be of the same size !");
+    unsigned int last_product = 1;
+    for (unsigned int i = 0; i < position.size(); i++){
+        indice += last_product * position[i];
+        last_product *= size[i];
+    }
+    return indice;
+}
+
+#endif // STRUCTURE_HIGHER_DIM_BARCODE_H_INCLUDED

multipers/multiparameter_module_approximation/unordered_set_column.h

@@ -1,166 +1,166 @@
-/*    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):       Hannah Schreiber
- *
- *    Copyright (C) 2022 Inria
- *
- *    Modification(s):
- *      - YYYY/MM Author: Description of the modification
- */
-
-#ifndef UNORDEREDSETCOLUMN_H
-#define UNORDEREDSETCOLUMN_H
-
-#include <iostream>
-#include <list>
-#include <unordered_set>
-#include <algorithm>
-
-#include "utilities.h"
-
-namespace Vineyard {
-
-class Unordered_set_column
-{
-public:
-    Unordered_set_column();
-    Unordered_set_column(boundary_type& boundary);
-    Unordered_set_column(Unordered_set_column& column);
-    Unordered_set_column(Unordered_set_column&& column) noexcept;
-
-    void get_content(boundary_type& container);
-    bool contains(unsigned int value) const;
-    bool is_empty();
-    dimension_type get_dimension() const;
-    int get_pivot();
-    void clear();
-    void clear(unsigned int value);
-    void reorder(std::vector<index>& valueMap);
-    void add(Unordered_set_column& column);
-
-    Unordered_set_column& operator=(Unordered_set_column other);
-
-    friend void swap(Unordered_set_column& col1, Unordered_set_column& col2);
-
-private:
-    int dim_;
-    std::unordered_set<unsigned int> column_;
-    bool pivotChanged_;
-    int pivot_;
-};
-
-inline Unordered_set_column::Unordered_set_column()
-    : dim_(0), pivotChanged_(false), pivot_(-1)
-{}
-
-inline Unordered_set_column::Unordered_set_column(boundary_type &boundary)
-    : dim_(boundary.size() == 0 ? 0 : boundary.size() - 1),
-      column_(boundary.begin(), boundary.end()),
-      pivotChanged_(false),
-      pivot_(boundary.size() == 0 ? -1 : *std::max_element(boundary.begin(), boundary.end()))
-{}
-
-inline Unordered_set_column::Unordered_set_column(Unordered_set_column &column)
-    : dim_(column.dim_),
-      column_(column.column_),
-      pivotChanged_(column.pivotChanged_),
-      pivot_(column.pivot_)
-{}
-
-inline Unordered_set_column::Unordered_set_column(Unordered_set_column &&column) noexcept
-    : dim_(std::exchange(column.dim_, 0)),
-      column_(std::move(column.column_)),
-      pivotChanged_(std::exchange(column.pivotChanged_, 0)),
-      pivot_(std::exchange(column.pivot_, 0))
-{}
-
-inline void Unordered_set_column::get_content(boundary_type &container)
-{
-    std::copy(column_.begin(), column_.end(), std::back_inserter(container));
-    std::sort(container.begin(), container.end());
-}
-
-inline bool Unordered_set_column::contains(unsigned int value) const
-{
-    return column_.find(value) != column_.end();
-}
-
-inline bool Unordered_set_column::is_empty()
-{
-    return column_.empty();
-}
-
-inline dimension_type Unordered_set_column::get_dimension() const
-{
-    return dim_;
-}
-
-inline int Unordered_set_column::get_pivot()
-{
-    if (pivotChanged_){
-        pivot_ = column_.size() == 0 ?
-                    -1
-                  : *std::max_element(column_.begin(), column_.end());
-        pivotChanged_ = false;
-    }
-
-    return pivot_;
-}
-
-inline void Unordered_set_column::clear()
-{
-    column_.clear();
-    pivot_ = -1;
-    pivotChanged_ = false;
-}
-
-inline void Unordered_set_column::clear(unsigned int value)
-{
-    column_.erase(value);
-    if (static_cast<int>(value) == pivot_) pivotChanged_ = true;
-}
-
-inline void Unordered_set_column::reorder(std::vector<index> &valueMap)
-{
-    std::unordered_set<unsigned int> newSet;
-    for (const unsigned int& v : column_) newSet.insert(valueMap.at(v));
-    column_.swap(newSet);
-    pivotChanged_ = true;
-}
-
-inline void Unordered_set_column::add(Unordered_set_column &column)
-{
-    for (const unsigned int& v : column.column_){
-        if (column_.find(v) != column_.end()){
-            column_.erase(v);
-            if (static_cast<int>(v) == pivot_) pivotChanged_ = true;
-        } else {
-            column_.insert(v);
-            if (static_cast<int>(v) > pivot_){
-                pivot_ = v;
-                pivotChanged_ = false;
-            }
-        }
-    }
-}
-
-inline Unordered_set_column &Unordered_set_column::operator=(Unordered_set_column other)
-{
-    std::swap(dim_, other.dim_);
-    std::swap(column_, other.column_);
-    std::swap(pivotChanged_, other.pivotChanged_);
-    std::swap(pivot_, other.pivot_);
-    return *this;
-}
-
-inline void swap(Unordered_set_column& col1, Unordered_set_column& col2)
-{
-    std::swap(col1.dim_, col2.dim_);
-    col1.column_.swap(col2.column_);
-    std::swap(col1.pivotChanged_, col2.pivotChanged_);
-    std::swap(col1.pivot_, col2.pivot_);
-}
-
-}   //namespace Vineyard
-
-#endif // UNORDEREDSETCOLUMN_H
+/*    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):       Hannah Schreiber
+ *
+ *    Copyright (C) 2022 Inria
+ *
+ *    Modification(s):
+ *      - YYYY/MM Author: Description of the modification
+ */
+
+#ifndef UNORDEREDSETCOLUMN_H
+#define UNORDEREDSETCOLUMN_H
+
+#include <iostream>
+#include <list>
+#include <unordered_set>
+#include <algorithm>
+
+#include "utilities.h"
+
+namespace Vineyard {
+
+class Unordered_set_column
+{
+public:
+    Unordered_set_column();
+    Unordered_set_column(boundary_type& boundary);
+    Unordered_set_column(Unordered_set_column& column);
+    Unordered_set_column(Unordered_set_column&& column) noexcept;
+
+    void get_content(boundary_type& container);
+    bool contains(unsigned int value) const;
+    bool is_empty();
+    dimension_type get_dimension() const;
+    int get_pivot();
+    void clear();
+    void clear(unsigned int value);
+    void reorder(std::vector<index>& valueMap);
+    void add(Unordered_set_column& column);
+
+    Unordered_set_column& operator=(Unordered_set_column other);
+
+    friend void swap(Unordered_set_column& col1, Unordered_set_column& col2);
+
+private:
+    int dim_;
+    std::unordered_set<unsigned int> column_;
+    bool pivotChanged_;
+    int pivot_;
+};
+
+inline Unordered_set_column::Unordered_set_column()
+    : dim_(0), pivotChanged_(false), pivot_(-1)
+{}
+
+inline Unordered_set_column::Unordered_set_column(boundary_type &boundary)
+    : dim_(boundary.size() == 0 ? 0 : boundary.size() - 1),
+      column_(boundary.begin(), boundary.end()),
+      pivotChanged_(false),
+      pivot_(boundary.size() == 0 ? -1 : *std::max_element(boundary.begin(), boundary.end()))
+{}
+
+inline Unordered_set_column::Unordered_set_column(Unordered_set_column &column)
+    : dim_(column.dim_),
+      column_(column.column_),
+      pivotChanged_(column.pivotChanged_),
+      pivot_(column.pivot_)
+{}
+
+inline Unordered_set_column::Unordered_set_column(Unordered_set_column &&column) noexcept
+    : dim_(std::exchange(column.dim_, 0)),
+      column_(std::move(column.column_)),
+      pivotChanged_(std::exchange(column.pivotChanged_, 0)),
+      pivot_(std::exchange(column.pivot_, 0))
+{}
+
+inline void Unordered_set_column::get_content(boundary_type &container)
+{
+    std::copy(column_.begin(), column_.end(), std::back_inserter(container));
+    std::sort(container.begin(), container.end());
+}
+
+inline bool Unordered_set_column::contains(unsigned int value) const
+{
+    return column_.find(value) != column_.end();
+}
+
+inline bool Unordered_set_column::is_empty()
+{
+    return column_.empty();
+}
+
+inline dimension_type Unordered_set_column::get_dimension() const
+{
+    return dim_;
+}
+
+inline int Unordered_set_column::get_pivot()
+{
+    if (pivotChanged_){
+        pivot_ = column_.size() == 0 ?
+                    -1
+                  : *std::max_element(column_.begin(), column_.end());
+        pivotChanged_ = false;
+    }
+
+    return pivot_;
+}
+
+inline void Unordered_set_column::clear()
+{
+    column_.clear();
+    pivot_ = -1;
+    pivotChanged_ = false;
+}
+
+inline void Unordered_set_column::clear(unsigned int value)
+{
+    column_.erase(value);
+    if (static_cast<int>(value) == pivot_) pivotChanged_ = true;
+}
+
+inline void Unordered_set_column::reorder(std::vector<index> &valueMap)
+{
+    std::unordered_set<unsigned int> newSet;
+    for (const unsigned int& v : column_) newSet.insert(valueMap.at(v));
+    column_.swap(newSet);
+    pivotChanged_ = true;
+}
+
+inline void Unordered_set_column::add(Unordered_set_column &column)
+{
+    for (const unsigned int& v : column.column_){
+        if (column_.find(v) != column_.end()){
+            column_.erase(v);
+            if (static_cast<int>(v) == pivot_) pivotChanged_ = true;
+        } else {
+            column_.insert(v);
+            if (static_cast<int>(v) > pivot_){
+                pivot_ = v;
+                pivotChanged_ = false;
+            }
+        }
+    }
+}
+
+inline Unordered_set_column &Unordered_set_column::operator=(Unordered_set_column other)
+{
+    std::swap(dim_, other.dim_);
+    std::swap(column_, other.column_);
+    std::swap(pivotChanged_, other.pivotChanged_);
+    std::swap(pivot_, other.pivot_);
+    return *this;
+}
+
+inline void swap(Unordered_set_column& col1, Unordered_set_column& col2)
+{
+    std::swap(col1.dim_, col2.dim_);
+    col1.column_.swap(col2.column_);
+    std::swap(col1.pivotChanged_, col2.pivotChanged_);
+    std::swap(col1.pivot_, col2.pivot_);
+}
+
+}   //namespace Vineyard
+
+#endif // UNORDEREDSETCOLUMN_H