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,540 +1,540 @@
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_vine_swap.h
13
- * @author Hannah Schreiber
14
- * @brief Contains the @ref Gudhi::persistence_matrix::RU_vine_swap class, as well as the
15
- * @ref Gudhi::persistence_matrix::Dummy_ru_vine_swap and
16
- * @ref Gudhi::persistence_matrix::Dummy_ru_vine_pairing structures.
17
- */
18
-
19
- #ifndef PM_RU_VINE_SWAP_H
20
- #define PM_RU_VINE_SWAP_H
21
-
22
- #include <utility> //std::move
23
- #include <type_traits> //std::conditional
24
- #include <cassert>
25
- #include <stdexcept> //std::invalid_argument
26
-
27
- #include "ru_pairing.h"
28
- #include "boundary_cell_position_to_id_mapper.h"
29
-
30
- namespace Gudhi {
31
- namespace persistence_matrix {
32
-
33
- /**
34
- * @ingroup persistence_matrix
35
- *
36
- * @brief Empty structure.
37
- * Inherited instead of @ref RU_vine_swap, when vine swaps are not enabled.
38
- */
39
- struct Dummy_ru_vine_swap
40
- {
41
- friend void swap([[maybe_unused]] Dummy_ru_vine_swap& d1, [[maybe_unused]] Dummy_ru_vine_swap& d2) {}
42
- };
43
-
44
- /**
45
- * @ingroup persistence_matrix
46
- *
47
- * @brief Empty structure.
48
- * Inherited instead of @ref RU_pairing, when the barcode is not stored.
49
- */
50
- struct Dummy_ru_vine_pairing
51
- {
52
- friend void swap([[maybe_unused]] Dummy_ru_vine_pairing& d1, [[maybe_unused]] Dummy_ru_vine_pairing& d2) {}
53
- };
54
-
55
- /**
56
- * @class RU_vine_swap ru_vine_swap.h gudhi/Persistence_matrix/ru_vine_swap.h
57
- * @ingroup persistence_matrix
58
- *
59
- * @brief Class managing the vine swaps for @ref RU_matrix.
60
- *
61
- * @tparam Master_matrix An instantiation of @ref Matrix from which all types and options are deduced.
62
- */
63
- template <class Master_matrix>
64
- class RU_vine_swap : public std::conditional<Master_matrix::Option_list::has_column_pairings,
65
- RU_pairing<Master_matrix>,
66
- Dummy_ru_vine_pairing
67
- >::type,
68
- public std::conditional<Master_matrix::Option_list::has_column_pairings &&
69
- Master_matrix::Option_list::has_removable_columns,
70
- Dummy_pos_mapper,
71
- Cell_position_to_ID_mapper<typename Master_matrix::ID_index,
72
- typename Master_matrix::Pos_index>
73
- >::type
74
- {
75
- public:
76
- using Index = typename Master_matrix::Index; /**< @ref MatIdx index type. */
77
- using ID_index = typename Master_matrix::ID_index; /**< @ref IDIdx index type. */
78
- using Pos_index = typename Master_matrix::Pos_index; /**< @ref PosIdx index type. */
79
-
80
- /**
81
- * @brief Default constructor.
82
- */
83
- RU_vine_swap();
84
- /**
85
- * @brief Copy constructor.
86
- *
87
- * @param matrixToCopy Matrix to copy.
88
- */
89
- RU_vine_swap(const RU_vine_swap& matrixToCopy);
90
- /**
91
- * @brief Move constructor.
92
- *
93
- * @param other Matrix to move.
94
- */
95
- RU_vine_swap(RU_vine_swap&& other) noexcept;
96
-
97
- /**
98
- * @brief Does the same than @ref vine_swap, but assumes that the swap is non trivial and
99
- * therefore skips a part of the case study.
100
- *
101
- * @param index @ref PosIdx index of the first cell to swap. The second one has to be at `position + 1`.
102
- * @return true If the barcode changed from the swap.
103
- * @return false Otherwise.
104
- */
105
- bool vine_swap_with_z_eq_1_case(Pos_index index);
106
- /**
107
- * @brief Does a vine swap between two cells which are consecutive in the filtration.
108
- * Roughly, if \f$ F \f$ is the current filtration represented by the matrix, the method modifies the matrix
109
- * such that the new state corresponds to a valid state for the filtration \f$ F' \f$ equal to \f$ F \f$ but
110
- * with the two cells at position `position` and `position + 1` swapped. Of course, the two cells should
111
- * not have a face/coface relation which each other ; \f$ F' \f$ has to be a valid filtration.
112
- * See @cite vineyards for more information about vine and vineyards.
113
- *
114
- * @param index @ref PosIdx index of the first cell to swap. The second one has to be at `position + 1`.
115
- * @return true If the barcode changed from the swap.
116
- * @return false Otherwise.
117
- */
118
- bool vine_swap(Pos_index index);
119
-
120
- /**
121
- * @brief Assign operator.
122
- */
123
- RU_vine_swap& operator=(RU_vine_swap other);
124
- /**
125
- * @brief Swap operator.
126
- */
127
- friend void swap(RU_vine_swap& swap1, RU_vine_swap& swap2) {
128
- if constexpr (Master_matrix::Option_list::has_column_pairings) {
129
- swap(static_cast<RU_pairing<Master_matrix>&>(swap1), static_cast<RU_pairing<Master_matrix>&>(swap2));
130
- }
131
- if (!Master_matrix::Option_list::has_column_pairings || !Master_matrix::Option_list::has_removable_columns) {
132
- swap(static_cast<Cell_position_to_ID_mapper<ID_index, Pos_index>&>(swap1),
133
- static_cast<Cell_position_to_ID_mapper<ID_index, Pos_index>&>(swap2));
134
- }
135
- }
136
-
137
- protected:
138
- //RUP = RU matrix Pairing
139
- using RUP = typename std::conditional<Master_matrix::Option_list::has_column_pairings,
140
- RU_pairing<Master_matrix>,
141
- Dummy_ru_vine_pairing
142
- >::type;
143
- //RUM = RU matrix position to id Map
144
- using RUM = typename std::conditional<Master_matrix::Option_list::has_column_pairings &&
145
- Master_matrix::Option_list::has_removable_columns,
146
- Dummy_pos_mapper,
147
- Cell_position_to_ID_mapper<ID_index, Pos_index>
148
- >::type;
149
- constexpr auto& _positionToRowIdx();
150
-
151
- private:
152
- using Master_RU_matrix = typename Master_matrix::Master_RU_matrix;
153
-
154
- bool _is_paired(Index columnIndex);
155
-
156
- void _swap_at_index(Index columnIndex);
157
- void _add_to(Index sourceIndex, Index targetIndex);
158
- void _positive_transpose(Index columnIndex);
159
- void _negative_transpose(Index columnIndex);
160
- void _positive_negative_transpose(Index columnIndex);
161
- void _negative_positive_transpose(Index columnIndex);
162
- bool _positive_vine_swap(Index columnIndex);
163
- bool _negative_vine_swap(Index columnIndex);
164
- bool _positive_negative_vine_swap(Index columnIndex);
165
- bool _negative_positive_vine_swap(Index columnIndex);
166
-
167
- Pos_index& _death(Pos_index simplexIndex);
168
- Pos_index& _birth(Pos_index simplexIndex);
169
- Pos_index _get_death(Index simplexIndex);
170
- Pos_index _get_birth(Index simplexIndex);
171
-
172
- ID_index _get_row_id_from_position(Pos_index position);
173
-
174
- constexpr Master_RU_matrix* _matrix() { return static_cast<Master_RU_matrix*>(this); }
175
- constexpr const Master_RU_matrix* _matrix() const { return static_cast<const Master_RU_matrix*>(this); }
176
- };
177
-
178
- template <class Master_matrix>
179
- inline RU_vine_swap<Master_matrix>::RU_vine_swap() : RUP(), RUM()
180
- {}
181
-
182
- template <class Master_matrix>
183
- inline RU_vine_swap<Master_matrix>::RU_vine_swap(const RU_vine_swap& matrixToCopy)
184
- : RUP(static_cast<const RUP&>(matrixToCopy)),
185
- RUM(static_cast<const RUM&>(matrixToCopy))
186
- {}
187
-
188
- template <class Master_matrix>
189
- inline RU_vine_swap<Master_matrix>::RU_vine_swap(RU_vine_swap<Master_matrix>&& other) noexcept
190
- : RUP(std::move(static_cast<RUP&>(other))),
191
- RUM(std::move(static_cast<RUM&>(other)))
192
- {}
193
-
194
- template <class Master_matrix>
195
- inline bool RU_vine_swap<Master_matrix>::vine_swap_with_z_eq_1_case(Pos_index index)
196
- {
197
- GUDHI_CHECK(index < _matrix()->reducedMatrixR_.get_number_of_columns() - 1,
198
- std::invalid_argument("RU_vine_swap::vine_swap_with_z_eq_1_case - Index to swap out of bound."));
199
-
200
- bool iIsPositive = _matrix()->reducedMatrixR_.is_zero_column(index);
201
- bool iiIsPositive = _matrix()->reducedMatrixR_.is_zero_column(index + 1);
202
-
203
- if (iIsPositive && iiIsPositive) {
204
- _matrix()->mirrorMatrixU_.zero_entry(index, _get_row_id_from_position(index + 1));
205
- return _positive_vine_swap(index);
206
- } else if (!iIsPositive && !iiIsPositive) {
207
- return _negative_vine_swap(index);
208
- } else if (iIsPositive && !iiIsPositive) {
209
- return _positive_negative_vine_swap(index);
210
- } else {
211
- return _negative_positive_vine_swap(index);
212
- }
213
- }
214
-
215
- template <class Master_matrix>
216
- inline bool RU_vine_swap<Master_matrix>::vine_swap(Pos_index index)
217
- {
218
- GUDHI_CHECK(index < _matrix()->reducedMatrixR_.get_number_of_columns() - 1,
219
- std::invalid_argument("RU_vine_swap::vine_swap - Index to swap out of bound."));
220
-
221
- bool iIsPositive = _matrix()->reducedMatrixR_.is_zero_column(index);
222
- bool iiIsPositive = _matrix()->reducedMatrixR_.is_zero_column(index + 1);
223
-
224
- if (iIsPositive && iiIsPositive) {
225
- if (_matrix()->reducedMatrixR_.get_column_dimension(index) !=
226
- _matrix()->reducedMatrixR_.get_column_dimension(index + 1)) {
227
- _positive_transpose(index);
228
- _swap_at_index(index);
229
- return true;
230
- }
231
- if (!_matrix()->mirrorMatrixU_.is_zero_entry(index, _get_row_id_from_position(index + 1))) {
232
- _matrix()->mirrorMatrixU_.zero_entry(index, _get_row_id_from_position(index + 1));
233
- }
234
- return _positive_vine_swap(index);
235
- } else if (!iIsPositive && !iiIsPositive) {
236
- if (_matrix()->reducedMatrixR_.get_column_dimension(index) !=
237
- _matrix()->reducedMatrixR_.get_column_dimension(index + 1) ||
238
- _matrix()->mirrorMatrixU_.is_zero_entry(index, _get_row_id_from_position(index + 1))) {
239
- _negative_transpose(index);
240
- _swap_at_index(index);
241
- return true;
242
- }
243
- return _negative_vine_swap(index);
244
- } else if (iIsPositive && !iiIsPositive) {
245
- if (_matrix()->reducedMatrixR_.get_column_dimension(index) !=
246
- _matrix()->reducedMatrixR_.get_column_dimension(index + 1) ||
247
- _matrix()->mirrorMatrixU_.is_zero_entry(index, _get_row_id_from_position(index + 1))) {
248
- _positive_negative_transpose(index);
249
- _swap_at_index(index);
250
- return true;
251
- }
252
- return _positive_negative_vine_swap(index);
253
- } else {
254
- if (_matrix()->reducedMatrixR_.get_column_dimension(index) !=
255
- _matrix()->reducedMatrixR_.get_column_dimension(index + 1) ||
256
- _matrix()->mirrorMatrixU_.is_zero_entry(index, _get_row_id_from_position(index + 1))) {
257
- _negative_positive_transpose(index);
258
- _swap_at_index(index);
259
- return true;
260
- }
261
- return _negative_positive_vine_swap(index);
262
- }
263
- }
264
-
265
- template <class Master_matrix>
266
- inline RU_vine_swap<Master_matrix>& RU_vine_swap<Master_matrix>::operator=(RU_vine_swap<Master_matrix> other)
267
- {
268
- RUP::operator=(other);
269
- RUM::operator=(other);
270
- return *this;
271
- }
272
-
273
- template <class Master_matrix>
274
- inline bool RU_vine_swap<Master_matrix>::_is_paired(Index columnIndex)
275
- {
276
- if constexpr (Master_matrix::Option_list::has_column_pairings) {
277
- return _get_death(columnIndex) != static_cast<Pos_index>(-1);
278
- } else {
279
- if (!_matrix()->reducedMatrixR_.is_zero_column(columnIndex)) return true;
280
-
281
- if constexpr (Master_matrix::Option_list::has_map_column_container) {
282
- if (_matrix()->pivotToColumnIndex_.find(columnIndex) == _matrix()->pivotToColumnIndex_.end()) return false;
283
- } else {
284
- if (_matrix()->pivotToColumnIndex_.operator[](columnIndex) == static_cast<Index>(-1)) return false;
285
- }
286
-
287
- return true;
288
- }
289
- }
290
-
291
- template <class Master_matrix>
292
- inline void RU_vine_swap<Master_matrix>::_swap_at_index(Index columnIndex)
293
- {
294
- _matrix()->reducedMatrixR_.swap_columns(columnIndex, columnIndex + 1);
295
- _matrix()->reducedMatrixR_.swap_rows(_get_row_id_from_position(columnIndex),
296
- _get_row_id_from_position(columnIndex + 1));
297
- _matrix()->mirrorMatrixU_.swap_columns(columnIndex, columnIndex + 1);
298
- _matrix()->mirrorMatrixU_.swap_rows(_get_row_id_from_position(columnIndex),
299
- _get_row_id_from_position(columnIndex + 1));
300
- }
301
-
302
- template <class Master_matrix>
303
- inline void RU_vine_swap<Master_matrix>::_add_to(Index sourceIndex, Index targetIndex)
304
- {
305
- _matrix()->reducedMatrixR_.add_to(sourceIndex, targetIndex);
306
- _matrix()->mirrorMatrixU_.add_to(targetIndex, sourceIndex);
307
- }
308
-
309
- template <class Master_matrix>
310
- inline void RU_vine_swap<Master_matrix>::_positive_transpose(Index columnIndex)
311
- {
312
- if constexpr (Master_matrix::Option_list::has_map_column_container) {
313
- if (_is_paired(columnIndex) && _is_paired(columnIndex + 1)) {
314
- std::swap(_matrix()->pivotToColumnIndex_.at(columnIndex), _matrix()->pivotToColumnIndex_.at(columnIndex + 1));
315
- } else if (_is_paired(columnIndex)) {
316
- _matrix()->pivotToColumnIndex_.emplace(columnIndex + 1, _matrix()->pivotToColumnIndex_.at(columnIndex));
317
- _matrix()->pivotToColumnIndex_.erase(columnIndex);
318
- } else if (_is_paired(columnIndex + 1)) {
319
- _matrix()->pivotToColumnIndex_.emplace(columnIndex, _matrix()->pivotToColumnIndex_.at(columnIndex + 1));
320
- _matrix()->pivotToColumnIndex_.erase(columnIndex + 1);
321
- }
322
- } else {
323
- std::swap(_matrix()->pivotToColumnIndex_.operator[](columnIndex),
324
- _matrix()->pivotToColumnIndex_.operator[](columnIndex + 1));
325
- }
326
-
327
- if constexpr (Master_matrix::Option_list::has_column_pairings) {
328
- _birth(columnIndex) = columnIndex + 1;
329
- _birth(columnIndex + 1) = columnIndex;
330
- std::swap(RUP::indexToBar_.at(columnIndex), RUP::indexToBar_.at(columnIndex + 1));
331
- }
332
- }
333
-
334
- template <class Master_matrix>
335
- inline void RU_vine_swap<Master_matrix>::_negative_transpose(Index columnIndex)
336
- {
337
- if constexpr (Master_matrix::Option_list::has_column_pairings) {
338
- _death(columnIndex) = columnIndex + 1;
339
- _death(columnIndex + 1) = columnIndex;
340
- std::swap(RUP::indexToBar_.at(columnIndex), RUP::indexToBar_.at(columnIndex + 1));
341
- }
342
- std::swap(_matrix()->pivotToColumnIndex_.at(_get_birth(columnIndex)),
343
- _matrix()->pivotToColumnIndex_.at(_get_birth(columnIndex + 1)));
344
- }
345
-
346
- template <class Master_matrix>
347
- inline void RU_vine_swap<Master_matrix>::_positive_negative_transpose(Index columnIndex)
348
- {
349
- _matrix()->pivotToColumnIndex_.at(_get_birth(columnIndex + 1)) = columnIndex;
350
- if constexpr (Master_matrix::Option_list::has_map_column_container) {
351
- if (_is_paired(columnIndex)) {
352
- _matrix()->pivotToColumnIndex_.emplace(columnIndex + 1, _matrix()->pivotToColumnIndex_.at(columnIndex));
353
- _matrix()->pivotToColumnIndex_.erase(columnIndex);
354
- }
355
- } else {
356
- _matrix()->pivotToColumnIndex_.operator[](columnIndex + 1) = _matrix()->pivotToColumnIndex_.operator[](columnIndex);
357
- _matrix()->pivotToColumnIndex_.operator[](columnIndex) = -1;
358
- }
359
-
360
- if constexpr (Master_matrix::Option_list::has_column_pairings) {
361
- _birth(columnIndex) = columnIndex + 1;
362
- _death(columnIndex + 1) = columnIndex;
363
- std::swap(RUP::indexToBar_.at(columnIndex), RUP::indexToBar_.at(columnIndex + 1));
364
- }
365
- }
366
-
367
- template <class Master_matrix>
368
- inline void RU_vine_swap<Master_matrix>::_negative_positive_transpose(Index columnIndex)
369
- {
370
- _matrix()->pivotToColumnIndex_.at(_get_birth(columnIndex)) = columnIndex + 1;
371
- if constexpr (Master_matrix::Option_list::has_map_column_container) {
372
- if (_is_paired(columnIndex + 1)) {
373
- _matrix()->pivotToColumnIndex_.emplace(columnIndex, _matrix()->pivotToColumnIndex_.at(columnIndex + 1));
374
- _matrix()->pivotToColumnIndex_.erase(columnIndex + 1);
375
- }
376
- } else {
377
- _matrix()->pivotToColumnIndex_.operator[](columnIndex) = _matrix()->pivotToColumnIndex_.operator[](columnIndex + 1);
378
- _matrix()->pivotToColumnIndex_.operator[](columnIndex + 1) = -1;
379
- }
380
-
381
- if constexpr (Master_matrix::Option_list::has_column_pairings) {
382
- _death(columnIndex) = columnIndex + 1;
383
- _birth(columnIndex + 1) = columnIndex;
384
- std::swap(RUP::indexToBar_.at(columnIndex), RUP::indexToBar_.at(columnIndex + 1));
385
- }
386
- }
387
-
388
- template <class Master_matrix>
389
- inline bool RU_vine_swap<Master_matrix>::_positive_vine_swap(Index columnIndex)
390
- {
391
- const Pos_index iDeath = _get_death(columnIndex);
392
- const Pos_index iiDeath = _get_death(columnIndex + 1);
393
-
394
- if (iDeath != static_cast<Pos_index>(-1) && iiDeath != static_cast<Pos_index>(-1) &&
395
- !(_matrix()->reducedMatrixR_.is_zero_entry(iiDeath, _get_row_id_from_position(columnIndex)))) {
396
- if (iDeath < iiDeath) {
397
- _swap_at_index(columnIndex);
398
- _add_to(iDeath, iiDeath);
399
- _positive_transpose(columnIndex);
400
- return true;
401
- }
402
-
403
- _swap_at_index(columnIndex);
404
- _add_to(iiDeath, iDeath);
405
- return false;
406
- }
407
-
408
- _swap_at_index(columnIndex);
409
-
410
- if (iDeath != static_cast<Pos_index>(-1) || iiDeath == static_cast<Pos_index>(-1) ||
411
- _matrix()->reducedMatrixR_.is_zero_entry(iiDeath, _get_row_id_from_position(columnIndex + 1))) {
412
- _positive_transpose(columnIndex);
413
- return true;
414
- }
415
- return false;
416
- }
417
-
418
- template <class Master_matrix>
419
- inline bool RU_vine_swap<Master_matrix>::_negative_vine_swap(Index columnIndex)
420
- {
421
- const Pos_index iBirth = _get_birth(columnIndex);
422
- const Pos_index iiBirth = _get_birth(columnIndex + 1);
423
-
424
- _add_to(columnIndex, columnIndex + 1);
425
- _swap_at_index(columnIndex);
426
-
427
- if (iBirth < iiBirth) {
428
- _negative_transpose(columnIndex);
429
- return true;
430
- }
431
-
432
- _add_to(columnIndex, columnIndex + 1);
433
-
434
- return false;
435
- }
436
-
437
- template <class Master_matrix>
438
- inline bool RU_vine_swap<Master_matrix>::_positive_negative_vine_swap(Index columnIndex)
439
- {
440
- _matrix()->mirrorMatrixU_.zero_entry(columnIndex, _get_row_id_from_position(columnIndex + 1));
441
-
442
- _swap_at_index(columnIndex);
443
- _positive_negative_transpose(columnIndex);
444
-
445
- return true;
446
- }
447
-
448
- template <class Master_matrix>
449
- inline bool RU_vine_swap<Master_matrix>::_negative_positive_vine_swap(Index columnIndex)
450
- {
451
- _add_to(columnIndex, columnIndex + 1); // useless for R?
452
- _swap_at_index(columnIndex); // if additions not made for R, do not swap R columns, just rows
453
- _add_to(columnIndex, columnIndex + 1); // useless for R?
454
-
455
- return false;
456
- }
457
-
458
- template <class Master_matrix>
459
- inline typename RU_vine_swap<Master_matrix>::Pos_index& RU_vine_swap<Master_matrix>::_death(Pos_index simplexIndex)
460
- {
461
- static_assert(Master_matrix::Option_list::has_column_pairings, "Pairing necessary to modify death value.");
462
-
463
- if constexpr (Master_matrix::Option_list::has_removable_columns) {
464
- return RUP::indexToBar_.at(simplexIndex)->death;
465
- } else {
466
- return RUP::barcode_.at(RUP::indexToBar_.at(simplexIndex)).death;
467
- }
468
- }
469
-
470
- template <class Master_matrix>
471
- inline typename RU_vine_swap<Master_matrix>::Pos_index& RU_vine_swap<Master_matrix>::_birth(Pos_index simplexIndex)
472
- {
473
- static_assert(Master_matrix::Option_list::has_column_pairings, "Pairing necessary to modify birth value.");
474
-
475
- if constexpr (Master_matrix::Option_list::has_removable_columns) {
476
- return RUP::indexToBar_.at(simplexIndex)->birth;
477
- } else {
478
- return RUP::barcode_.at(RUP::indexToBar_.at(simplexIndex)).birth;
479
- }
480
- }
481
-
482
- template <class Master_matrix>
483
- inline typename RU_vine_swap<Master_matrix>::Pos_index RU_vine_swap<Master_matrix>::_get_death(Index simplexIndex)
484
- {
485
- if constexpr (Master_matrix::Option_list::has_column_pairings) {
486
- if constexpr (Master_matrix::Option_list::has_removable_columns) {
487
- return RUP::indexToBar_.at(simplexIndex)->death;
488
- } else {
489
- return RUP::barcode_.at(RUP::indexToBar_.at(simplexIndex)).death;
490
- }
491
- } else {
492
- if (!_matrix()->reducedMatrixR_.is_zero_column(simplexIndex))
493
- return _matrix()->reducedMatrixR_.get_column(simplexIndex).get_pivot();
494
-
495
- if constexpr (Master_matrix::Option_list::has_map_column_container) {
496
- auto it = _matrix()->pivotToColumnIndex_.find(simplexIndex);
497
- if (it == _matrix()->pivotToColumnIndex_.end()) return -1;
498
- return it->second;
499
- } else {
500
- return _matrix()->pivotToColumnIndex_.operator[](simplexIndex);
501
- }
502
- }
503
- }
504
-
505
- template <class Master_matrix>
506
- inline typename RU_vine_swap<Master_matrix>::Pos_index RU_vine_swap<Master_matrix>::_get_birth(
507
- Index negativeSimplexIndex)
508
- {
509
- if constexpr (Master_matrix::Option_list::has_column_pairings) {
510
- if constexpr (Master_matrix::Option_list::has_removable_columns) {
511
- return RUP::indexToBar_.at(negativeSimplexIndex)->birth;
512
- } else {
513
- return RUP::barcode_.at(RUP::indexToBar_.at(negativeSimplexIndex)).birth;
514
- }
515
- } else {
516
- return _matrix()->reducedMatrixR_.get_pivot(negativeSimplexIndex);
517
- }
518
- }
519
-
520
- template <class Master_matrix>
521
- inline typename RU_vine_swap<Master_matrix>::ID_index RU_vine_swap<Master_matrix>::_get_row_id_from_position(
522
- Pos_index position)
523
- {
524
- auto it = _positionToRowIdx().find(position);
525
- return it == _positionToRowIdx().end() ? position : it->second;
526
- }
527
-
528
- template <class Master_matrix>
529
- inline constexpr auto& RU_vine_swap<Master_matrix>::_positionToRowIdx()
530
- {
531
- if constexpr (Master_matrix::Option_list::has_column_pairings && Master_matrix::Option_list::has_removable_columns)
532
- return RUP::PIDM::map_;
533
- else
534
- return RUM::map_;
535
- }
536
-
537
- } // namespace persistence_matrix
538
- } // namespace Gudhi
539
-
540
- #endif // PM_RU_VINE_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-24 Inria
6
+ *
7
+ * Modification(s):
8
+ * - YYYY/MM Author: Description of the modification
9
+ */
10
+
11
+ /**
12
+ * @file ru_vine_swap.h
13
+ * @author Hannah Schreiber
14
+ * @brief Contains the @ref Gudhi::persistence_matrix::RU_vine_swap class, as well as the
15
+ * @ref Gudhi::persistence_matrix::Dummy_ru_vine_swap and
16
+ * @ref Gudhi::persistence_matrix::Dummy_ru_vine_pairing structures.
17
+ */
18
+
19
+ #ifndef PM_RU_VINE_SWAP_H
20
+ #define PM_RU_VINE_SWAP_H
21
+
22
+ #include <utility> //std::move
23
+ #include <type_traits> //std::conditional
24
+ #include <cassert>
25
+ #include <stdexcept> //std::invalid_argument
26
+
27
+ #include "ru_pairing.h"
28
+ #include "boundary_cell_position_to_id_mapper.h"
29
+
30
+ namespace Gudhi {
31
+ namespace persistence_matrix {
32
+
33
+ /**
34
+ * @ingroup persistence_matrix
35
+ *
36
+ * @brief Empty structure.
37
+ * Inherited instead of @ref RU_vine_swap, when vine swaps are not enabled.
38
+ */
39
+ struct Dummy_ru_vine_swap
40
+ {
41
+ friend void swap([[maybe_unused]] Dummy_ru_vine_swap& d1, [[maybe_unused]] Dummy_ru_vine_swap& d2) {}
42
+ };
43
+
44
+ /**
45
+ * @ingroup persistence_matrix
46
+ *
47
+ * @brief Empty structure.
48
+ * Inherited instead of @ref RU_pairing, when the barcode is not stored.
49
+ */
50
+ struct Dummy_ru_vine_pairing
51
+ {
52
+ friend void swap([[maybe_unused]] Dummy_ru_vine_pairing& d1, [[maybe_unused]] Dummy_ru_vine_pairing& d2) {}
53
+ };
54
+
55
+ /**
56
+ * @class RU_vine_swap ru_vine_swap.h gudhi/Persistence_matrix/ru_vine_swap.h
57
+ * @ingroup persistence_matrix
58
+ *
59
+ * @brief Class managing the vine swaps for @ref RU_matrix.
60
+ *
61
+ * @tparam Master_matrix An instantiation of @ref Matrix from which all types and options are deduced.
62
+ */
63
+ template <class Master_matrix>
64
+ class RU_vine_swap : public std::conditional<Master_matrix::Option_list::has_column_pairings,
65
+ RU_pairing<Master_matrix>,
66
+ Dummy_ru_vine_pairing
67
+ >::type,
68
+ public std::conditional<Master_matrix::Option_list::has_column_pairings &&
69
+ Master_matrix::Option_list::has_removable_columns,
70
+ Dummy_pos_mapper,
71
+ Cell_position_to_ID_mapper<typename Master_matrix::ID_index,
72
+ typename Master_matrix::Pos_index>
73
+ >::type
74
+ {
75
+ public:
76
+ using Index = typename Master_matrix::Index; /**< @ref MatIdx index type. */
77
+ using ID_index = typename Master_matrix::ID_index; /**< @ref IDIdx index type. */
78
+ using Pos_index = typename Master_matrix::Pos_index; /**< @ref PosIdx index type. */
79
+
80
+ /**
81
+ * @brief Default constructor.
82
+ */
83
+ RU_vine_swap();
84
+ /**
85
+ * @brief Copy constructor.
86
+ *
87
+ * @param matrixToCopy Matrix to copy.
88
+ */
89
+ RU_vine_swap(const RU_vine_swap& matrixToCopy);
90
+ /**
91
+ * @brief Move constructor.
92
+ *
93
+ * @param other Matrix to move.
94
+ */
95
+ RU_vine_swap(RU_vine_swap&& other) noexcept;
96
+
97
+ /**
98
+ * @brief Does the same than @ref vine_swap, but assumes that the swap is non trivial and
99
+ * therefore skips a part of the case study.
100
+ *
101
+ * @param index @ref PosIdx index of the first cell to swap. The second one has to be at `position + 1`.
102
+ * @return true If the barcode changed from the swap.
103
+ * @return false Otherwise.
104
+ */
105
+ bool vine_swap_with_z_eq_1_case(Pos_index index);
106
+ /**
107
+ * @brief Does a vine swap between two cells which are consecutive in the filtration.
108
+ * Roughly, if \f$ F \f$ is the current filtration represented by the matrix, the method modifies the matrix
109
+ * such that the new state corresponds to a valid state for the filtration \f$ F' \f$ equal to \f$ F \f$ but
110
+ * with the two cells at position `position` and `position + 1` swapped. Of course, the two cells should
111
+ * not have a face/coface relation which each other ; \f$ F' \f$ has to be a valid filtration.
112
+ * See @cite vineyards for more information about vine and vineyards.
113
+ *
114
+ * @param index @ref PosIdx index of the first cell to swap. The second one has to be at `position + 1`.
115
+ * @return true If the barcode changed from the swap.
116
+ * @return false Otherwise.
117
+ */
118
+ bool vine_swap(Pos_index index);
119
+
120
+ /**
121
+ * @brief Assign operator.
122
+ */
123
+ RU_vine_swap& operator=(RU_vine_swap other);
124
+ /**
125
+ * @brief Swap operator.
126
+ */
127
+ friend void swap(RU_vine_swap& swap1, RU_vine_swap& swap2) {
128
+ if constexpr (Master_matrix::Option_list::has_column_pairings) {
129
+ swap(static_cast<RU_pairing<Master_matrix>&>(swap1), static_cast<RU_pairing<Master_matrix>&>(swap2));
130
+ }
131
+ if (!Master_matrix::Option_list::has_column_pairings || !Master_matrix::Option_list::has_removable_columns) {
132
+ swap(static_cast<Cell_position_to_ID_mapper<ID_index, Pos_index>&>(swap1),
133
+ static_cast<Cell_position_to_ID_mapper<ID_index, Pos_index>&>(swap2));
134
+ }
135
+ }
136
+
137
+ protected:
138
+ //RUP = RU matrix Pairing
139
+ using RUP = typename std::conditional<Master_matrix::Option_list::has_column_pairings,
140
+ RU_pairing<Master_matrix>,
141
+ Dummy_ru_vine_pairing
142
+ >::type;
143
+ //RUM = RU matrix position to id Map
144
+ using RUM = typename std::conditional<Master_matrix::Option_list::has_column_pairings &&
145
+ Master_matrix::Option_list::has_removable_columns,
146
+ Dummy_pos_mapper,
147
+ Cell_position_to_ID_mapper<ID_index, Pos_index>
148
+ >::type;
149
+ constexpr auto& _positionToRowIdx();
150
+
151
+ private:
152
+ using Master_RU_matrix = typename Master_matrix::Master_RU_matrix;
153
+
154
+ bool _is_paired(Index columnIndex);
155
+
156
+ void _swap_at_index(Index columnIndex);
157
+ void _add_to(Index sourceIndex, Index targetIndex);
158
+ void _positive_transpose(Index columnIndex);
159
+ void _negative_transpose(Index columnIndex);
160
+ void _positive_negative_transpose(Index columnIndex);
161
+ void _negative_positive_transpose(Index columnIndex);
162
+ bool _positive_vine_swap(Index columnIndex);
163
+ bool _negative_vine_swap(Index columnIndex);
164
+ bool _positive_negative_vine_swap(Index columnIndex);
165
+ bool _negative_positive_vine_swap(Index columnIndex);
166
+
167
+ Pos_index& _death(Pos_index simplexIndex);
168
+ Pos_index& _birth(Pos_index simplexIndex);
169
+ Pos_index _get_death(Index simplexIndex);
170
+ Pos_index _get_birth(Index simplexIndex);
171
+
172
+ ID_index _get_row_id_from_position(Pos_index position);
173
+
174
+ constexpr Master_RU_matrix* _matrix() { return static_cast<Master_RU_matrix*>(this); }
175
+ constexpr const Master_RU_matrix* _matrix() const { return static_cast<const Master_RU_matrix*>(this); }
176
+ };
177
+
178
+ template <class Master_matrix>
179
+ inline RU_vine_swap<Master_matrix>::RU_vine_swap() : RUP(), RUM()
180
+ {}
181
+
182
+ template <class Master_matrix>
183
+ inline RU_vine_swap<Master_matrix>::RU_vine_swap(const RU_vine_swap& matrixToCopy)
184
+ : RUP(static_cast<const RUP&>(matrixToCopy)),
185
+ RUM(static_cast<const RUM&>(matrixToCopy))
186
+ {}
187
+
188
+ template <class Master_matrix>
189
+ inline RU_vine_swap<Master_matrix>::RU_vine_swap(RU_vine_swap<Master_matrix>&& other) noexcept
190
+ : RUP(std::move(static_cast<RUP&>(other))),
191
+ RUM(std::move(static_cast<RUM&>(other)))
192
+ {}
193
+
194
+ template <class Master_matrix>
195
+ inline bool RU_vine_swap<Master_matrix>::vine_swap_with_z_eq_1_case(Pos_index index)
196
+ {
197
+ GUDHI_CHECK(index < _matrix()->reducedMatrixR_.get_number_of_columns() - 1,
198
+ std::invalid_argument("RU_vine_swap::vine_swap_with_z_eq_1_case - Index to swap out of bound."));
199
+
200
+ bool iIsPositive = _matrix()->reducedMatrixR_.is_zero_column(index);
201
+ bool iiIsPositive = _matrix()->reducedMatrixR_.is_zero_column(index + 1);
202
+
203
+ if (iIsPositive && iiIsPositive) {
204
+ _matrix()->mirrorMatrixU_.zero_entry(index, _get_row_id_from_position(index + 1));
205
+ return _positive_vine_swap(index);
206
+ } else if (!iIsPositive && !iiIsPositive) {
207
+ return _negative_vine_swap(index);
208
+ } else if (iIsPositive && !iiIsPositive) {
209
+ return _positive_negative_vine_swap(index);
210
+ } else {
211
+ return _negative_positive_vine_swap(index);
212
+ }
213
+ }
214
+
215
+ template <class Master_matrix>
216
+ inline bool RU_vine_swap<Master_matrix>::vine_swap(Pos_index index)
217
+ {
218
+ GUDHI_CHECK(index < _matrix()->reducedMatrixR_.get_number_of_columns() - 1,
219
+ std::invalid_argument("RU_vine_swap::vine_swap - Index to swap out of bound."));
220
+
221
+ bool iIsPositive = _matrix()->reducedMatrixR_.is_zero_column(index);
222
+ bool iiIsPositive = _matrix()->reducedMatrixR_.is_zero_column(index + 1);
223
+
224
+ if (iIsPositive && iiIsPositive) {
225
+ if (_matrix()->reducedMatrixR_.get_column_dimension(index) !=
226
+ _matrix()->reducedMatrixR_.get_column_dimension(index + 1)) {
227
+ _positive_transpose(index);
228
+ _swap_at_index(index);
229
+ return true;
230
+ }
231
+ if (!_matrix()->mirrorMatrixU_.is_zero_entry(index, _get_row_id_from_position(index + 1))) {
232
+ _matrix()->mirrorMatrixU_.zero_entry(index, _get_row_id_from_position(index + 1));
233
+ }
234
+ return _positive_vine_swap(index);
235
+ } else if (!iIsPositive && !iiIsPositive) {
236
+ if (_matrix()->reducedMatrixR_.get_column_dimension(index) !=
237
+ _matrix()->reducedMatrixR_.get_column_dimension(index + 1) ||
238
+ _matrix()->mirrorMatrixU_.is_zero_entry(index, _get_row_id_from_position(index + 1))) {
239
+ _negative_transpose(index);
240
+ _swap_at_index(index);
241
+ return true;
242
+ }
243
+ return _negative_vine_swap(index);
244
+ } else if (iIsPositive && !iiIsPositive) {
245
+ if (_matrix()->reducedMatrixR_.get_column_dimension(index) !=
246
+ _matrix()->reducedMatrixR_.get_column_dimension(index + 1) ||
247
+ _matrix()->mirrorMatrixU_.is_zero_entry(index, _get_row_id_from_position(index + 1))) {
248
+ _positive_negative_transpose(index);
249
+ _swap_at_index(index);
250
+ return true;
251
+ }
252
+ return _positive_negative_vine_swap(index);
253
+ } else {
254
+ if (_matrix()->reducedMatrixR_.get_column_dimension(index) !=
255
+ _matrix()->reducedMatrixR_.get_column_dimension(index + 1) ||
256
+ _matrix()->mirrorMatrixU_.is_zero_entry(index, _get_row_id_from_position(index + 1))) {
257
+ _negative_positive_transpose(index);
258
+ _swap_at_index(index);
259
+ return true;
260
+ }
261
+ return _negative_positive_vine_swap(index);
262
+ }
263
+ }
264
+
265
+ template <class Master_matrix>
266
+ inline RU_vine_swap<Master_matrix>& RU_vine_swap<Master_matrix>::operator=(RU_vine_swap<Master_matrix> other)
267
+ {
268
+ RUP::operator=(other);
269
+ RUM::operator=(other);
270
+ return *this;
271
+ }
272
+
273
+ template <class Master_matrix>
274
+ inline bool RU_vine_swap<Master_matrix>::_is_paired(Index columnIndex)
275
+ {
276
+ if constexpr (Master_matrix::Option_list::has_column_pairings) {
277
+ return _get_death(columnIndex) != static_cast<Pos_index>(-1);
278
+ } else {
279
+ if (!_matrix()->reducedMatrixR_.is_zero_column(columnIndex)) return true;
280
+
281
+ if constexpr (Master_matrix::Option_list::has_map_column_container) {
282
+ if (_matrix()->pivotToColumnIndex_.find(columnIndex) == _matrix()->pivotToColumnIndex_.end()) return false;
283
+ } else {
284
+ if (_matrix()->pivotToColumnIndex_.operator[](columnIndex) == static_cast<Index>(-1)) return false;
285
+ }
286
+
287
+ return true;
288
+ }
289
+ }
290
+
291
+ template <class Master_matrix>
292
+ inline void RU_vine_swap<Master_matrix>::_swap_at_index(Index columnIndex)
293
+ {
294
+ _matrix()->reducedMatrixR_.swap_columns(columnIndex, columnIndex + 1);
295
+ _matrix()->reducedMatrixR_.swap_rows(_get_row_id_from_position(columnIndex),
296
+ _get_row_id_from_position(columnIndex + 1));
297
+ _matrix()->mirrorMatrixU_.swap_columns(columnIndex, columnIndex + 1);
298
+ _matrix()->mirrorMatrixU_.swap_rows(_get_row_id_from_position(columnIndex),
299
+ _get_row_id_from_position(columnIndex + 1));
300
+ }
301
+
302
+ template <class Master_matrix>
303
+ inline void RU_vine_swap<Master_matrix>::_add_to(Index sourceIndex, Index targetIndex)
304
+ {
305
+ _matrix()->reducedMatrixR_.add_to(sourceIndex, targetIndex);
306
+ _matrix()->mirrorMatrixU_.add_to(targetIndex, sourceIndex);
307
+ }
308
+
309
+ template <class Master_matrix>
310
+ inline void RU_vine_swap<Master_matrix>::_positive_transpose(Index columnIndex)
311
+ {
312
+ if constexpr (Master_matrix::Option_list::has_map_column_container) {
313
+ if (_is_paired(columnIndex) && _is_paired(columnIndex + 1)) {
314
+ std::swap(_matrix()->pivotToColumnIndex_.at(columnIndex), _matrix()->pivotToColumnIndex_.at(columnIndex + 1));
315
+ } else if (_is_paired(columnIndex)) {
316
+ _matrix()->pivotToColumnIndex_.emplace(columnIndex + 1, _matrix()->pivotToColumnIndex_.at(columnIndex));
317
+ _matrix()->pivotToColumnIndex_.erase(columnIndex);
318
+ } else if (_is_paired(columnIndex + 1)) {
319
+ _matrix()->pivotToColumnIndex_.emplace(columnIndex, _matrix()->pivotToColumnIndex_.at(columnIndex + 1));
320
+ _matrix()->pivotToColumnIndex_.erase(columnIndex + 1);
321
+ }
322
+ } else {
323
+ std::swap(_matrix()->pivotToColumnIndex_.operator[](columnIndex),
324
+ _matrix()->pivotToColumnIndex_.operator[](columnIndex + 1));
325
+ }
326
+
327
+ if constexpr (Master_matrix::Option_list::has_column_pairings) {
328
+ _birth(columnIndex) = columnIndex + 1;
329
+ _birth(columnIndex + 1) = columnIndex;
330
+ std::swap(RUP::indexToBar_.at(columnIndex), RUP::indexToBar_.at(columnIndex + 1));
331
+ }
332
+ }
333
+
334
+ template <class Master_matrix>
335
+ inline void RU_vine_swap<Master_matrix>::_negative_transpose(Index columnIndex)
336
+ {
337
+ if constexpr (Master_matrix::Option_list::has_column_pairings) {
338
+ _death(columnIndex) = columnIndex + 1;
339
+ _death(columnIndex + 1) = columnIndex;
340
+ std::swap(RUP::indexToBar_.at(columnIndex), RUP::indexToBar_.at(columnIndex + 1));
341
+ }
342
+ std::swap(_matrix()->pivotToColumnIndex_.at(_get_birth(columnIndex)),
343
+ _matrix()->pivotToColumnIndex_.at(_get_birth(columnIndex + 1)));
344
+ }
345
+
346
+ template <class Master_matrix>
347
+ inline void RU_vine_swap<Master_matrix>::_positive_negative_transpose(Index columnIndex)
348
+ {
349
+ _matrix()->pivotToColumnIndex_.at(_get_birth(columnIndex + 1)) = columnIndex;
350
+ if constexpr (Master_matrix::Option_list::has_map_column_container) {
351
+ if (_is_paired(columnIndex)) {
352
+ _matrix()->pivotToColumnIndex_.emplace(columnIndex + 1, _matrix()->pivotToColumnIndex_.at(columnIndex));
353
+ _matrix()->pivotToColumnIndex_.erase(columnIndex);
354
+ }
355
+ } else {
356
+ _matrix()->pivotToColumnIndex_.operator[](columnIndex + 1) = _matrix()->pivotToColumnIndex_.operator[](columnIndex);
357
+ _matrix()->pivotToColumnIndex_.operator[](columnIndex) = -1;
358
+ }
359
+
360
+ if constexpr (Master_matrix::Option_list::has_column_pairings) {
361
+ _birth(columnIndex) = columnIndex + 1;
362
+ _death(columnIndex + 1) = columnIndex;
363
+ std::swap(RUP::indexToBar_.at(columnIndex), RUP::indexToBar_.at(columnIndex + 1));
364
+ }
365
+ }
366
+
367
+ template <class Master_matrix>
368
+ inline void RU_vine_swap<Master_matrix>::_negative_positive_transpose(Index columnIndex)
369
+ {
370
+ _matrix()->pivotToColumnIndex_.at(_get_birth(columnIndex)) = columnIndex + 1;
371
+ if constexpr (Master_matrix::Option_list::has_map_column_container) {
372
+ if (_is_paired(columnIndex + 1)) {
373
+ _matrix()->pivotToColumnIndex_.emplace(columnIndex, _matrix()->pivotToColumnIndex_.at(columnIndex + 1));
374
+ _matrix()->pivotToColumnIndex_.erase(columnIndex + 1);
375
+ }
376
+ } else {
377
+ _matrix()->pivotToColumnIndex_.operator[](columnIndex) = _matrix()->pivotToColumnIndex_.operator[](columnIndex + 1);
378
+ _matrix()->pivotToColumnIndex_.operator[](columnIndex + 1) = -1;
379
+ }
380
+
381
+ if constexpr (Master_matrix::Option_list::has_column_pairings) {
382
+ _death(columnIndex) = columnIndex + 1;
383
+ _birth(columnIndex + 1) = columnIndex;
384
+ std::swap(RUP::indexToBar_.at(columnIndex), RUP::indexToBar_.at(columnIndex + 1));
385
+ }
386
+ }
387
+
388
+ template <class Master_matrix>
389
+ inline bool RU_vine_swap<Master_matrix>::_positive_vine_swap(Index columnIndex)
390
+ {
391
+ const Pos_index iDeath = _get_death(columnIndex);
392
+ const Pos_index iiDeath = _get_death(columnIndex + 1);
393
+
394
+ if (iDeath != static_cast<Pos_index>(-1) && iiDeath != static_cast<Pos_index>(-1) &&
395
+ !(_matrix()->reducedMatrixR_.is_zero_entry(iiDeath, _get_row_id_from_position(columnIndex)))) {
396
+ if (iDeath < iiDeath) {
397
+ _swap_at_index(columnIndex);
398
+ _add_to(iDeath, iiDeath);
399
+ _positive_transpose(columnIndex);
400
+ return true;
401
+ }
402
+
403
+ _swap_at_index(columnIndex);
404
+ _add_to(iiDeath, iDeath);
405
+ return false;
406
+ }
407
+
408
+ _swap_at_index(columnIndex);
409
+
410
+ if (iDeath != static_cast<Pos_index>(-1) || iiDeath == static_cast<Pos_index>(-1) ||
411
+ _matrix()->reducedMatrixR_.is_zero_entry(iiDeath, _get_row_id_from_position(columnIndex + 1))) {
412
+ _positive_transpose(columnIndex);
413
+ return true;
414
+ }
415
+ return false;
416
+ }
417
+
418
+ template <class Master_matrix>
419
+ inline bool RU_vine_swap<Master_matrix>::_negative_vine_swap(Index columnIndex)
420
+ {
421
+ const Pos_index iBirth = _get_birth(columnIndex);
422
+ const Pos_index iiBirth = _get_birth(columnIndex + 1);
423
+
424
+ _add_to(columnIndex, columnIndex + 1);
425
+ _swap_at_index(columnIndex);
426
+
427
+ if (iBirth < iiBirth) {
428
+ _negative_transpose(columnIndex);
429
+ return true;
430
+ }
431
+
432
+ _add_to(columnIndex, columnIndex + 1);
433
+
434
+ return false;
435
+ }
436
+
437
+ template <class Master_matrix>
438
+ inline bool RU_vine_swap<Master_matrix>::_positive_negative_vine_swap(Index columnIndex)
439
+ {
440
+ _matrix()->mirrorMatrixU_.zero_entry(columnIndex, _get_row_id_from_position(columnIndex + 1));
441
+
442
+ _swap_at_index(columnIndex);
443
+ _positive_negative_transpose(columnIndex);
444
+
445
+ return true;
446
+ }
447
+
448
+ template <class Master_matrix>
449
+ inline bool RU_vine_swap<Master_matrix>::_negative_positive_vine_swap(Index columnIndex)
450
+ {
451
+ _add_to(columnIndex, columnIndex + 1); // useless for R?
452
+ _swap_at_index(columnIndex); // if additions not made for R, do not swap R columns, just rows
453
+ _add_to(columnIndex, columnIndex + 1); // useless for R?
454
+
455
+ return false;
456
+ }
457
+
458
+ template <class Master_matrix>
459
+ inline typename RU_vine_swap<Master_matrix>::Pos_index& RU_vine_swap<Master_matrix>::_death(Pos_index simplexIndex)
460
+ {
461
+ static_assert(Master_matrix::Option_list::has_column_pairings, "Pairing necessary to modify death value.");
462
+
463
+ if constexpr (Master_matrix::Option_list::has_removable_columns) {
464
+ return RUP::indexToBar_.at(simplexIndex)->death;
465
+ } else {
466
+ return RUP::barcode_.at(RUP::indexToBar_.at(simplexIndex)).death;
467
+ }
468
+ }
469
+
470
+ template <class Master_matrix>
471
+ inline typename RU_vine_swap<Master_matrix>::Pos_index& RU_vine_swap<Master_matrix>::_birth(Pos_index simplexIndex)
472
+ {
473
+ static_assert(Master_matrix::Option_list::has_column_pairings, "Pairing necessary to modify birth value.");
474
+
475
+ if constexpr (Master_matrix::Option_list::has_removable_columns) {
476
+ return RUP::indexToBar_.at(simplexIndex)->birth;
477
+ } else {
478
+ return RUP::barcode_.at(RUP::indexToBar_.at(simplexIndex)).birth;
479
+ }
480
+ }
481
+
482
+ template <class Master_matrix>
483
+ inline typename RU_vine_swap<Master_matrix>::Pos_index RU_vine_swap<Master_matrix>::_get_death(Index simplexIndex)
484
+ {
485
+ if constexpr (Master_matrix::Option_list::has_column_pairings) {
486
+ if constexpr (Master_matrix::Option_list::has_removable_columns) {
487
+ return RUP::indexToBar_.at(simplexIndex)->death;
488
+ } else {
489
+ return RUP::barcode_.at(RUP::indexToBar_.at(simplexIndex)).death;
490
+ }
491
+ } else {
492
+ if (!_matrix()->reducedMatrixR_.is_zero_column(simplexIndex))
493
+ return _matrix()->reducedMatrixR_.get_column(simplexIndex).get_pivot();
494
+
495
+ if constexpr (Master_matrix::Option_list::has_map_column_container) {
496
+ auto it = _matrix()->pivotToColumnIndex_.find(simplexIndex);
497
+ if (it == _matrix()->pivotToColumnIndex_.end()) return -1;
498
+ return it->second;
499
+ } else {
500
+ return _matrix()->pivotToColumnIndex_.operator[](simplexIndex);
501
+ }
502
+ }
503
+ }
504
+
505
+ template <class Master_matrix>
506
+ inline typename RU_vine_swap<Master_matrix>::Pos_index RU_vine_swap<Master_matrix>::_get_birth(
507
+ Index negativeSimplexIndex)
508
+ {
509
+ if constexpr (Master_matrix::Option_list::has_column_pairings) {
510
+ if constexpr (Master_matrix::Option_list::has_removable_columns) {
511
+ return RUP::indexToBar_.at(negativeSimplexIndex)->birth;
512
+ } else {
513
+ return RUP::barcode_.at(RUP::indexToBar_.at(negativeSimplexIndex)).birth;
514
+ }
515
+ } else {
516
+ return _matrix()->reducedMatrixR_.get_pivot(negativeSimplexIndex);
517
+ }
518
+ }
519
+
520
+ template <class Master_matrix>
521
+ inline typename RU_vine_swap<Master_matrix>::ID_index RU_vine_swap<Master_matrix>::_get_row_id_from_position(
522
+ Pos_index position)
523
+ {
524
+ auto it = _positionToRowIdx().find(position);
525
+ return it == _positionToRowIdx().end() ? position : it->second;
526
+ }
527
+
528
+ template <class Master_matrix>
529
+ inline constexpr auto& RU_vine_swap<Master_matrix>::_positionToRowIdx()
530
+ {
531
+ if constexpr (Master_matrix::Option_list::has_column_pairings && Master_matrix::Option_list::has_removable_columns)
532
+ return RUP::PIDM::map_;
533
+ else
534
+ return RUM::map_;
535
+ }
536
+
537
+ } // namespace persistence_matrix
538
+ } // namespace Gudhi
539
+
540
+ #endif // PM_RU_VINE_SWAP_H