From 38bc5b67cf530b25d77da36b82f3912c74f77c5e Mon Sep 17 00:00:00 2001 From: David Williams-Young Date: Fri, 7 Jul 2023 11:09:57 -0700 Subject: [PATCH] Fix compile bugs in GaussChebyshev quadratures --- include/integratorxx/quadratures/gausscheby1.hpp | 8 ++++---- include/integratorxx/quadratures/gausscheby2.hpp | 2 +- include/integratorxx/quadratures/gausscheby2_mod.hpp | 3 ++- test/1d_quadratures.cxx | 3 +++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/integratorxx/quadratures/gausscheby1.hpp b/include/integratorxx/quadratures/gausscheby1.hpp index cca6dd4..7647010 100644 --- a/include/integratorxx/quadratures/gausscheby1.hpp +++ b/include/integratorxx/quadratures/gausscheby1.hpp @@ -24,11 +24,11 @@ namespace IntegratorXX { */ template - class GaussChebyshev1 - : public Quadrature < GaussChebyshev1 { +class GaussChebyshev1 + : public Quadrature> { using base_type = - typename Quadrature < GaussChebyshev1; + Quadrature>; public: using point_type = typename base_type::point_type; @@ -73,5 +73,5 @@ struct quadrature_traits> { return std::make_tuple(points, weights); } -} +}; } // namespace IntegratorXX diff --git a/include/integratorxx/quadratures/gausscheby2.hpp b/include/integratorxx/quadratures/gausscheby2.hpp index 8926e04..6b47c20 100644 --- a/include/integratorxx/quadratures/gausscheby2.hpp +++ b/include/integratorxx/quadratures/gausscheby2.hpp @@ -72,6 +72,6 @@ struct quadrature_traits> { return std::make_tuple(points, weights); } -} +}; } // namespace IntegratorXX diff --git a/include/integratorxx/quadratures/gausscheby2_mod.hpp b/include/integratorxx/quadratures/gausscheby2_mod.hpp index eb419de..d793cfe 100644 --- a/include/integratorxx/quadratures/gausscheby2_mod.hpp +++ b/include/integratorxx/quadratures/gausscheby2_mod.hpp @@ -74,10 +74,11 @@ struct quadrature_traits> { points[i - 1] = 1.0 - 2.0 * i * oonpp + M_2_PI * (1.0 + 2.0 / 3.0 * sinesq) * cosine * sine; - weights[i - 1] = 16.0 / 3.0 / (n + 1.0) * sinesq * sinesq; + weights[i - 1] = 16.0 / 3.0 / (npts + 1.0) * sinesq * sinesq; } return std::make_tuple(points, weights); } }; + } // namespace IntegratorXX diff --git a/test/1d_quadratures.cxx b/test/1d_quadratures.cxx index c7a28b6..9c7196f 100644 --- a/test/1d_quadratures.cxx +++ b/test/1d_quadratures.cxx @@ -4,6 +4,9 @@ #include #include #include +#include +#include +#include #include #include