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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of multipers might be problematic. Click here for more details.

Files changed (182) hide show
  1. multipers/__init__.py +33 -31
  2. multipers/_signed_measure_meta.py +430 -430
  3. multipers/_slicer_meta.py +211 -212
  4. multipers/data/MOL2.py +458 -458
  5. multipers/data/UCR.py +18 -18
  6. multipers/data/graphs.py +466 -466
  7. multipers/data/immuno_regions.py +27 -27
  8. multipers/data/pytorch2simplextree.py +90 -90
  9. multipers/data/shape3d.py +101 -101
  10. multipers/data/synthetic.py +113 -111
  11. multipers/distances.py +198 -198
  12. multipers/filtration_conversions.pxd.tp +84 -84
  13. multipers/filtrations/__init__.py +18 -0
  14. multipers/filtrations/filtrations.py +289 -0
  15. multipers/filtrations.pxd +224 -224
  16. multipers/function_rips.cp311-win_amd64.pyd +0 -0
  17. multipers/function_rips.pyx +105 -105
  18. multipers/grids.cp311-win_amd64.pyd +0 -0
  19. multipers/grids.pyx +350 -350
  20. multipers/gudhi/Persistence_slices_interface.h +132 -132
  21. multipers/gudhi/Simplex_tree_interface.h +239 -245
  22. multipers/gudhi/Simplex_tree_multi_interface.h +516 -561
  23. multipers/gudhi/cubical_to_boundary.h +59 -59
  24. multipers/gudhi/gudhi/Bitmap_cubical_complex.h +450 -450
  25. multipers/gudhi/gudhi/Bitmap_cubical_complex_base.h +1070 -1070
  26. multipers/gudhi/gudhi/Bitmap_cubical_complex_periodic_boundary_conditions_base.h +579 -579
  27. multipers/gudhi/gudhi/Debug_utils.h +45 -45
  28. multipers/gudhi/gudhi/Fields/Multi_field.h +484 -484
  29. multipers/gudhi/gudhi/Fields/Multi_field_operators.h +455 -455
  30. multipers/gudhi/gudhi/Fields/Multi_field_shared.h +450 -450
  31. multipers/gudhi/gudhi/Fields/Multi_field_small.h +531 -531
  32. multipers/gudhi/gudhi/Fields/Multi_field_small_operators.h +507 -507
  33. multipers/gudhi/gudhi/Fields/Multi_field_small_shared.h +531 -531
  34. multipers/gudhi/gudhi/Fields/Z2_field.h +355 -355
  35. multipers/gudhi/gudhi/Fields/Z2_field_operators.h +376 -376
  36. multipers/gudhi/gudhi/Fields/Zp_field.h +420 -420
  37. multipers/gudhi/gudhi/Fields/Zp_field_operators.h +400 -400
  38. multipers/gudhi/gudhi/Fields/Zp_field_shared.h +418 -418
  39. multipers/gudhi/gudhi/Flag_complex_edge_collapser.h +337 -337
  40. multipers/gudhi/gudhi/Matrix.h +2107 -2107
  41. multipers/gudhi/gudhi/Multi_critical_filtration.h +1038 -1038
  42. multipers/gudhi/gudhi/Multi_persistence/Box.h +171 -171
  43. multipers/gudhi/gudhi/Multi_persistence/Line.h +282 -282
  44. multipers/gudhi/gudhi/Off_reader.h +173 -173
  45. multipers/gudhi/gudhi/One_critical_filtration.h +1432 -1431
  46. multipers/gudhi/gudhi/Persistence_matrix/Base_matrix.h +769 -769
  47. multipers/gudhi/gudhi/Persistence_matrix/Base_matrix_with_column_compression.h +686 -686
  48. multipers/gudhi/gudhi/Persistence_matrix/Boundary_matrix.h +842 -842
  49. multipers/gudhi/gudhi/Persistence_matrix/Chain_matrix.h +1350 -1350
  50. multipers/gudhi/gudhi/Persistence_matrix/Id_to_index_overlay.h +1105 -1105
  51. multipers/gudhi/gudhi/Persistence_matrix/Position_to_index_overlay.h +859 -859
  52. multipers/gudhi/gudhi/Persistence_matrix/RU_matrix.h +910 -910
  53. multipers/gudhi/gudhi/Persistence_matrix/allocators/entry_constructors.h +139 -139
  54. multipers/gudhi/gudhi/Persistence_matrix/base_pairing.h +230 -230
  55. multipers/gudhi/gudhi/Persistence_matrix/base_swap.h +211 -211
  56. multipers/gudhi/gudhi/Persistence_matrix/boundary_cell_position_to_id_mapper.h +60 -60
  57. multipers/gudhi/gudhi/Persistence_matrix/boundary_face_position_to_id_mapper.h +60 -60
  58. multipers/gudhi/gudhi/Persistence_matrix/chain_pairing.h +136 -136
  59. multipers/gudhi/gudhi/Persistence_matrix/chain_rep_cycles.h +190 -190
  60. multipers/gudhi/gudhi/Persistence_matrix/chain_vine_swap.h +616 -616
  61. multipers/gudhi/gudhi/Persistence_matrix/columns/chain_column_extra_properties.h +150 -150
  62. multipers/gudhi/gudhi/Persistence_matrix/columns/column_dimension_holder.h +106 -106
  63. multipers/gudhi/gudhi/Persistence_matrix/columns/column_utilities.h +219 -219
  64. multipers/gudhi/gudhi/Persistence_matrix/columns/entry_types.h +327 -327
  65. multipers/gudhi/gudhi/Persistence_matrix/columns/heap_column.h +1140 -1140
  66. multipers/gudhi/gudhi/Persistence_matrix/columns/intrusive_list_column.h +934 -934
  67. multipers/gudhi/gudhi/Persistence_matrix/columns/intrusive_set_column.h +934 -934
  68. multipers/gudhi/gudhi/Persistence_matrix/columns/list_column.h +980 -980
  69. multipers/gudhi/gudhi/Persistence_matrix/columns/naive_vector_column.h +1092 -1092
  70. multipers/gudhi/gudhi/Persistence_matrix/columns/row_access.h +192 -192
  71. multipers/gudhi/gudhi/Persistence_matrix/columns/set_column.h +921 -921
  72. multipers/gudhi/gudhi/Persistence_matrix/columns/small_vector_column.h +1093 -1093
  73. multipers/gudhi/gudhi/Persistence_matrix/columns/unordered_set_column.h +1012 -1012
  74. multipers/gudhi/gudhi/Persistence_matrix/columns/vector_column.h +1244 -1244
  75. multipers/gudhi/gudhi/Persistence_matrix/matrix_dimension_holders.h +186 -186
  76. multipers/gudhi/gudhi/Persistence_matrix/matrix_row_access.h +164 -164
  77. multipers/gudhi/gudhi/Persistence_matrix/ru_pairing.h +156 -156
  78. multipers/gudhi/gudhi/Persistence_matrix/ru_rep_cycles.h +376 -376
  79. multipers/gudhi/gudhi/Persistence_matrix/ru_vine_swap.h +540 -540
  80. multipers/gudhi/gudhi/Persistent_cohomology/Field_Zp.h +118 -118
  81. multipers/gudhi/gudhi/Persistent_cohomology/Multi_field.h +173 -173
  82. multipers/gudhi/gudhi/Persistent_cohomology/Persistent_cohomology_column.h +128 -128
  83. multipers/gudhi/gudhi/Persistent_cohomology.h +745 -745
  84. multipers/gudhi/gudhi/Points_off_io.h +171 -171
  85. multipers/gudhi/gudhi/Simple_object_pool.h +69 -69
  86. multipers/gudhi/gudhi/Simplex_tree/Simplex_tree_iterators.h +463 -463
  87. multipers/gudhi/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h +83 -83
  88. multipers/gudhi/gudhi/Simplex_tree/Simplex_tree_siblings.h +106 -106
  89. multipers/gudhi/gudhi/Simplex_tree/Simplex_tree_star_simplex_iterators.h +277 -277
  90. multipers/gudhi/gudhi/Simplex_tree/hooks_simplex_base.h +62 -62
  91. multipers/gudhi/gudhi/Simplex_tree/indexing_tag.h +27 -27
  92. multipers/gudhi/gudhi/Simplex_tree/serialization_utils.h +62 -62
  93. multipers/gudhi/gudhi/Simplex_tree/simplex_tree_options.h +157 -157
  94. multipers/gudhi/gudhi/Simplex_tree.h +2794 -2794
  95. multipers/gudhi/gudhi/Simplex_tree_multi.h +152 -163
  96. multipers/gudhi/gudhi/distance_functions.h +62 -62
  97. multipers/gudhi/gudhi/graph_simplicial_complex.h +104 -104
  98. multipers/gudhi/gudhi/persistence_interval.h +253 -253
  99. multipers/gudhi/gudhi/persistence_matrix_options.h +170 -170
  100. multipers/gudhi/gudhi/reader_utils.h +367 -367
  101. multipers/gudhi/mma_interface_coh.h +256 -255
  102. multipers/gudhi/mma_interface_h0.h +223 -231
  103. multipers/gudhi/mma_interface_matrix.h +284 -282
  104. multipers/gudhi/naive_merge_tree.h +536 -575
  105. multipers/gudhi/scc_io.h +310 -289
  106. multipers/gudhi/truc.h +890 -888
  107. multipers/io.cp311-win_amd64.pyd +0 -0
  108. multipers/io.pyx +711 -711
  109. multipers/ml/accuracies.py +90 -90
  110. multipers/ml/convolutions.py +520 -520
  111. multipers/ml/invariants_with_persistable.py +79 -79
  112. multipers/ml/kernels.py +176 -176
  113. multipers/ml/mma.py +713 -714
  114. multipers/ml/one.py +472 -472
  115. multipers/ml/point_clouds.py +352 -346
  116. multipers/ml/signed_measures.py +1589 -1589
  117. multipers/ml/sliced_wasserstein.py +461 -461
  118. multipers/ml/tools.py +113 -113
  119. multipers/mma_structures.cp311-win_amd64.pyd +0 -0
  120. multipers/mma_structures.pxd +127 -127
  121. multipers/mma_structures.pyx +4 -4
  122. multipers/mma_structures.pyx.tp +1085 -1085
  123. multipers/multi_parameter_rank_invariant/diff_helpers.h +84 -93
  124. multipers/multi_parameter_rank_invariant/euler_characteristic.h +97 -97
  125. multipers/multi_parameter_rank_invariant/function_rips.h +322 -322
  126. multipers/multi_parameter_rank_invariant/hilbert_function.h +769 -769
  127. multipers/multi_parameter_rank_invariant/persistence_slices.h +148 -148
  128. multipers/multi_parameter_rank_invariant/rank_invariant.h +369 -369
  129. multipers/multiparameter_edge_collapse.py +41 -41
  130. multipers/multiparameter_module_approximation/approximation.h +2296 -2295
  131. multipers/multiparameter_module_approximation/combinatory.h +129 -129
  132. multipers/multiparameter_module_approximation/debug.h +107 -107
  133. multipers/multiparameter_module_approximation/format_python-cpp.h +286 -286
  134. multipers/multiparameter_module_approximation/heap_column.h +238 -238
  135. multipers/multiparameter_module_approximation/images.h +79 -79
  136. multipers/multiparameter_module_approximation/list_column.h +174 -174
  137. multipers/multiparameter_module_approximation/list_column_2.h +232 -232
  138. multipers/multiparameter_module_approximation/ru_matrix.h +347 -347
  139. multipers/multiparameter_module_approximation/set_column.h +135 -135
  140. multipers/multiparameter_module_approximation/structure_higher_dim_barcode.h +36 -36
  141. multipers/multiparameter_module_approximation/unordered_set_column.h +166 -166
  142. multipers/multiparameter_module_approximation/utilities.h +403 -419
  143. multipers/multiparameter_module_approximation/vector_column.h +223 -223
  144. multipers/multiparameter_module_approximation/vector_matrix.h +331 -331
  145. multipers/multiparameter_module_approximation/vineyards.h +464 -464
  146. multipers/multiparameter_module_approximation/vineyards_trajectories.h +649 -649
  147. multipers/multiparameter_module_approximation.cp311-win_amd64.pyd +0 -0
  148. multipers/multiparameter_module_approximation.pyx +216 -217
  149. multipers/pickle.py +90 -53
  150. multipers/plots.py +342 -334
  151. multipers/point_measure.cp311-win_amd64.pyd +0 -0
  152. multipers/point_measure.pyx +322 -320
  153. multipers/simplex_tree_multi.cp311-win_amd64.pyd +0 -0
  154. multipers/simplex_tree_multi.pxd +133 -133
  155. multipers/simplex_tree_multi.pyx +18 -15
  156. multipers/simplex_tree_multi.pyx.tp +1939 -1935
  157. multipers/slicer.cp311-win_amd64.pyd +0 -0
  158. multipers/slicer.pxd +81 -20
  159. multipers/slicer.pxd.tp +215 -214
  160. multipers/slicer.pyx +1091 -308
  161. multipers/slicer.pyx.tp +924 -914
  162. multipers/tensor/tensor.h +672 -672
  163. multipers/tensor.pxd +13 -13
  164. multipers/test.pyx +44 -44
  165. multipers/tests/__init__.py +57 -57
  166. multipers/torch/diff_grids.py +217 -217
  167. multipers/torch/rips_density.py +310 -304
  168. {multipers-2.2.3.dist-info → multipers-2.3.0.dist-info}/LICENSE +21 -21
  169. {multipers-2.2.3.dist-info → multipers-2.3.0.dist-info}/METADATA +21 -11
  170. multipers-2.3.0.dist-info/RECORD +182 -0
  171. multipers/tests/test_diff_helper.py +0 -73
  172. multipers/tests/test_hilbert_function.py +0 -82
  173. multipers/tests/test_mma.py +0 -83
  174. multipers/tests/test_point_clouds.py +0 -49
  175. multipers/tests/test_python-cpp_conversion.py +0 -82
  176. multipers/tests/test_signed_betti.py +0 -181
  177. multipers/tests/test_signed_measure.py +0 -89
  178. multipers/tests/test_simplextreemulti.py +0 -221
  179. multipers/tests/test_slicer.py +0 -221
  180. multipers-2.2.3.dist-info/RECORD +0 -189
  181. {multipers-2.2.3.dist-info → multipers-2.3.0.dist-info}/WHEEL +0 -0
  182. {multipers-2.2.3.dist-info → multipers-2.3.0.dist-info}/top_level.txt +0 -0
