Skip to content

Small fixes #15

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
sukeya merged 2 commits into from
Nov 23, 2025
Merged

Small fixes #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29d7a5b
Fix size type.
sukeya Nov 23, 2025
f4c443f
Add name to unnamed namespace.
sukeya Nov 23, 2025
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
4 changes: 2 additions & 2 deletions include/mvPolynomial/index_comparer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class IndexComparer final {
* \param[in] rhd an index
*/
static constexpr std::strong_ordering Compare(const Index& lhd, const Index& rhd) {
for (std::size_t i = 0; i < lhd.size(); ++i) {
for (int i = 0; i < lhd.size(); ++i) {
auto comp = lhd[i] <=> rhd[i];
if (comp < 0) {
return std::strong_ordering::greater;
Expand All @@ -48,7 +48,7 @@ class IndexComparer final {
* \param[in] rhd an index
*/
bool operator()(const Index& lhd, const Index& rhd) const {
for (std::size_t i = 0; i < lhd.size(); ++i) {
for (int i = 0; i < lhd.size(); ++i) {
if (lhd[i] < rhd[i]) {
return true;
} else if (lhd[i] > rhd[i]) {
Expand Down
14 changes: 8 additions & 6 deletions include/mvPolynomial/mvPolynomial.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "platanus/btree_map.hpp"

namespace mvPolynomial {
namespace {
namespace details {
void CheckAxis(int dim, int axis) {
if (axis < 0 || axis >= dim) {
throw std::runtime_error(
Expand Down Expand Up @@ -60,7 +60,7 @@ auto OfImpl(Iterator begin, Iterator end, int dim, int axis, const Coord& x) {
return sum;
}
}
} // namespace
} // namespace details

template <
std::signed_integral IntType,
Expand Down Expand Up @@ -258,7 +258,7 @@ class MVPolynomial final {
return index2value_.upper_bound(i);
}

R operator()(const coord_type& x) const { return OfImpl(crbegin(), crend(), dim, 0, x); }
R operator()(const coord_type& x) const { return details::OfImpl(crbegin(), crend(), dim, 0, x); }

MVPolynomial operator+() const { return *this; }

Expand Down Expand Up @@ -311,12 +311,14 @@ class MVPolynomial final {

// friend functions
friend bool operator==(const MVPolynomial& l, const MVPolynomial& r) {
using size_type = typename MVPolynomial::size_type;

if (l.size() != r.size()) {
return false;
}
auto l_it = l.cbegin();
auto r_it = r.cbegin();
for (std::size_t i = 0; i != l.size(); ++i) {
for (size_type i = 0; i != l.size(); ++i) {
const auto& [l_idx, l_coeff] = *l_it;
const auto& [r_idx, r_coeff] = *r_it;
if ((l_idx != r_idx).any()) {
Expand Down Expand Up @@ -402,7 +404,7 @@ auto D(const MVPolynomial<IntType, R, Dim, Allocator>& p, int axis) {
using Index = typename MP::index_type;
using IndexAndCoeff = typename MP::value_type;

CheckAxis(MP::dim, axis);
details::CheckAxis(MP::dim, axis);

auto dp = MP{p.get_allocator()};
auto p_it = p.begin();
Expand Down Expand Up @@ -431,7 +433,7 @@ template <std::signed_integral IntType, std::floating_point R, int D, class Allo
auto Integrate(MVPolynomial<IntType, R, D, Allocator>&& p, int axis) {
using MP = MVPolynomial<IntType, R, D, Allocator>;

CheckAxis(D, axis);
details::CheckAxis(D, axis);

for (auto& index_and_value : p) {
auto& value = index_and_value.second;
Expand Down