DuffyCone works

Author: dlfivefifty

src/Cone/Cone.jl

@@ -183,7 +183,7 @@ function points(sp::DuffyCone,n)
     N = ceil(Int, n^(1/3))
     pts=Array{float(eltype(domain(sp)))}(undef,0)
     a,b = rectspace(sp).spaces
-    for y in points(a,N), x in points(b,N^2)
+    for y in points(b,N^2), x in points(a,N)
         push!(pts,Vec(x...,y...))
     end
     conemap.(pts)
@@ -249,7 +249,13 @@ evaluate(cfs::AbstractVector, S::LegendreCone, txy) = evaluate(coefficients(cfs,
 function evaluate(cfs::AbstractVector, S::DuffyCone, txy::Vec{3})
     t,x,y = txy
     @assert x^2+y^2 ≤ t^2
-    Fun(rectspace(S), cfs)(t,x/t,y/t)
+    a,b = rectspace(S).spaces
+    mat = totensor(S, cfs)
+    for j = 1:size(mat,2)
+        # in place since totensor makes copy
+        mat[1,j] = Fun(a, view(mat,:,j))(t)
+    end
+    Fun(b, view(mat,1,:))(x/t,y/t)
 end
 
 function duffy2legendrecone!(triangleplan, F::AbstractMatrix)

test/test_cone.jl

@@ -86,24 +86,20 @@ end
         @test f.coefficients ≈ [1.2533141373154997; Zeros(164)]
         @test f(0.3,0.1,0.2) ≈ 1
 
-        f = Fun((t,x,y) -> t, DuffyConic(), 10)
-        @test f(sqrt(0.1^2+0.2^2),0.1,0.2) ≈ sqrt(0.1^2+0.2^2)
+        f = Fun((t,x,y) -> t, DuffyCone(), 10)
+        @test f(0.3,0.1,0.2) ≈ 0.3
 
-        f = Fun((t,x,y) -> x, DuffyConic(), 10)
+        f = Fun((t,x,y) -> x, DuffyCone(), 10)
+        @test f(0.3,0.1,0.2) ≈ 0.1
 
-        @test f(sqrt(0.1^2+0.2^2),0.1,0.2) ≈ 0.1
-
-        f = Fun((t,x,y) -> exp(cos(t*x)*y), DuffyConic(), 1000)
-        @test f(sqrt(0.1^2+0.2^2),0.1,0.2) ≈ exp(cos(sqrt(0.1^2+0.2^2)*0.1)*0.2)
+        f = Fun((t,x,y) -> y, DuffyCone(), 10)
+        @test f(0.3,0.1,0.2) ≈ 0.2
 
-        f = Fun((t,x,y) -> exp(cos(t*x)*y), DuffyConic())
-        @test f(sqrt(0.1^2+0.2^2),0.1,0.2) ≈ exp(cos(sqrt(0.1^2+0.2^2)*0.1)*0.2)
+        f = Fun((t,x,y) -> exp(cos(t*x)*y), DuffyCone(), 2000)
+        @test f(0.3,0.1,0.2) ≈ exp(cos(0.3*0.1)*0.2)
 
-        m,ℓ = (1,1)
-        f = (txy) -> ((t,x,y) = txy;  θ = atan(y,x); Fun(NormalizedJacobi(0,2m+1,Segment(1,0)),[zeros(ℓ);1])(t) * 2^m * t^m * cos(m*θ))
-        g = Fun(f, DuffyConic())
-        t,x,y = sqrt(0.1^2+0.2^2),0.1,0.2
-        @test g(t,x,y) ≈ f((t,x,y))
+        f = Fun((t,x,y) -> exp(cos(t*x)*y), DuffyCone())
+        @test f(0.3,0.1,0.2) ≈ exp(cos(0.3*0.1)*0.2)
     end
 
     @testset "Legendre<>DuffyConic" begin