fix TH tests (#207)

* fix TH tests, only use TH for vectors since higher dimensions will not have a 100k per dimension

* adjust tol

* stick to TH for now with matrices since Lib doesn't have matrix interface

* v0.15.1

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "FastTransforms"
 uuid = "057dd010-8810-581a-b7be-e3fc3b93f78c"
-version = "0.15"
+version = "0.15.1"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"

src/FastTransforms.jl

@@ -120,13 +120,17 @@ for f in (:jac2jac,
     :sph2fourier, :sphv2fourier, :disk2cxf, :ann2cxf,
     :rectdisk2cheb, :tri2cheb, :tet2cheb)
     lib_f = Symbol("lib_", f)
-    @eval $f(x::AbstractArray, y...; z...) = $lib_f(x::AbstractArray, y...; z...)
+    @eval $f(x::AbstractArray, y...; z...) = $lib_f(x, y...; z...)
 end
 
 # following use Toeplitz-Hankel to avoid expensive plans
 for f in (:leg2cheb, :cheb2leg, :ultra2ultra)
     th_f = Symbol("th_", f)
-    @eval $f(x::AbstractArray, y...; z...) = $th_f(x::AbstractArray, y...; z...)
+    lib_f = Symbol("lib_", f)
+    @eval begin
+        $f(x::AbstractArray, y...; z...) = $th_f(x, y...; z...)
+        # $f(x::AbstractArray, y...; z...) = $lib_f(x, y...; z...)
+    end
 end
 
 

src/toeplitzhankel.jl

@@ -239,7 +239,7 @@ function _cheb2legTH_TLC(::Type{S}, mn, d) where S
         t[1:2:end] = Λ.(0:one(S̃):div(n-2,2), -half(S̃), one(S̃))
     end
     h = Λ.(1:half(S̃):n-1, zero(S̃), 3half(S̃))
-    D = 1:one(S):n-1
+    D = 1:n-1
     DL = (3half(S̃):n-half(S̃)) ./ D
     DR = -(one(S̃):n-one(S̃)) ./ (4 .* D)
     C = hankel_partialchol(h, D)

test/toeplitzhankeltests.jl

@@ -16,17 +16,17 @@ import FastTransforms: th_leg2cheb, th_cheb2leg, th_ultra2ultra,th_jac2jac, th_l
         @test all(th_cheb2leg(x) .=== cheb2leg(x))
 
         @test th_cheb2leg(th_leg2cheb(x)) ≈ x atol=1E-9
-        @test th_leg2leg(th_cheb2cheb(x)) ≈ x atol=1E-11
+        @test th_leg2cheb(th_cheb2leg(x)) ≈ x atol=1E-10
     end
 
     for X in (randn(5,4), randn(5,4) + im*randn(5,4))
-        @test th_leg2cheb(X, 1) ≈ hcat([leg2cheb(X[:,j]) for j=1:size(X,2)]...)
-        @test th_leg2cheb(X, 2) ≈ vcat([permutedims(leg2cheb(X[k,:])) for k=1:size(X,1)]...)
-        @test th_leg2cheb(X) ≈ th_leg2cheb(th_leg2cheb(X, 1), 2)
+        @test th_leg2cheb(X, 1) ≈ leg2cheb(X, 1) ≈ hcat([leg2cheb(X[:,j]) for j=1:size(X,2)]...)
+        @test th_leg2cheb(X, 2) ≈ leg2cheb(X, 2) ≈ vcat([permutedims(leg2cheb(X[k,:])) for k=1:size(X,1)]...)
+        @test th_leg2cheb(X) ≈ leg2cheb(X) ≈ th_leg2cheb(th_leg2cheb(X, 1), 2)
 
-        @test th_cheb2leg(X, 1) ≈ hcat([cheb2leg(X[:,j]) for j=1:size(X,2)]...)
-        @test th_cheb2leg(X, 2) ≈ vcat([permutedims(cheb2leg(X[k,:])) for k=1:size(X,1)]...)
-        @test th_cheb2leg(X) ≈ th_cheb2leg(th_cheb2leg(X, 1), 2)
+        @test th_cheb2leg(X, 1) ≈ cheb2leg(X, 1) ≈ hcat([cheb2leg(X[:,j]) for j=1:size(X,2)]...)
+        @test th_cheb2leg(X, 2) ≈ cheb2leg(X, 2) ≈ vcat([permutedims(cheb2leg(X[k,:])) for k=1:size(X,1)]...)
+        @test th_cheb2leg(X) ≈ cheb2leg(X) ≈ th_cheb2leg(th_cheb2leg(X, 1), 2)
 
         @test th_cheb2leg(X) == plan_th_cheb2leg!(X, 1:2)*copy(X)
         @test th_leg2cheb(X) == plan_th_leg2cheb!(X, 1:2)*copy(X)