multipers 2.2.3__cp312-cp312-win_amd64.whl → 2.3.0__cp312-cp312-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.cp312-win_amd64.pyd +0 -0
  17. multipers/function_rips.pyx +105 -105
  18. multipers/grids.cp312-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.cp312-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.cp312-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.cp312-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.cp312-win_amd64.pyd +0 -0
  152. multipers/point_measure.pyx +322 -320
  153. multipers/simplex_tree_multi.cp312-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.cp312-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,376 +1,376 @@
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 ru_rep_cycles.h
13
- * @author Hannah Schreiber
14
- * @brief Contains the @ref Gudhi::persistence_matrix::RU_representative_cycles class and
15
- * @ref Gudhi::persistence_matrix::Dummy_ru_representative_cycles structure.
16
- */
17
-
18
- #ifndef PM_RU_REP_CYCLES_H
19
- #define PM_RU_REP_CYCLES_H
20
-
21
- #include <cassert>
22
- #include <utility> //std::move
23
- #include <algorithm> //std::sort
24
- #include <vector>
25
- // #include <set>
26
- #if BOOST_VERSION >= 108100
27
- #include <boost/unordered/unordered_flat_set.hpp>
28
- #else
29
- #include <unordered_set>
30
- #endif
31
-
32
- #include <gudhi/persistence_matrix_options.h>
33
-
34
- namespace Gudhi {
35
- namespace persistence_matrix {
36
-
37
- /**
38
- * @ingroup persistence_matrix
39
- *
40
- * @brief Empty structure.
41
- * Inherited instead of @ref RU_representative_cycles, when the computation of the representative cycles
42
- * were not enabled.
43
- */
44
- struct Dummy_ru_representative_cycles
45
- {
46
- friend void swap([[maybe_unused]] Dummy_ru_representative_cycles& d1,
47
- [[maybe_unused]] Dummy_ru_representative_cycles& d2) {}
48
- };
49
-
50
- // TODO: add coefficients ? Only Z2 token into account for now.
51
- /**
52
- * @class RU_representative_cycles ru_rep_cycles.h gudhi/Persistence_matrix/ru_rep_cycles.h
53
- * @ingroup persistence_matrix
54
- *
55
- * @brief Class managing the representative cycles for @ref RU_matrix if the option was enabled.
56
- *
57
- * @tparam Master_matrix An instantiation of @ref Matrix from which all types and options are deduced.
58
- */
59
- template <class Master_matrix>
60
- class RU_representative_cycles
61
- {
62
- public:
63
- using Index = typename Master_matrix::Index; /**< @ref MatIdx index type. */
64
- using ID_index = typename Master_matrix::ID_index; /**< @ref IDIdx index type. */
65
- using Bar = typename Master_matrix::Bar; /**< Bar type. */
66
- using Cycle = typename Master_matrix::Cycle; /**< Cycle type. */
67
- using Cycle_border = std::vector<ID_index>;
68
- using Cycle_borders = std::vector<Cycle_border>;
69
- struct hashCycle {
70
- size_t operator()(const Cycle_border& cycle) const {
71
- std::hash<ID_index> hasher;
72
- size_t answer = 0;
73
- for (ID_index i : cycle) {
74
- answer ^= hasher(i) + 0x9e3779b9 + (answer << 6) + (answer >> 2);
75
- }
76
- return answer;
77
- }
78
- };
79
- #if BOOST_VERSION >= 108100
80
- using Cycle_borders_tmp = boost::unordered_flat_set<Cycle_border,hashCycle>;
81
- #else
82
- using Cycle_borders_tmp = std::unordered_set<Cycle_border,hashCycle>;
83
- #endif
84
- #if BOOST_VERSION >= 108100
85
- using Cycle_unreduced_borders_tmp = boost::unordered_flat_set<Index>;
86
- #else
87
- using Cycle_unreduced_borders_tmp = std::unordered_set<Index>;
88
- #endif
89
-
90
- /**
91
- * @brief Default constructor.
92
- */
93
- RU_representative_cycles();
94
- /**
95
- * @brief Copy constructor.
96
- *
97
- * @param matrixToCopy Matrix to copy.
98
- */
99
- RU_representative_cycles(const RU_representative_cycles& matrixToCopy);
100
- /**
101
- * @brief Move constructor.
102
- *
103
- * @param other Matrix to move.
104
- */
105
- RU_representative_cycles(RU_representative_cycles&& other) noexcept;
106
-
107
- /**
108
- * @brief Computes the current representative cycles of the matrix.
109
- */
110
- void update_representative_cycles();
111
-
112
- // /**
113
- // * @brief Returns the current representative cycles. If the matrix is modified later after the first call,
114
- // * @ref update_representative_cycles has to be called to update the returned cycles.
115
- // *
116
- // * @return A const reference to a vector of @ref Matrix::Cycle containing all representative cycles.
117
- // */
118
- // const std::vector<Cycle>& get_representative_cycles();
119
- // /**
120
- // * @brief Returns the representative cycle corresponding to the given bar.
121
- // * If the matrix is modified later after the first call,
122
- // * @ref update_representative_cycles has to be called to update the returned cycles.
123
- // *
124
- // * @param bar Bar corresponding to the wanted representative cycle.
125
- // * @return A const reference to the representative cycle.
126
- // */
127
- // const Cycle& get_representative_cycle(const Bar& bar);
128
-
129
- /**
130
- * @brief Returns the current representative cycles. If the matrix is modified later after the first call,
131
- * @ref update_representative_cycles has to be called to update the returned cycles.
132
- *
133
- * @return A const reference to a vector of @ref Matrix::Cycle containing all representative cycles.
134
- */
135
- std::vector<Cycle_borders> get_representative_cycles_as_borders(bool detailed = false);
136
-
137
- /**
138
- * @brief Assign operator.
139
- */
140
- RU_representative_cycles& operator=(RU_representative_cycles other);
141
- /**
142
- * @brief Swap operator.
143
- */
144
- friend void swap(RU_representative_cycles& base1, RU_representative_cycles& base2) {
145
- base1.representativeCycles_.swap(base2.representativeCycles_);
146
- base1.u_transposed_.swap(base2.u_transposed_);
147
- // base1.birthToCycle_.swap(base2.birthToCycle_);
148
- }
149
-
150
- private:
151
- using Master_RU_matrix = typename Master_matrix::Master_RU_matrix;
152
-
153
- std::vector<Index> representativeCycles_; /**< Cycle container. */
154
- // std::vector<Index> birthToCycle_; /**< Map from birth index to cycle index. */
155
- std::vector<Cycle> u_transposed_;
156
-
157
- void _get_initial_borders(Index idx, Cycle_borders_tmp& borders);
158
- Cycle_border _get_border(Index uIndex);
159
- Cycle_border _get_dependent_border(Index uIndex);
160
-
161
- constexpr Master_RU_matrix* _matrix() { return static_cast<Master_RU_matrix*>(this); }
162
- constexpr const Master_RU_matrix* _matrix() const { return static_cast<const Master_RU_matrix*>(this); }
163
- };
164
-
165
- template <class Master_matrix>
166
- inline RU_representative_cycles<Master_matrix>::RU_representative_cycles()
167
- {}
168
-
169
- template <class Master_matrix>
170
- inline RU_representative_cycles<Master_matrix>::RU_representative_cycles(
171
- const RU_representative_cycles<Master_matrix>& matrixToCopy)
172
- : representativeCycles_(matrixToCopy.representativeCycles_),
173
- // birthToCycle_(matrixToCopy.birthToCycle_),
174
- u_transposed_(matrixToCopy.u_transposed_)
175
- {}
176
-
177
- template <class Master_matrix>
178
- inline RU_representative_cycles<Master_matrix>::RU_representative_cycles(
179
- RU_representative_cycles<Master_matrix>&& other) noexcept
180
- : representativeCycles_(std::move(other.representativeCycles_)),
181
- // birthToCycle_(std::move(other.birthToCycle_)),
182
- u_transposed_(std::move(other.u_transposed_))
183
- {}
184
-
185
- //TODO: u_transposed_ as a vector of Index and another vector giving position + length of each cycle?
186
- template <class Master_matrix>
187
- inline void RU_representative_cycles<Master_matrix>::update_representative_cycles()
188
- {
189
- //WARNING: this was only thought for the multipers interface, it is not definitive and does not
190
- // cover all cases.
191
- static_assert(Master_matrix::Option_list::has_column_pairings && Master_matrix::Option_list::is_z2,
192
- "Needs an ID to Pos map.");
193
-
194
- auto rsize = _matrix()->reducedMatrixR_.get_number_of_columns();
195
- representativeCycles_.clear();
196
- representativeCycles_.reserve(rsize);
197
-
198
- auto usize = _matrix()->mirrorMatrixU_.get_number_of_columns();
199
- u_transposed_.clear();
200
- u_transposed_.resize(usize);
201
-
202
- for (Index i = 0; i < usize; i++) {
203
- if (_matrix()->reducedMatrixR_.is_zero_column(i)) {
204
- representativeCycles_.push_back(i);
205
- }
206
- if constexpr (Master_matrix::Option_list::column_type == Column_types::HEAP ||
207
- Master_matrix::Option_list::column_type == Column_types::VECTOR) {
208
- // TODO: have a better way to do this. For now, one cannot use the column iterators for that.
209
- unsigned int j = 0;
210
- for (const auto& entry : _matrix()->mirrorMatrixU_.get_column(i).get_content()) {
211
- if (entry != 0){
212
- u_transposed_[j].push_back(i);
213
- }
214
- ++j;
215
- }
216
- } else {
217
- for (const auto& entry : _matrix()->mirrorMatrixU_.get_column(i)) {
218
- u_transposed_[entry.get_row_index()].push_back(i);
219
- }
220
- }
221
- }
222
- }
223
-
224
- // template <class Master_matrix>
225
- // inline const std::vector<typename RU_representative_cycles<Master_matrix>::Cycle>&
226
- // RU_representative_cycles<Master_matrix>::get_representative_cycles()
227
- // {
228
- // if (representativeCycles_.empty()) update_representative_cycles();
229
- // return representativeCycles_;
230
- // }
231
-
232
- // template <class Master_matrix>
233
- // inline const typename RU_representative_cycles<Master_matrix>::Cycle&
234
- // RU_representative_cycles<Master_matrix>::get_representative_cycle(const Bar& bar)
235
- // {
236
- // if (representativeCycles_.empty()) update_representative_cycles();
237
- // return representativeCycles_[birthToCycle_[bar.birth]];
238
- // }
239
-
240
- //TODO: not store cycle borders in vectors of vectors of vectors
241
- template <class Master_matrix>
242
- inline std::vector<typename RU_representative_cycles<Master_matrix>::Cycle_borders>
243
- RU_representative_cycles<Master_matrix>::get_representative_cycles_as_borders(bool detailed)
244
- {
245
- static_assert(Master_matrix::Option_list::is_z2, "Only available for Z2 coefficients for now.");
246
-
247
- if (representativeCycles_.empty()) update_representative_cycles();
248
-
249
- std::vector<Cycle_borders> cycles(representativeCycles_.size());
250
- unsigned int i = 0;
251
- for (const auto& cycleIndex : representativeCycles_){
252
- const auto& cycle = u_transposed_[cycleIndex];
253
- assert(_matrix()->reducedMatrixR_.is_zero_column(cycle.back()));
254
- if (cycle.size() != 1){ //cycle.size == 1 -> border is empty
255
- if (detailed) {
256
- Cycle_borders_tmp cbt;
257
- for (unsigned int j = 0; j < cycle.size() - 1; ++j){
258
- assert(!_matrix()->reducedMatrixR_.is_zero_column(cycle[j]));
259
- _get_initial_borders(cycle[j], cbt);
260
- }
261
- cycles[i] = Cycle_borders(cbt.begin(), cbt.end());
262
- cycles[i].push_back(_get_dependent_border(cycle.back()));
263
- } else {
264
- cycles[i].resize(cycle.size());
265
- for (unsigned int j = 0; j < cycle.size() - 1; ++j){
266
- cycles[i][j] = _get_border(cycle[j]);
267
- }
268
- cycles[i].back() = _get_dependent_border(cycle.back());
269
- }
270
- } else {
271
- cycles[i].push_back({});
272
- }
273
-
274
- ++i;
275
- }
276
- return cycles;
277
- }
278
-
279
- template <class Master_matrix>
280
- inline RU_representative_cycles<Master_matrix>& RU_representative_cycles<Master_matrix>::operator=(
281
- RU_representative_cycles<Master_matrix> other)
282
- {
283
- representativeCycles_.swap(other.representativeCycles_);
284
- u_transposed_.swap(other.u_transposed_);
285
- // birthToCycle_.swap(other.birthToCycle_);
286
- return *this;
287
- }
288
-
289
- //TODO: try avoid storing the vectors in the unordered set, when it is not reduced as it adds run time for hash
290
- //computation and possibly comparaison of vectors. Treat them separately. See if it goes faster, or if it was marginal
291
- template <class Master_matrix>
292
- inline void RU_representative_cycles<Master_matrix>::_get_initial_borders(Index idx,
293
- Cycle_borders_tmp& borders) {
294
- const Cycle& cycle = u_transposed_[idx];
295
- assert(cycle.back() == idx);
296
-
297
- auto add_to = [](const std::vector<Index>& b, Cycle_borders_tmp& borders){
298
- auto p = borders.insert(b);
299
- if (!p.second) borders.erase(p.first);
300
- };
301
-
302
- for (unsigned int j = 0; j < cycle.size() - 1; ++j){
303
- _get_initial_borders(cycle[j], borders);
304
- }
305
-
306
- add_to(_get_dependent_border(idx), borders);
307
- }
308
-
309
- template <class Master_matrix>
310
- inline typename RU_representative_cycles<Master_matrix>::Cycle_border
311
- RU_representative_cycles<Master_matrix>::_get_border(Index uIndex) {
312
- const auto& col = _matrix()->reducedMatrixR_.get_column(uIndex);
313
- Cycle_border res;
314
-
315
- unsigned int j = 0;
316
- if constexpr (Master_matrix::Option_list::column_type == Column_types::HEAP ||
317
- Master_matrix::Option_list::column_type == Column_types::VECTOR) {
318
- res.reserve(col.size());
319
- // TODO: have a better way to do this. For now, one cannot use the column iterators for that.
320
- for (auto i : col.get_content()) {
321
- if (i != 0) res.push_back(j);
322
- ++j;
323
- }
324
- } else {
325
- res.resize(col.size());
326
- for (const auto& entry : col) {
327
- res[j] = entry.get_row_index();
328
- ++j;
329
- }
330
- }
331
-
332
- return res;
333
- }
334
-
335
- template <class Master_matrix>
336
- inline typename RU_representative_cycles<Master_matrix>::Cycle_border
337
- RU_representative_cycles<Master_matrix>::_get_dependent_border(Index uIndex) {
338
- if (u_transposed_[uIndex].size() == 1){
339
- return _get_border(uIndex);
340
- }
341
-
342
- auto add = [](const Master_matrix::Column& col, Cycle_unreduced_borders_tmp& b){
343
- if constexpr (Master_matrix::Option_list::column_type == Column_types::HEAP ||
344
- Master_matrix::Option_list::column_type == Column_types::VECTOR) {
345
- // TODO: have a better way to do this. For now, one cannot use the column iterators for that.
346
- unsigned int j = 0;
347
- for (auto k : col.get_content()) {
348
- if (k != 0) {
349
- auto p = b.insert(j);
350
- if (!p.second) b.erase(p.first);
351
- }
352
- ++j;
353
- }
354
- } else {
355
- for (const auto& entry : col) {
356
- auto p = b.insert(entry.get_row_index());
357
- if (!p.second) b.erase(p.first);
358
- }
359
- }
360
- };
361
-
362
- Cycle_unreduced_borders_tmp b;
363
- for (Index i : u_transposed_[uIndex]){
364
- add(_matrix()->reducedMatrixR_.get_column(i), b);
365
- }
366
-
367
- Cycle_border res(b.begin(), b.end());
368
- std::sort(res.begin(), res.end());
369
-
370
- return res;
371
- }
372
-
373
- } // namespace persistence_matrix
374
- } // namespace Gudhi
375
-
376
- #endif // PM_RU_REP_CYCLES_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 ru_rep_cycles.h
13
+ * @author Hannah Schreiber
14
+ * @brief Contains the @ref Gudhi::persistence_matrix::RU_representative_cycles class and
15
+ * @ref Gudhi::persistence_matrix::Dummy_ru_representative_cycles structure.
16
+ */
17
+
18
+ #ifndef PM_RU_REP_CYCLES_H
19
+ #define PM_RU_REP_CYCLES_H
20
+
21
+ #include <cassert>
22
+ #include <utility> //std::move
23
+ #include <algorithm> //std::sort
24
+ #include <vector>
25
+ // #include <set>
26
+ #if BOOST_VERSION >= 108100
27
+ #include <boost/unordered/unordered_flat_set.hpp>
28
+ #else
29
+ #include <unordered_set>
30
+ #endif
31
+
32
+ #include <gudhi/persistence_matrix_options.h>
33
+
34
+ namespace Gudhi {
35
+ namespace persistence_matrix {
36
+
37
+ /**
38
+ * @ingroup persistence_matrix
39
+ *
40
+ * @brief Empty structure.
41
+ * Inherited instead of @ref RU_representative_cycles, when the computation of the representative cycles
42
+ * were not enabled.
43
+ */
44
+ struct Dummy_ru_representative_cycles
45
+ {
46
+ friend void swap([[maybe_unused]] Dummy_ru_representative_cycles& d1,
47
+ [[maybe_unused]] Dummy_ru_representative_cycles& d2) {}
48
+ };
49
+
50
+ // TODO: add coefficients ? Only Z2 token into account for now.
51
+ /**
52
+ * @class RU_representative_cycles ru_rep_cycles.h gudhi/Persistence_matrix/ru_rep_cycles.h
53
+ * @ingroup persistence_matrix
54
+ *
55
+ * @brief Class managing the representative cycles for @ref RU_matrix if the option was enabled.
56
+ *
57
+ * @tparam Master_matrix An instantiation of @ref Matrix from which all types and options are deduced.
58
+ */
59
+ template <class Master_matrix>
60
+ class RU_representative_cycles
61
+ {
62
+ public:
63
+ using Index = typename Master_matrix::Index; /**< @ref MatIdx index type. */
64
+ using ID_index = typename Master_matrix::ID_index; /**< @ref IDIdx index type. */
65
+ using Bar = typename Master_matrix::Bar; /**< Bar type. */
66
+ using Cycle = typename Master_matrix::Cycle; /**< Cycle type. */
67
+ using Cycle_border = std::vector<ID_index>;
68
+ using Cycle_borders = std::vector<Cycle_border>;
69
+ struct hashCycle {
70
+ size_t operator()(const Cycle_border& cycle) const {
71
+ std::hash<ID_index> hasher;
72
+ size_t answer = 0;
73
+ for (ID_index i : cycle) {
74
+ answer ^= hasher(i) + 0x9e3779b9 + (answer << 6) + (answer >> 2);
75
+ }
76
+ return answer;
77
+ }
78
+ };
79
+ #if BOOST_VERSION >= 108100
80
+ using Cycle_borders_tmp = boost::unordered_flat_set<Cycle_border,hashCycle>;
81
+ #else
82
+ using Cycle_borders_tmp = std::unordered_set<Cycle_border,hashCycle>;
83
+ #endif
84
+ #if BOOST_VERSION >= 108100
85
+ using Cycle_unreduced_borders_tmp = boost::unordered_flat_set<Index>;
86
+ #else
87
+ using Cycle_unreduced_borders_tmp = std::unordered_set<Index>;
88
+ #endif
89
+
90
+ /**
91
+ * @brief Default constructor.
92
+ */
93
+ RU_representative_cycles();
94
+ /**
95
+ * @brief Copy constructor.
96
+ *
97
+ * @param matrixToCopy Matrix to copy.
98
+ */
99
+ RU_representative_cycles(const RU_representative_cycles& matrixToCopy);
100
+ /**
101
+ * @brief Move constructor.
102
+ *
103
+ * @param other Matrix to move.
104
+ */
105
+ RU_representative_cycles(RU_representative_cycles&& other) noexcept;
106
+
107
+ /**
108
+ * @brief Computes the current representative cycles of the matrix.
109
+ */
110
+ void update_representative_cycles();
111
+
112
+ // /**
113
+ // * @brief Returns the current representative cycles. If the matrix is modified later after the first call,
114
+ // * @ref update_representative_cycles has to be called to update the returned cycles.
115
+ // *
116
+ // * @return A const reference to a vector of @ref Matrix::Cycle containing all representative cycles.
117
+ // */
118
+ // const std::vector<Cycle>& get_representative_cycles();
119
+ // /**
120
+ // * @brief Returns the representative cycle corresponding to the given bar.
121
+ // * If the matrix is modified later after the first call,
122
+ // * @ref update_representative_cycles has to be called to update the returned cycles.
123
+ // *
124
+ // * @param bar Bar corresponding to the wanted representative cycle.
125
+ // * @return A const reference to the representative cycle.
126
+ // */
127
+ // const Cycle& get_representative_cycle(const Bar& bar);
128
+
129
+ /**
130
+ * @brief Returns the current representative cycles. If the matrix is modified later after the first call,
131
+ * @ref update_representative_cycles has to be called to update the returned cycles.
132
+ *
133
+ * @return A const reference to a vector of @ref Matrix::Cycle containing all representative cycles.
134
+ */
135
+ std::vector<Cycle_borders> get_representative_cycles_as_borders(bool detailed = false);
136
+
137
+ /**
138
+ * @brief Assign operator.
139
+ */
140
+ RU_representative_cycles& operator=(RU_representative_cycles other);
141
+ /**
142
+ * @brief Swap operator.
143
+ */
144
+ friend void swap(RU_representative_cycles& base1, RU_representative_cycles& base2) {
145
+ base1.representativeCycles_.swap(base2.representativeCycles_);
146
+ base1.u_transposed_.swap(base2.u_transposed_);
147
+ // base1.birthToCycle_.swap(base2.birthToCycle_);
148
+ }
149
+
150
+ private:
151
+ using Master_RU_matrix = typename Master_matrix::Master_RU_matrix;
152
+
153
+ std::vector<Index> representativeCycles_; /**< Cycle container. */
154
+ // std::vector<Index> birthToCycle_; /**< Map from birth index to cycle index. */
155
+ std::vector<Cycle> u_transposed_;
156
+
157
+ void _get_initial_borders(Index idx, Cycle_borders_tmp& borders);
158
+ Cycle_border _get_border(Index uIndex);
159
+ Cycle_border _get_dependent_border(Index uIndex);
160
+
161
+ constexpr Master_RU_matrix* _matrix() { return static_cast<Master_RU_matrix*>(this); }
162
+ constexpr const Master_RU_matrix* _matrix() const { return static_cast<const Master_RU_matrix*>(this); }
163
+ };
164
+
165
+ template <class Master_matrix>
166
+ inline RU_representative_cycles<Master_matrix>::RU_representative_cycles()
167
+ {}
168
+
169
+ template <class Master_matrix>
170
+ inline RU_representative_cycles<Master_matrix>::RU_representative_cycles(
171
+ const RU_representative_cycles<Master_matrix>& matrixToCopy)
172
+ : representativeCycles_(matrixToCopy.representativeCycles_),
173
+ // birthToCycle_(matrixToCopy.birthToCycle_),
174
+ u_transposed_(matrixToCopy.u_transposed_)
175
+ {}
176
+
177
+ template <class Master_matrix>
178
+ inline RU_representative_cycles<Master_matrix>::RU_representative_cycles(
179
+ RU_representative_cycles<Master_matrix>&& other) noexcept
180
+ : representativeCycles_(std::move(other.representativeCycles_)),
181
+ // birthToCycle_(std::move(other.birthToCycle_)),
182
+ u_transposed_(std::move(other.u_transposed_))
183
+ {}
184
+
185
+ //TODO: u_transposed_ as a vector of Index and another vector giving position + length of each cycle?
186
+ template <class Master_matrix>
187
+ inline void RU_representative_cycles<Master_matrix>::update_representative_cycles()
188
+ {
189
+ //WARNING: this was only thought for the multipers interface, it is not definitive and does not
190
+ // cover all cases.
191
+ static_assert(Master_matrix::Option_list::has_column_pairings && Master_matrix::Option_list::is_z2,
192
+ "Needs an ID to Pos map.");
193
+
194
+ auto rsize = _matrix()->reducedMatrixR_.get_number_of_columns();
195
+ representativeCycles_.clear();
196
+ representativeCycles_.reserve(rsize);
197
+
198
+ auto usize = _matrix()->mirrorMatrixU_.get_number_of_columns();
199
+ u_transposed_.clear();
200
+ u_transposed_.resize(usize);
201
+
202
+ for (Index i = 0; i < usize; i++) {
203
+ if (_matrix()->reducedMatrixR_.is_zero_column(i)) {
204
+ representativeCycles_.push_back(i);
205
+ }
206
+ if constexpr (Master_matrix::Option_list::column_type == Column_types::HEAP ||
207
+ Master_matrix::Option_list::column_type == Column_types::VECTOR) {
208
+ // TODO: have a better way to do this. For now, one cannot use the column iterators for that.
209
+ unsigned int j = 0;
210
+ for (const auto& entry : _matrix()->mirrorMatrixU_.get_column(i).get_content()) {
211
+ if (entry != 0){
212
+ u_transposed_[j].push_back(i);
213
+ }
214
+ ++j;
215
+ }
216
+ } else {
217
+ for (const auto& entry : _matrix()->mirrorMatrixU_.get_column(i)) {
218
+ u_transposed_[entry.get_row_index()].push_back(i);
219
+ }
220
+ }
221
+ }
222
+ }
223
+
224
+ // template <class Master_matrix>
225
+ // inline const std::vector<typename RU_representative_cycles<Master_matrix>::Cycle>&
226
+ // RU_representative_cycles<Master_matrix>::get_representative_cycles()
227
+ // {
228
+ // if (representativeCycles_.empty()) update_representative_cycles();
229
+ // return representativeCycles_;
230
+ // }
231
+
232
+ // template <class Master_matrix>
233
+ // inline const typename RU_representative_cycles<Master_matrix>::Cycle&
234
+ // RU_representative_cycles<Master_matrix>::get_representative_cycle(const Bar& bar)
235
+ // {
236
+ // if (representativeCycles_.empty()) update_representative_cycles();
237
+ // return representativeCycles_[birthToCycle_[bar.birth]];
238
+ // }
239
+
240
+ //TODO: not store cycle borders in vectors of vectors of vectors
241
+ template <class Master_matrix>
242
+ inline std::vector<typename RU_representative_cycles<Master_matrix>::Cycle_borders>
243
+ RU_representative_cycles<Master_matrix>::get_representative_cycles_as_borders(bool detailed)
244
+ {
245
+ static_assert(Master_matrix::Option_list::is_z2, "Only available for Z2 coefficients for now.");
246
+
247
+ if (representativeCycles_.empty()) update_representative_cycles();
248
+
249
+ std::vector<Cycle_borders> cycles(representativeCycles_.size());
250
+ unsigned int i = 0;
251
+ for (const auto& cycleIndex : representativeCycles_){
252
+ const auto& cycle = u_transposed_[cycleIndex];
253
+ assert(_matrix()->reducedMatrixR_.is_zero_column(cycle.back()));
254
+ if (cycle.size() != 1){ //cycle.size == 1 -> border is empty
255
+ if (detailed) {
256
+ Cycle_borders_tmp cbt;
257
+ for (unsigned int j = 0; j < cycle.size() - 1; ++j){
258
+ assert(!_matrix()->reducedMatrixR_.is_zero_column(cycle[j]));
259
+ _get_initial_borders(cycle[j], cbt);
260
+ }
261
+ cycles[i] = Cycle_borders(cbt.begin(), cbt.end());
262
+ cycles[i].push_back(_get_dependent_border(cycle.back()));
263
+ } else {
264
+ cycles[i].resize(cycle.size());
265
+ for (unsigned int j = 0; j < cycle.size() - 1; ++j){
266
+ cycles[i][j] = _get_border(cycle[j]);
267
+ }
268
+ cycles[i].back() = _get_dependent_border(cycle.back());
269
+ }
270
+ } else {
271
+ cycles[i].push_back({});
272
+ }
273
+
274
+ ++i;
275
+ }
276
+ return cycles;
277
+ }
278
+
279
+ template <class Master_matrix>
280
+ inline RU_representative_cycles<Master_matrix>& RU_representative_cycles<Master_matrix>::operator=(
281
+ RU_representative_cycles<Master_matrix> other)
282
+ {
283
+ representativeCycles_.swap(other.representativeCycles_);
284
+ u_transposed_.swap(other.u_transposed_);
285
+ // birthToCycle_.swap(other.birthToCycle_);
286
+ return *this;
287
+ }
288
+
289
+ //TODO: try avoid storing the vectors in the unordered set, when it is not reduced as it adds run time for hash
290
+ //computation and possibly comparaison of vectors. Treat them separately. See if it goes faster, or if it was marginal
291
+ template <class Master_matrix>
292
+ inline void RU_representative_cycles<Master_matrix>::_get_initial_borders(Index idx,
293
+ Cycle_borders_tmp& borders) {
294
+ const Cycle& cycle = u_transposed_[idx];
295
+ assert(cycle.back() == idx);
296
+
297
+ auto add_to = [](const std::vector<Index>& b, Cycle_borders_tmp& borders){
298
+ auto p = borders.insert(b);
299
+ if (!p.second) borders.erase(p.first);
300
+ };
301
+
302
+ for (unsigned int j = 0; j < cycle.size() - 1; ++j){
303
+ _get_initial_borders(cycle[j], borders);
304
+ }
305
+
306
+ add_to(_get_dependent_border(idx), borders);
307
+ }
308
+
309
+ template <class Master_matrix>
310
+ inline typename RU_representative_cycles<Master_matrix>::Cycle_border
311
+ RU_representative_cycles<Master_matrix>::_get_border(Index uIndex) {
312
+ const auto& col = _matrix()->reducedMatrixR_.get_column(uIndex);
313
+ Cycle_border res;
314
+
315
+ unsigned int j = 0;
316
+ if constexpr (Master_matrix::Option_list::column_type == Column_types::HEAP ||
317
+ Master_matrix::Option_list::column_type == Column_types::VECTOR) {
318
+ res.reserve(col.size());
319
+ // TODO: have a better way to do this. For now, one cannot use the column iterators for that.
320
+ for (auto i : col.get_content()) {
321
+ if (i != 0) res.push_back(j);
322
+ ++j;
323
+ }
324
+ } else {
325
+ res.resize(col.size());
326
+ for (const auto& entry : col) {
327
+ res[j] = entry.get_row_index();
328
+ ++j;
329
+ }
330
+ }
331
+
332
+ return res;
333
+ }
334
+
335
+ template <class Master_matrix>
336
+ inline typename RU_representative_cycles<Master_matrix>::Cycle_border
337
+ RU_representative_cycles<Master_matrix>::_get_dependent_border(Index uIndex) {
338
+ if (u_transposed_[uIndex].size() == 1){
339
+ return _get_border(uIndex);
340
+ }
341
+
342
+ auto add = [](const Master_matrix::Column& col, Cycle_unreduced_borders_tmp& b){
343
+ if constexpr (Master_matrix::Option_list::column_type == Column_types::HEAP ||
344
+ Master_matrix::Option_list::column_type == Column_types::VECTOR) {
345
+ // TODO: have a better way to do this. For now, one cannot use the column iterators for that.
346
+ unsigned int j = 0;
347
+ for (auto k : col.get_content()) {
348
+ if (k != 0) {
349
+ auto p = b.insert(j);
350
+ if (!p.second) b.erase(p.first);
351
+ }
352
+ ++j;
353
+ }
354
+ } else {
355
+ for (const auto& entry : col) {
356
+ auto p = b.insert(entry.get_row_index());
357
+ if (!p.second) b.erase(p.first);
358
+ }
359
+ }
360
+ };
361
+
362
+ Cycle_unreduced_borders_tmp b;
363
+ for (Index i : u_transposed_[uIndex]){
364
+ add(_matrix()->reducedMatrixR_.get_column(i), b);
365
+ }
366
+
367
+ Cycle_border res(b.begin(), b.end());
368
+ std::sort(res.begin(), res.end());
369
+
370
+ return res;
371
+ }
372
+
373
+ } // namespace persistence_matrix
374
+ } // namespace Gudhi
375
+
376
+ #endif // PM_RU_REP_CYCLES_H