diff options
| author | Gard Spreemann <gspr@nonempty.org> | 2021-08-14 18:32:59 +0200 |
|---|---|---|
| committer | Gard Spreemann <gspr@nonempty.org> | 2021-08-14 18:32:59 +0200 |
| commit | 66702d9cf122703964dbe22319ae8d97424d496f (patch) | |
| tree | 08681d5c5b5878ed4283d5fba2cbb8f4612dbf7c /matching | |
| parent | 069338dfb03b4d04c1410b3e24b762b18db5c233 (diff) | |
| parent | 2ed9afc052bee7956f6abb195947de1f80cb9d91 (diff) | |
Merge branch 'upstream/latest' into dfsg/latest
Diffstat (limited to 'matching')
| -rw-r--r-- | matching/include/matching_distance.hpp | 1 | ||||
| -rw-r--r-- | matching/include/persistence_module.h | 1 | ||||
| -rw-r--r-- | matching/include/persistence_module.hpp | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/matching/include/matching_distance.hpp b/matching/include/matching_distance.hpp index f7f44a5..9beab1f 100644 --- a/matching/include/matching_distance.hpp +++ b/matching/include/matching_distance.hpp @@ -362,6 +362,7 @@ namespace md { // TODO: think about this - how to call Hera auto dgm_a = module_a_.weighted_slice_diagram(line); auto dgm_b = module_b_.weighted_slice_diagram(line); + R result; if (params_.hera_epsilon > static_cast<R>(0)) { result = hera::bottleneckDistApprox(dgm_a, dgm_b, params_.hera_epsilon) / ( params_.hera_epsilon + 1); diff --git a/matching/include/persistence_module.h b/matching/include/persistence_module.h index b68c21e..4df2148 100644 --- a/matching/include/persistence_module.h +++ b/matching/include/persistence_module.h @@ -11,6 +11,7 @@ #include "phat/boundary_matrix.h" #include "phat/compute_persistence_pairs.h" +#include "phat/algorithms/standard_reduction.h" #include "common_util.h" #include "dual_point.h" diff --git a/matching/include/persistence_module.hpp b/matching/include/persistence_module.hpp index 7479e02..022b43d 100644 --- a/matching/include/persistence_module.hpp +++ b/matching/include/persistence_module.hpp @@ -158,7 +158,7 @@ namespace md { get_slice_projection_matrix(slice, phat_matrix, gen_projections, rel_projections); phat::persistence_pairs phat_persistence_pairs; - phat::compute_persistence_pairs<phat::twist_reduction>(phat_persistence_pairs, phat_matrix); + phat::compute_persistence_pairs<phat::standard_reduction>(phat_persistence_pairs, phat_matrix, true); Diagram<Real> dgm; |