@@ -1,211 +1,211 @@
1
- /* This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT.
2
- * See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details.
3
- * Author(s): Hannah Schreiber
4
- *
5
- * Copyright (C) 2022-23 Inria
6
- *
7
- * Modification(s):
8
- * - YYYY/MM Author: Description of the modification
9
- */
10
-
11
- /**
12
- * @file base_swap.h
13
- * @author Hannah Schreiber
14
- * @brief Contains the @ref Gudhi::persistence_matrix::Base_swap class and
15
- * @ref Gudhi::persistence_matrix::Dummy_base_swap structure.
16
- */
17
-
18
- #ifndef PM_BASE_SWAP_H
19
- #define PM_BASE_SWAP_H
20
-
21
- #include <utility> //std::swap, std::move & std::exchange
22
- #include <algorithm> //std::max
23
-
24
- namespace Gudhi {
25
- namespace persistence_matrix {
26
-
27
- /**
28
- * @ingroup persistence_matrix
29
- *
30
- * @brief Empty structure.
31
- * Inherited instead of @ref Base_swap, when the column and row swaps are not enabled.
32
- */
33
- struct Dummy_base_swap {
34
- friend void swap([[maybe_unused]] Dummy_base_swap& d1, [[maybe_unused]] Dummy_base_swap& d2) {}
35
-
36
- Dummy_base_swap([[maybe_unused]] unsigned int numberOfColumns = 0) {}
37
- };
38
-
39
- /**
40
- * @class Base_swap base_swap.h gudhi/Persistence_matrix/base_swap.h
41
- * @ingroup persistence_matrix
42
- *
43
- * @brief Class managing the column and row swaps in @ref Base_matrix and @ref Boundary_matrix.
44
- *
45
- * @tparam Master_matrix An instantiation of @ref Matrix from which all types and options are deduced.
46
- * @tparam Base_matrix Either @ref Base_matrix or @ref Boundary_matrix.
47
- */
48
- template <class Master_matrix, class Base_matrix>
49
- class Base_swap {
50
- public:
51
- using Column_container = typename Master_matrix::Column_container; /**< Column container type. */
52
- using Index = typename Master_matrix::Index; /**< Container index type. */
53
- using ID_index = typename Master_matrix::ID_index; /**< @ref IDIdx index type. */
54
-
55
- /**
56
- * @brief Default constructor.
57
- */
58
- Base_swap();
59
- /**
60
- * @brief As default constructor, but reserves spaces for @p numberOfColumns columns.
61
- *
62
- * @param numberOfColumns Number of columns to reserve space for.
63
- */
64
- Base_swap(unsigned int numberOfColumns);
65
- /**
66
- * @brief Copy constructor.
67
- *
68
- * @param matrixToCopy Matrix to copy.
69
- */
70
- Base_swap(const Base_swap& matrixToCopy) = default;
71
- /**
72
- * @brief Move constructor.
73
- *
74
- * @param other Matrix to move.
75
- */
76
- Base_swap(Base_swap&& other) noexcept;
77
-
78
- /**
79
- * @brief Swaps the two columns at given indices in the column container. Does not updates the column index value,
80
- * potentially stored in the entries. This will be done when calling `_orderRows()`.
81
- *
82
- * @param columnIndex1 First @ref MatIdx column index.
83
- * @param columnIndex2 Second @ref MatIdx column index.
84
- */
85
- void swap_columns(Index columnIndex1, Index columnIndex2);
86
- /**
87
- * @brief Swaps the two rows at the given indices, but in a lazy manner. That is, the swap is registered but not
88
- * executed. The reordering will be done when calling `_orderRows()`.
89
- *
90
- * @param rowIndex1 First row index.
91
- * @param rowIndex2 Second row index.
92
- */
93
- void swap_rows(ID_index rowIndex1, ID_index rowIndex2);
94
-
95
- /**
96
- * @brief Assign operator.
97
- */
98
- Base_swap& operator=(Base_swap other);
99
- /**
100
- * @brief Swap operator.
101
- */
102
- friend void swap(Base_swap& base1, Base_swap& base2) {
103
- base1.indexToRow_.swap(base2.indexToRow_);
104
- base1.rowToIndex_.swap(base2.rowToIndex_);
105
- std::swap(base1.rowSwapped_, base2.rowSwapped_);
106
- }
107
-
108
- protected:
109
- using Index_dictionary = typename Master_matrix::template Dictionary<Index>;
110
- using Row_dictionary = typename Master_matrix::template Dictionary<ID_index>;
111
-
112
- Index_dictionary indexToRow_; /**< Map from row index to actual index in row container. */
113
- Row_dictionary rowToIndex_; /**< Map from index in row container to "public" row index. */
114
- bool rowSwapped_; /**< True if any rows were swapped since last call to `_orderRows()`. */
115
-
116
- void _orderRows();
117
-
118
- //access to inheriting matrix class
119
- constexpr Base_matrix* _matrix() { return static_cast<Base_matrix*>(this); }
120
- constexpr const Base_matrix* _matrix() const { return static_cast<const Base_matrix*>(this); }
121
- };
122
-
123
- template <class Master_matrix, class Base_matrix>
124
- inline Base_swap<Master_matrix, Base_matrix>::Base_swap() : rowSwapped_(false)
125
- {}
126
-
127
- template <class Master_matrix, class Base_matrix>
128
- inline Base_swap<Master_matrix, Base_matrix>::Base_swap(unsigned int numberOfColumns)
129
- : indexToRow_(numberOfColumns), rowToIndex_(numberOfColumns), rowSwapped_(false)
130
- {
131
- for (Index i = 0; i < numberOfColumns; i++) {
132
- indexToRow_[i] = i;
133
- rowToIndex_[i] = i;
134
- }
135
- }
136
-
137
- template <class Master_matrix, class Base_matrix>
138
- inline Base_swap<Master_matrix, Base_matrix>::Base_swap(Base_swap&& other) noexcept
139
- : indexToRow_(std::move(other.indexToRow_)),
140
- rowToIndex_(std::move(other.rowToIndex_)),
141
- rowSwapped_(std::exchange(other.rowSwapped_, 0))
142
- {}
143
-
144
- template <class Master_matrix, class Base_matrix>
145
- inline void Base_swap<Master_matrix, Base_matrix>::swap_columns(Index columnIndex1, Index columnIndex2)
146
- {
147
- swap(_matrix()->matrix_.at(columnIndex1), _matrix()->matrix_.at(columnIndex2));
148
- if constexpr (Master_matrix::Option_list::has_row_access) rowSwapped_ = true; //to update column index in entries.
149
- }
150
-
151
- template <class Master_matrix, class Base_matrix>
152
- inline void Base_swap<Master_matrix, Base_matrix>::swap_rows(ID_index rowIndex1, ID_index rowIndex2)
153
- {
154
- rowSwapped_ = true;
155
-
156
- if constexpr (Master_matrix::Option_list::has_map_column_container) {
157
- auto it1 = indexToRow_.find(rowIndex1);
158
- auto it2 = indexToRow_.find(rowIndex2);
159
-
160
- if (it1 == indexToRow_.end() && it2 == indexToRow_.end()) return;
161
-
162
- if (it1 == indexToRow_.end()) {
163
- indexToRow_.emplace(rowIndex1, it2->second);
164
- rowToIndex_.at(it2->second) = rowIndex1;
165
- indexToRow_.erase(it2->second);
166
- return;
167
- }
168
-
169
- if (it2 == indexToRow_.end()) {
170
- indexToRow_.emplace(rowIndex2, it1->second);
171
- rowToIndex_.at(it1->second) = rowIndex2;
172
- indexToRow_.erase(it1);
173
- return;
174
- }
175
-
176
- std::swap(rowToIndex_.at(it1->second), rowToIndex_.at(it2->second));
177
- std::swap(it1->second, it2->second);
178
- } else {
179
- for (auto i = indexToRow_.size(); i <= std::max(rowIndex1, rowIndex2); ++i) indexToRow_.push_back(i);
180
-
181
- std::swap(rowToIndex_[indexToRow_[rowIndex1]], rowToIndex_[indexToRow_[rowIndex2]]);
182
- std::swap(indexToRow_[rowIndex1], indexToRow_[rowIndex2]);
183
- }
184
- }
185
-
186
- template <class Master_matrix, class Base_matrix>
187
- inline Base_swap<Master_matrix, Base_matrix>& Base_swap<Master_matrix, Base_matrix>::operator=(Base_swap other)
188
- {
189
- indexToRow_.swap(other.indexToRow_);
190
- rowToIndex_.swap(other.rowToIndex_);
191
- std::swap(rowSwapped_, other.rowSwapped_);
192
- return *this;
193
- }
194
-
195
- template <class Master_matrix, class Base_matrix>
196
- inline void Base_swap<Master_matrix, Base_matrix>::_orderRows()
197
- {
198
- for (unsigned int i = 0; i < _matrix()->get_number_of_columns(); i++) {
199
- _matrix()->matrix_.at(i).reorder(rowToIndex_, i);
200
- }
201
- for (Index i = 0; i < _matrix()->get_number_of_columns(); i++) {
202
- indexToRow_[i] = i;
203
- rowToIndex_[i] = i;
204
- }
205
- rowSwapped_ = false;
206
- }
207
-
208
- } // namespace persistence_matrix
209
- } // namespace Gudhi
210
-
211
- #endif // PM_BASE_SWAP_H
1
+ /* This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT.
2
+ * See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details.
3
+ * Author(s): Hannah Schreiber
4
+ *
5
+ * Copyright (C) 2022-23 Inria
6
+ *
7
+ * Modification(s):
8
+ * - YYYY/MM Author: Description of the modification
9
+ */
10
+
11
+ /**
12
+ * @file base_swap.h
13
+ * @author Hannah Schreiber
14
+ * @brief Contains the @ref Gudhi::persistence_matrix::Base_swap class and
15
+ * @ref Gudhi::persistence_matrix::Dummy_base_swap structure.
16
+ */
17
+
18
+ #ifndef PM_BASE_SWAP_H
19
+ #define PM_BASE_SWAP_H
20
+
21
+ #include <utility> //std::swap, std::move & std::exchange
22
+ #include <algorithm> //std::max
23
+
24
+ namespace Gudhi {
25
+ namespace persistence_matrix {
26
+
27
+ /**
28
+ * @ingroup persistence_matrix
29
+ *
30
+ * @brief Empty structure.
31
+ * Inherited instead of @ref Base_swap, when the column and row swaps are not enabled.
32
+ */
33
+ struct Dummy_base_swap {
34
+ friend void swap([[maybe_unused]] Dummy_base_swap& d1, [[maybe_unused]] Dummy_base_swap& d2) {}
35
+
36
+ Dummy_base_swap([[maybe_unused]] unsigned int numberOfColumns = 0) {}
37
+ };
38
+
39
+ /**
40
+ * @class Base_swap base_swap.h gudhi/Persistence_matrix/base_swap.h
41
+ * @ingroup persistence_matrix
42
+ *
43
+ * @brief Class managing the column and row swaps in @ref Base_matrix and @ref Boundary_matrix.
44
+ *
45
+ * @tparam Master_matrix An instantiation of @ref Matrix from which all types and options are deduced.
46
+ * @tparam Base_matrix Either @ref Base_matrix or @ref Boundary_matrix.
47
+ */
48
+ template <class Master_matrix, class Base_matrix>
49
+ class Base_swap {
50
+ public:
51
+ using Column_container = typename Master_matrix::Column_container; /**< Column container type. */
52
+ using Index = typename Master_matrix::Index; /**< Container index type. */
53
+ using ID_index = typename Master_matrix::ID_index; /**< @ref IDIdx index type. */
54
+
55
+ /**
56
+ * @brief Default constructor.
57
+ */
58
+ Base_swap();
59
+ /**
60
+ * @brief As default constructor, but reserves spaces for @p numberOfColumns columns.
61
+ *
62
+ * @param numberOfColumns Number of columns to reserve space for.
63
+ */
64
+ Base_swap(unsigned int numberOfColumns);
65
+ /**
66
+ * @brief Copy constructor.
67
+ *
68
+ * @param matrixToCopy Matrix to copy.
69
+ */
70
+ Base_swap(const Base_swap& matrixToCopy) = default;
71
+ /**
72
+ * @brief Move constructor.
73
+ *
74
+ * @param other Matrix to move.
75
+ */
76
+ Base_swap(Base_swap&& other) noexcept;
77
+
78
+ /**
79
+ * @brief Swaps the two columns at given indices in the column container. Does not updates the column index value,
80
+ * potentially stored in the entries. This will be done when calling `_orderRows()`.
81
+ *
82
+ * @param columnIndex1 First @ref MatIdx column index.
83
+ * @param columnIndex2 Second @ref MatIdx column index.
84
+ */
85
+ void swap_columns(Index columnIndex1, Index columnIndex2);
86
+ /**
87
+ * @brief Swaps the two rows at the given indices, but in a lazy manner. That is, the swap is registered but not
88
+ * executed. The reordering will be done when calling `_orderRows()`.
89
+ *
90
+ * @param rowIndex1 First row index.
91
+ * @param rowIndex2 Second row index.
92
+ */
93
+ void swap_rows(ID_index rowIndex1, ID_index rowIndex2);
94
+
95
+ /**
96
+ * @brief Assign operator.
97
+ */
98
+ Base_swap& operator=(Base_swap other);
99
+ /**
100
+ * @brief Swap operator.
101
+ */
102
+ friend void swap(Base_swap& base1, Base_swap& base2) {
103
+ base1.indexToRow_.swap(base2.indexToRow_);
104
+ base1.rowToIndex_.swap(base2.rowToIndex_);
105
+ std::swap(base1.rowSwapped_, base2.rowSwapped_);
106
+ }
107
+
108
+ protected:
109
+ using Index_dictionary = typename Master_matrix::template Dictionary<Index>;
110
+ using Row_dictionary = typename Master_matrix::template Dictionary<ID_index>;
111
+
112
+ Index_dictionary indexToRow_; /**< Map from row index to actual index in row container. */
113
+ Row_dictionary rowToIndex_; /**< Map from index in row container to "public" row index. */
114
+ bool rowSwapped_; /**< True if any rows were swapped since last call to `_orderRows()`. */
115
+
116
+ void _orderRows();
117
+
118
+ //access to inheriting matrix class
119
+ constexpr Base_matrix* _matrix() { return static_cast<Base_matrix*>(this); }
120
+ constexpr const Base_matrix* _matrix() const { return static_cast<const Base_matrix*>(this); }
121
+ };
122
+
123
+ template <class Master_matrix, class Base_matrix>
124
+ inline Base_swap<Master_matrix, Base_matrix>::Base_swap() : rowSwapped_(false)
125
+ {}
126
+
127
+ template <class Master_matrix, class Base_matrix>
128
+ inline Base_swap<Master_matrix, Base_matrix>::Base_swap(unsigned int numberOfColumns)
129
+ : indexToRow_(numberOfColumns), rowToIndex_(numberOfColumns), rowSwapped_(false)
130
+ {
131
+ for (Index i = 0; i < numberOfColumns; i++) {
132
+ indexToRow_[i] = i;
133
+ rowToIndex_[i] = i;
134
+ }
135
+ }
136
+
137
+ template <class Master_matrix, class Base_matrix>
138
+ inline Base_swap<Master_matrix, Base_matrix>::Base_swap(Base_swap&& other) noexcept
139
+ : indexToRow_(std::move(other.indexToRow_)),
140
+ rowToIndex_(std::move(other.rowToIndex_)),
141
+ rowSwapped_(std::exchange(other.rowSwapped_, 0))
142
+ {}
143
+
144
+ template <class Master_matrix, class Base_matrix>
145
+ inline void Base_swap<Master_matrix, Base_matrix>::swap_columns(Index columnIndex1, Index columnIndex2)
146
+ {
147
+ swap(_matrix()->matrix_.at(columnIndex1), _matrix()->matrix_.at(columnIndex2));
148
+ if constexpr (Master_matrix::Option_list::has_row_access) rowSwapped_ = true; //to update column index in entries.
149
+ }
150
+
151
+ template <class Master_matrix, class Base_matrix>
152
+ inline void Base_swap<Master_matrix, Base_matrix>::swap_rows(ID_index rowIndex1, ID_index rowIndex2)
153
+ {
154
+ rowSwapped_ = true;
155
+
156
+ if constexpr (Master_matrix::Option_list::has_map_column_container) {
157
+ auto it1 = indexToRow_.find(rowIndex1);
158
+ auto it2 = indexToRow_.find(rowIndex2);
159
+
160
+ if (it1 == indexToRow_.end() && it2 == indexToRow_.end()) return;
161
+
162
+ if (it1 == indexToRow_.end()) {
163
+ indexToRow_.emplace(rowIndex1, it2->second);
164
+ rowToIndex_.at(it2->second) = rowIndex1;
165
+ indexToRow_.erase(it2->second);
166
+ return;
167
+ }
168
+
169
+ if (it2 == indexToRow_.end()) {
170
+ indexToRow_.emplace(rowIndex2, it1->second);
171
+ rowToIndex_.at(it1->second) = rowIndex2;
172
+ indexToRow_.erase(it1);
173
+ return;
174
+ }
175
+
176
+ std::swap(rowToIndex_.at(it1->second), rowToIndex_.at(it2->second));
177
+ std::swap(it1->second, it2->second);
178
+ } else {
179
+ for (auto i = indexToRow_.size(); i <= std::max(rowIndex1, rowIndex2); ++i) indexToRow_.push_back(i);
180
+
181
+ std::swap(rowToIndex_[indexToRow_[rowIndex1]], rowToIndex_[indexToRow_[rowIndex2]]);
182
+ std::swap(indexToRow_[rowIndex1], indexToRow_[rowIndex2]);
183
+ }
184
+ }
185
+
186
+ template <class Master_matrix, class Base_matrix>
187
+ inline Base_swap<Master_matrix, Base_matrix>& Base_swap<Master_matrix, Base_matrix>::operator=(Base_swap other)
188
+ {
189
+ indexToRow_.swap(other.indexToRow_);
190
+ rowToIndex_.swap(other.rowToIndex_);
191
+ std::swap(rowSwapped_, other.rowSwapped_);
192
+ return *this;
193
+ }
194
+
195
+ template <class Master_matrix, class Base_matrix>
196
+ inline void Base_swap<Master_matrix, Base_matrix>::_orderRows()
197
+ {
198
+ for (unsigned int i = 0; i < _matrix()->get_number_of_columns(); i++) {
199
+ _matrix()->matrix_.at(i).reorder(rowToIndex_, i);
200
+ }
201
+ for (Index i = 0; i < _matrix()->get_number_of_columns(); i++) {
202
+ indexToRow_[i] = i;
203
+ rowToIndex_[i] = i;
204
+ }
205
+ rowSwapped_ = false;
206
+ }
207
+
208
+ } // namespace persistence_matrix
209
+ } // namespace Gudhi
210
+
211
+ #endif // PM_BASE_SWAP_H
@@ -1,60 +1,60 @@
1
- /* This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT.
2
- * See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details.
3
- * Author(s): Hannah Schreiber
4
- *
5
- * Copyright (C) 2022-24 Inria
6
- *
7
- * Modification(s):
8
- * - YYYY/MM Author: Description of the modification
9
- */
10
-
11
- /**
12
- * @file boundary_cell_position_to_id_mapper.h
13
- * @author Hannah Schreiber
14
- * @brief Contains the @ref Gudhi::persistence_matrix::Cell_position_to_ID_mapper class and
15
- * @ref Gudhi::persistence_matrix::Dummy_pos_mapper structure.
16
- */
17
-
18
- #ifndef PM_ID_POS_MAPPER_H
19
- #define PM_ID_POS_MAPPER_H
20
-
21
- #include <unordered_map>
22
-
23
- namespace Gudhi {
24
- namespace persistence_matrix {
25
-
26
- /**
27
- * @private
28
- * @ingroup persistence_matrix
29
- *
30
- * @brief Empty structure.
31
- * Inherited instead of @ref Cell_position_to_ID_mapper.
32
- */
33
- struct Dummy_pos_mapper {
34
- friend void swap([[maybe_unused]] Dummy_pos_mapper& d1, [[maybe_unused]] Dummy_pos_mapper& d2) {}
35
- };
36
-
37
- /**
38
- * @private
39
- * @ingroup persistence_matrix
40
- *
41
- * @brief Map from cell position to cell ID. Only stores a pair if ID != position and has_removable_column is true.
42
- *
43
- * @tparam ID_index @ref IDIdx index type
44
- * @tparam Pos_index @ref PosIdx index type
45
- */
46
- template<typename ID_index, typename Pos_index>
47
- struct Cell_position_to_ID_mapper {
48
- using Index_map = std::unordered_map<Pos_index,ID_index>; //TODO: test other map types
49
-
50
- Index_map map_;
51
-
52
- friend void swap(Cell_position_to_ID_mapper& mapper1, Cell_position_to_ID_mapper& mapper2) {
53
- mapper1.map_.swap(mapper2.map_);
54
- }
55
- };
56
-
57
- } // namespace persistence_matrix
58
- } // namespace Gudhi
59
-
60
- #endif // PM_ID_POS_MAPPER_H
1
+ /* This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT.
2
+ * See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details.
3
+ * Author(s): Hannah Schreiber
4
+ *
5
+ * Copyright (C) 2022-24 Inria
6
+ *
7
+ * Modification(s):
8
+ * - YYYY/MM Author: Description of the modification
9
+ */
10
+
11
+ /**
12
+ * @file boundary_cell_position_to_id_mapper.h
13
+ * @author Hannah Schreiber
14
+ * @brief Contains the @ref Gudhi::persistence_matrix::Cell_position_to_ID_mapper class and
15
+ * @ref Gudhi::persistence_matrix::Dummy_pos_mapper structure.
16
+ */
17
+
18
+ #ifndef PM_ID_POS_MAPPER_H
19
+ #define PM_ID_POS_MAPPER_H
20
+
21
+ #include <unordered_map>
22
+
23
+ namespace Gudhi {
24
+ namespace persistence_matrix {
25
+
26
+ /**
27
+ * @private
28
+ * @ingroup persistence_matrix
29
+ *
30
+ * @brief Empty structure.
31
+ * Inherited instead of @ref Cell_position_to_ID_mapper.
32
+ */
33
+ struct Dummy_pos_mapper {
34
+ friend void swap([[maybe_unused]] Dummy_pos_mapper& d1, [[maybe_unused]] Dummy_pos_mapper& d2) {}
35
+ };
36
+
37
+ /**
38
+ * @private
39
+ * @ingroup persistence_matrix
40
+ *
41
+ * @brief Map from cell position to cell ID. Only stores a pair if ID != position and has_removable_column is true.
42
+ *
43
+ * @tparam ID_index @ref IDIdx index type
44
+ * @tparam Pos_index @ref PosIdx index type
45
+ */
46
+ template<typename ID_index, typename Pos_index>
47
+ struct Cell_position_to_ID_mapper {
48
+ using Index_map = std::unordered_map<Pos_index,ID_index>; //TODO: test other map types
49
+
50
+ Index_map map_;
51
+
52
+ friend void swap(Cell_position_to_ID_mapper& mapper1, Cell_position_to_ID_mapper& mapper2) {
53
+ mapper1.map_.swap(mapper2.map_);
54
+ }
55
+ };
56
+
57
+ } // namespace persistence_matrix
58
+ } // namespace Gudhi
59
+
60
+ #endif // PM_ID_POS_MAPPER_H
@@ -1,60 +1,60 @@
1
- /* This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT.
2
- * See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details.
3
- * Author(s): Hannah Schreiber
4
- *
5
- * Copyright (C) 2022-24 Inria
6
- *
7
- * Modification(s):
8
- * - YYYY/MM Author: Description of the modification
9
- */
10
-
11
- /**
12
- * @file base_pairing.h
13
- * @author Hannah Schreiber
14
- * @brief Contains the @ref Gudhi::persistence_matrix::Base_pairing class and
15
- * @ref Gudhi::persistence_matrix::Dummy_base_pairing structure.
16
- */
17
-
18
- #ifndef PM_ID_POS_MAPPER_H
19
- #define PM_ID_POS_MAPPER_H
20
-
21
- #include <unordered_map>
22
-
23
- namespace Gudhi {
24
- namespace persistence_matrix {
25
-
26
- /**
27
- * @private
28
- * @ingroup persistence_matrix
29
- *
30
- * @brief Empty structure.
31
- * Inherited instead of @ref Face_position_to_ID_mapper.
32
- */
33
- struct Dummy_pos_mapper {
34
- friend void swap([[maybe_unused]] Dummy_pos_mapper& d1, [[maybe_unused]] Dummy_pos_mapper& d2) {}
35
- };
36
-
37
- /**
38
- * @private
39
- * @ingroup persistence_matrix
40
- *
41
- * @brief Map from face position to face ID. Only stores a pair if ID != position and has_removable_column is true.
42
- *
43
- * @tparam ID_index @ref IDIdx index type
44
- * @tparam Pos_index @ref PosIdx index type
45
- */
46
- template<typename ID_index, typename Pos_index>
47
- struct Face_position_to_ID_mapper {
48
- using Index_map = std::unordered_map<Pos_index,ID_index>; //TODO: test other map types
49
-
50
- Index_map map_;
51
-
52
- friend void swap(Face_position_to_ID_mapper& mapper1, Face_position_to_ID_mapper& mapper2) {
53
- mapper1.map_.swap(mapper2.map_);
54
- }
55
- };
56
-
57
- } // namespace persistence_matrix
58
- } // namespace Gudhi
59
-
60
- #endif // PM_ID_POS_MAPPER_H
1
+ /* This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT.
2
+ * See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details.
3
+ * Author(s): Hannah Schreiber
4
+ *
5
+ * Copyright (C) 2022-24 Inria
6
+ *
7
+ * Modification(s):
8
+ * - YYYY/MM Author: Description of the modification
9
+ */
10
+
11
+ /**
12
+ * @file base_pairing.h
13
+ * @author Hannah Schreiber
14
+ * @brief Contains the @ref Gudhi::persistence_matrix::Base_pairing class and
15
+ * @ref Gudhi::persistence_matrix::Dummy_base_pairing structure.
16
+ */
17
+
18
+ #ifndef PM_ID_POS_MAPPER_H
19
+ #define PM_ID_POS_MAPPER_H
20
+
21
+ #include <unordered_map>
22
+
23
+ namespace Gudhi {
24
+ namespace persistence_matrix {
25
+
26
+ /**
27
+ * @private
28
+ * @ingroup persistence_matrix
29
+ *
30
+ * @brief Empty structure.
31
+ * Inherited instead of @ref Face_position_to_ID_mapper.
32
+ */
33
+ struct Dummy_pos_mapper {
34
+ friend void swap([[maybe_unused]] Dummy_pos_mapper& d1, [[maybe_unused]] Dummy_pos_mapper& d2) {}
35
+ };
36
+
37
+ /**
38
+ * @private
39
+ * @ingroup persistence_matrix
40
+ *
41
+ * @brief Map from face position to face ID. Only stores a pair if ID != position and has_removable_column is true.
42
+ *
43
+ * @tparam ID_index @ref IDIdx index type
44
+ * @tparam Pos_index @ref PosIdx index type
45
+ */
46
+ template<typename ID_index, typename Pos_index>
47
+ struct Face_position_to_ID_mapper {
48
+ using Index_map = std::unordered_map<Pos_index,ID_index>; //TODO: test other map types
49
+
50
+ Index_map map_;
51
+
52
+ friend void swap(Face_position_to_ID_mapper& mapper1, Face_position_to_ID_mapper& mapper2) {
53
+ mapper1.map_.swap(mapper2.map_);
54
+ }
55
+ };
56
+
57
+ } // namespace persistence_matrix
58
+ } // namespace Gudhi
59
+
60
+ #endif // PM_ID_POS_MAPPER_H