diff options
author | fgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-06 16:47:19 +0000 |
---|---|---|
committer | fgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-06 16:47:19 +0000 |
commit | 524652d3a8a46dd9749821ad2e7684937179d4eb (patch) | |
tree | ee1def426de80a581730805787d6081ee43d175f /src/Bottleneck_distance/include | |
parent | d0db67f8ff185a7698d2f6643d86e43955bab882 (diff) |
small modification
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1829 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: c4eeb9f4b467bdf23c8cd02b5aeac68170c9bcf9
Diffstat (limited to 'src/Bottleneck_distance/include')
-rw-r--r-- | src/Bottleneck_distance/include/gudhi/Persistence_graph.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Bottleneck_distance/include/gudhi/Persistence_graph.h b/src/Bottleneck_distance/include/gudhi/Persistence_graph.h index 8accb926..f16a6c95 100644 --- a/src/Bottleneck_distance/include/gudhi/Persistence_graph.h +++ b/src/Bottleneck_distance/include/gudhi/Persistence_graph.h @@ -68,15 +68,16 @@ public: private: std::vector<Internal_point> u; std::vector<Internal_point> v; - std::vector<double> u_alive; - std::vector<double> v_alive; + double b_alive; }; template<typename Persistence_diagram1, typename Persistence_diagram2> Persistence_graph::Persistence_graph(const Persistence_diagram1 &diag1, const Persistence_diagram2 &diag2, double e) - : u(), v(), u_alive(), v_alive() + : u(), v(), b_alive(0.) { + std::vector<double> u_alive; + std::vector<double> v_alive; for (auto it = std::begin(diag1); it != std::end(diag1); ++it){ if(std::get<1>(*it) == std::numeric_limits<double>::infinity()) u_alive.push_back(std::get<0>(*it)); @@ -89,10 +90,14 @@ Persistence_graph::Persistence_graph(const Persistence_diagram1 &diag1, else if (std::get<1>(*it) - std::get<0>(*it) > e) v.push_back(Internal_point(std::get<0>(*it), std::get<1>(*it), v.size())); } - std::sort(u_alive.begin(), u_alive.end()); - std::sort(v_alive.begin(), v_alive.end()); if (u.size() < v.size()) swap(u, v); + std::sort(u_alive.begin(), u_alive.end()); + std::sort(v_alive.begin(), v_alive.end()); + if(u_alive.size() != v_alive.size()) + b_alive = std::numeric_limits<double>::infinity(); + else for(auto it_u=u_alive.cbegin(), it_v=v_alive.cbegin();it_u != u_alive.cend();++it_u, ++it_v) + b_alive = std::max(b_alive, std::fabs(*it_u - *it_v)); } inline bool Persistence_graph::on_the_u_diagonal(int u_point_index) const { @@ -126,12 +131,7 @@ inline int Persistence_graph::size() const { } inline double Persistence_graph::bottleneck_alive() const{ - if(u_alive.size() != v_alive.size()) - return std::numeric_limits<double>::infinity(); - double max = 0.; - for(auto it_u=u_alive.cbegin(), it_v=v_alive.cbegin();it_u != u_alive.cend();++it_u, ++it_v) - max = std::max(max, std::fabs(*it_u - *it_v)); - return max; + return b_alive; } inline std::vector<double> Persistence_graph::sorted_distances() const { |