Skip to content

small fixes #53

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

Merged
DavidLapous merged 1 commit into from
Jan 21, 2026
Merged

small fixes #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion multipers/io.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ def _multi_critical_from_slicer(
str algo:Literal["path","tree"]="path",
degree:Optional[int]=None,
bool clear = True,
swedish:Optional[bool] = None,
swedish = None,
bool verbose = False,
bool kcritical=False,
**slicer_kwargs,
Expand Down
28 changes: 16 additions & 12 deletions multipers/multiparameter_module_approximation/approximation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#define APPROXIMATION_H_INCLUDED

#include <algorithm>
#include <cassert>
#include <cmath>
#include <cstddef>
#include <cstdint>
Expand Down Expand Up @@ -403,33 +404,36 @@ class Summand {
Summand<int64_t> grid_squeeze(const std::vector<std::vector<value_type>> &grid) const;

void evaluate_in_grid(const std::vector<std::vector<value_type>> &grid) {
using T = typename filtration_type::value_type;
if (birth_corners_.num_generators() == 0) return;
auto num_parameters = birth_corners_.num_parameters();
auto snap = [](value_type x) {
value_type a = std::floor(x);
value_type b = std::ceil(x);
size_t out;
auto snap = [](T x) {
T a = std::floor(x);
T b = std::ceil(x);
std::size_t out;
if (x - a < b - x)
out = static_cast<size_t>(a);
out = static_cast<std::size_t>(a);
else
out = static_cast<size_t>(b);
out = static_cast<std::size_t>(b);
return out;
};
auto todo = [&](auto &corners) {
return [&](size_t g) {
return [&](std::size_t g) {
// auto &x = corners[i];
// for (auto g = 0u; g < x.num_generators(); ++g) {
for (auto p = 0u; p < corners.num_parameters(); ++p) {
value_type snapped = snap(corners(g, p));
corners(g, p) = (snapped >= grid[p].size() ? filtration_type::inf(num_parameters)(0,p) : grid[p][snapped]);
assert(corners(g, p) >= 0);
if (corners(g, p) != filtration_type::T_inf) {
std::size_t snapped = snap(corners(g, p));
corners(g, p) = (snapped >= grid[p].size() ? filtration_type::T_inf : grid[p][snapped]);
}
}
// }
};
};

tbb::parallel_for(size_t(0), birth_corners_.size(), todo(birth_corners_));
tbb::parallel_for(std::size_t(0), birth_corners_.size(), todo(birth_corners_));
if (death_corners_.num_generators() == 0) return;
tbb::parallel_for(size_t(0), death_corners_.size(), todo(death_corners_));
tbb::parallel_for(std::size_t(0), death_corners_.size(), todo(death_corners_));
};

void snap_to_integers() {
Expand Down