Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update from gudhi #20

Merged
merged 10 commits into from
Sep 23, 2024
Merged

Update from gudhi #20

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
762a078
gudhi update
hschreiber Sep 17, 2024
eb9b997
Merge branch 'DavidLapous:main' into update_from_gudhi
hschreiber Sep 17, 2024
5928833
gudhi update
hschreiber Sep 17, 2024
b64d74e
minor changes
hschreiber Sep 18, 2024
fb2daa0
correct output
hschreiber Sep 19, 2024
077d280
Merge branch 'DavidLapous:main' into update_from_gudhi
hschreiber Sep 19, 2024
c8d64f4
Merge branch 'update_from_gudhi' of github.com:hschreiber/multipers i…
hschreiber Sep 19, 2024
ca2eb5b
fix
hschreiber Sep 20, 2024
3299966
fix
hschreiber Sep 20, 2024
c307a71
upstream merge
hschreiber Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 30 additions & 11 deletions multipers/multiparameter_module_approximation/approximation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,21 +742,40 @@ inline void Module<value_type>::_add_bar_with_threshold(const Line<value_type> &
if (birth_filtration >= death_filtration) return;

if constexpr (verbose) {
std::cout << "--BAR (" << birth_filtration << ", " << death_filtration << ") at basepoint " << line.basepoint()
<< " direction " << line.direction();
std::cout << "--BAR (" << birth_filtration << ", " << death_filtration << ") at basepoint " << line.base_point()
<< " direction " << line.direction() << std::endl;
}

auto bounds = line.get_bounds(box_);
if (bounds.first == filtration_type::T_inf && bounds.second == -filtration_type::T_inf) return; // no intersection

if (bounds.first > birth_filtration) birth_filtration = threshold_in ? bounds.first : -filtration_type::T_inf;
if (bounds.second < death_filtration) death_filtration = threshold_in ? bounds.second : filtration_type::T_inf;
auto birth_container = line[birth_filtration];
if constexpr (verbose) std::cout << " B: " << birth_container << " B*d: " << birth_filtration * line.direction();
if (birth_container.is_minus_inf()){
if (threshold_in) birth_container = box_.get_lower_corner();
} else {
bool allInf = true;
for (std::size_t i = 0U; i < birth_container.num_parameters(); i++) {
auto t = box_.get_lower_corner()[i];
if (birth_container[i] < t - 1e-10) birth_container[i] = threshold_in ? t : -filtration_type::T_inf;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reminder for later, the 1e-10 is funny

if (birth_container[i] != -filtration_type::T_inf) allInf = false;
}
if (allInf) birth_container = filtration_type::minus_inf();
}

if (birth_filtration < death_filtration) {
if constexpr (verbose)
std::cout << " BT: " << line[birth_filtration] << " DT: " << line[death_filtration] << std::endl;
summand.add_bar(line[birth_filtration], line[death_filtration]);
auto death_container = line[death_filtration];
if constexpr (verbose) std::cout << " D: " << death_container;
if (death_container.is_plus_inf()){
if (threshold_in) death_container = box_.get_upper_corner();
} else {
bool allInf = true;
for (std::size_t i = 0U; i < death_container.num_parameters(); i++) {
auto t = box_.get_upper_corner()[i];
if (death_container[i] > t + 1e-10) death_container[i] = threshold_in ? t : filtration_type::T_inf;
if (death_container[i] != filtration_type::T_inf) allInf = false;
}
if (allInf) death_container = filtration_type::inf();
}

if constexpr (verbose) std::cout << " BT: " << birth_container << " DT: " << death_container << std::endl;
summand.add_bar(birth_container, death_container);
}

template <typename value_type> inline Module<value_type>::Module() {}
Expand Down
Loading