Add tests for ParametrizedCurve (#105)

* add tests for ParametrizedCurve

* update support matrix

* only run tests for newer Meshes version

* fix typo

* Update test/combinations.jl

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix typo in version number

* use norm

* Update test/combinations.jl

Co-authored-by: Michael Ingold <[email protected]>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Michael Ingold <[email protected]>

Author: 3 people

docs/src/supportmatrix.md

@@ -40,6 +40,7 @@ Cubature integration rules are recommended (and the default).
 | `Hexahedron` | ✅ | ✅ | ✅ |
 | `Line` | ✅ | ✅ | ✅ |
 | `ParaboloidSurface` | ✅ | ✅ | ✅ |
+| `ParametrizedCurve` | ✅ | ✅ | ✅ |
 | `Plane` | ✅ | ✅ | ✅ |
 | `Polyarea` | [🎗️](https://github.com/mikeingold/MeshIntegrals.jl/issues/28) | [🎗️](https://github.com/mikeingold/MeshIntegrals.jl/issues/28) | [🎗️](https://github.com/mikeingold/MeshIntegrals.jl/issues/28) |
 | `Pyramid` | [🎗️](https://github.com/mikeingold/MeshIntegrals.jl/issues/28) | [🎗️](https://github.com/mikeingold/MeshIntegrals.jl/issues/28) | [🎗️](https://github.com/mikeingold/MeshIntegrals.jl/issues/28) |

test/Project.toml

@@ -1,5 +1,6 @@
 [deps]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
+CoordRefSystems = "b46f11dc-f210-4604-bfba-323c1ec968cb"
 ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Meshes = "eacbb407-ea5a-433e-ab97-5258b1ca43fa"
@@ -12,6 +13,7 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [compat]
 Aqua = "0.7, 0.8"
+CoordRefSystems = "0.12, 0.13, 0.14, 0.15"
 ExplicitImports = "1.6.0"
 LinearAlgebra = "1"
 Meshes = "0.50, 0.51"

test/combinations.jl

@@ -516,6 +516,54 @@ end
     @test_throws "not supported" volumeintegral(f, parab)
 end
 
+@testitem "ParametrizedCurve" setup=[Setup] begin
+    # ParametrizedCurve has been added in Meshes v0.51.20
+    # If the version is specified as minimal compat bound in the Project.toml, the downgrade test fails
+    if pkgversion(Meshes) >= v"0.51.20"
+        using CoordRefSystems: Polar
+        using LinearAlgebra: norm
+
+        # Parameterize a circle centered on origin with specified radius
+        radius = 4.4
+        curve_cart = ParametrizedCurve(
+            t -> Point(radius * cos(t), radius * sin(t)), (0.0, 2π))
+        curve_polar = ParametrizedCurve(t -> Point(Polar(radius, t)), (0.0, 2π))
+
+        function f(p::P) where {P <: Meshes.Point}
+            ur = norm(to(p))
+            r = ustrip(u"m", ur)
+            exp(-r^2)
+        end
+        fv(p) = fill(f(p), 3)
+
+        # Scalar integrand
+        sol = 2π * radius * exp(-radius^2) * u"m"
+        @test integral(f, curve_cart, GaussLegendre(100)) ≈ sol
+        @test integral(f, curve_cart, GaussKronrod()) ≈ sol
+        @test integral(f, curve_cart, HAdaptiveCubature()) ≈ sol
+        @test integral(f, curve_polar, GaussLegendre(100)) ≈ sol
+        @test integral(f, curve_polar, GaussKronrod()) ≈ sol
+        @test integral(f, curve_polar, HAdaptiveCubature()) ≈ sol
+
+        # Vector integrand
+        vsol = fill(sol, 3)
+        @test integral(fv, curve_cart, GaussLegendre(100)) ≈ vsol
+        @test integral(fv, curve_cart, GaussKronrod()) ≈ vsol
+        @test integral(fv, curve_cart, HAdaptiveCubature()) ≈ vsol
+        @test integral(fv, curve_polar, GaussLegendre(100)) ≈ vsol
+        @test integral(fv, curve_polar, GaussKronrod()) ≈ vsol
+        @test integral(fv, curve_polar, HAdaptiveCubature()) ≈ vsol
+
+        # Integral aliases
+        @test lineintegral(f, curve_cart) ≈ sol
+        @test_throws "not supported" surfaceintegral(f, curve_cart)
+        @test_throws "not supported" volumeintegral(f, curve_cart)
+        @test lineintegral(f, curve_polar) ≈ sol
+        @test_throws "not supported" surfaceintegral(f, curve_polar)
+        @test_throws "not supported" volumeintegral(f, curve_polar)
+    end
+end
+
 @testitem "Meshes.Plane" setup=[Setup] begin
     p = Point(0.0u"m", 0.0u"m", 0.0u"m")
     v = Vec(0.0u"m", 0.0u"m", 1.0u"m")
@@ -703,13 +751,18 @@ end
 
 @testitem "Meshes.Sphere 2D" setup=[Setup] begin
     origin = Point(0, 0)
-    sphere = Sphere(origin, 4.4)
+    radius = 4.4
+    sphere = Sphere(origin, radius)
 
-    f(p) = 1.0
+    function f(p::P) where {P <: Meshes.Point}
+        ur = hypot(p.coords.x, p.coords.y)
+        r = ustrip(u"m", ur)
+        exp(-r^2)
+    end
     fv(p) = fill(f(p), 3)
 
     # Scalar integrand
-    sol = Meshes.measure(sphere)
+    sol = 2π * radius * exp(-radius^2) * u"m"
     @test integral(f, sphere, GaussLegendre(100)) ≈ sol
     @test integral(f, sphere, GaussKronrod()) ≈ sol
     @test integral(f, sphere, HAdaptiveCubature()) ≈ sol