Skip to content

Fix container type and empty-vector defects in the composite quadratures #105

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

Open
susilehtola wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix container type and empty-vector defects in the composite quadratures #105

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
10 changes: 7 additions & 3 deletions include/integratorxx/composite_quadratures/pruned_spherical_quadrature.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <integratorxx/types.hpp>
#include <integratorxx/type_traits.hpp>

#include <stdexcept>
#include <utility>

namespace IntegratorXX {
Expand Down Expand Up @@ -45,6 +46,9 @@ class RadialGridPartition {

template <typename RadialQuad>
void finalize( const RadialQuad& rq ) {
if( partition_idx_.empty() )
throw std::runtime_error(
"RadialGridPartition: cannot finalize without any angular quadrature");
if( partition_idx_.back() != rq.npts() )
partition_idx_.emplace_back( rq.npts() );
}
Expand Down Expand Up @@ -179,13 +183,13 @@ class PrunedSphericalQuadrature :
const point_container& sph_points_adaptor() const override {
return quad_base_type::points();
}
point_container& sph_points_adaptor() override {;
point_container& sph_points_adaptor() override {
return quad_base_type::points();
}
const weight_container& sph_weights_adaptor() const override {;
const weight_container& sph_weights_adaptor() const override {
return quad_base_type::weights();
}
weight_container& sph_weights_adaptor() override {;
weight_container& sph_weights_adaptor() override {
return quad_base_type::weights();
}

Expand Down
6 changes: 3 additions & 3 deletions include/integratorxx/composite_quadratures/spherical_quadrature.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,13 @@ class SphericalQuadrature :
const point_container& sph_points_adaptor() const override {
return quad_base_type::points();
}
point_container& sph_points_adaptor() override {;
point_container& sph_points_adaptor() override {
return quad_base_type::points();
}
const weight_container& sph_weights_adaptor() const override {;
const weight_container& sph_weights_adaptor() const override {
return quad_base_type::weights();
}
weight_container& sph_weights_adaptor() override {;
weight_container& sph_weights_adaptor() override {
return quad_base_type::weights();
}

Expand Down
18 changes: 8 additions & 10 deletions include/integratorxx/composite_quadratures/sub_quadrature.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,14 @@ struct quadrature_traits<
inline static std::tuple<point_container,weight_container>
generate( range_idx_type idx_range, const Quadrature<DerivedQuad>& quad ) {
const auto [begin_idx, end_idx] = idx_range;
assert( begin_idx >= 0 );
assert( begin_idx <= quad.npts() );
assert( end_idx >= 0 );
assert( end_idx <= quad.npts() );
assert( begin_idx < end_idx );

point_container points( quad.points().begin() + begin_idx,
quad.points().begin() + end_idx );
point_container weights( quad.weights().begin() + begin_idx,
quad.weights().begin() + end_idx );
// begin_idx and end_idx are size_t, so the lower bounds are vacuous
assert( begin_idx < end_idx );
assert( end_idx <= quad.npts() );

point_container points ( quad.points().begin() + begin_idx,
quad.points().begin() + end_idx );
weight_container weights( quad.weights().begin() + begin_idx,
quad.weights().begin() + end_idx );

return std::make_tuple( points, weights );
}
Expand Down
Loading