fix bugs

eco-hydro · May 7, 2024 · cc44c10 · cc44c10
1 parent 6520b74
commit cc44c10
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/src/Smooth/Whittaker/WHIT.jl b/src/Smooth/Whittaker/WHIT.jl
@@ -43,7 +43,7 @@ function WHIT(y::AbstractVector, w::AbstractVector, x::AbstractVector;
     r = @. (y - z) / (1 - h)
     cve = sqrt(sum(r .* r .* w) / sum(w))
   end
-  z, h, cve
+  z, cve
 end
 
 export WHIT, speye, diff, ddmat

diff --git a/src/Smooth/Whittaker/lambda_vcurve.jl b/src/Smooth/Whittaker/lambda_vcurve.jl
@@ -116,7 +116,7 @@ function lambda_cv(y::AbstractVector{T}, w::AbstractVector{T2};
   for i in 1:n
     lambda = 10^lg_lambdas[i]
     # z, cvs[i] = whit2(y, w, lambda)
-    cvs[i] = whit2!(y, w, lambda, interm; include_cve=true)
+    cvs[i] = whit2!(y, w, lambda, interm; include_cve=true)[2]
     # fits[i] = fidelity(y, z, w)
     # pens[i] = roughness(z, d)
   end

diff --git a/src/Smooth/Whittaker/whit3.jl b/src/Smooth/Whittaker/whit3.jl
@@ -1,5 +1,4 @@
 export whit3
-include("whit3_hat.jl")
 
 function whit3(y::AbstractVector{T1}, w::AbstractVector{T2};
   lambda::Real, include_cve=true) where {T1<:Real,T2<:Real}

diff --git a/test/test-smooth_whit.jl b/test/test-smooth_whit.jl
@@ -1,4 +1,5 @@
 using Test
+using UnPack
 
 @testset "whittaker smoother" begin
   y = [5.0, 8, 9, 10, 12, 10, 15, 10, 9, 19, 19, 17, 13, 14, 18, 19, 18, 12, 18,
@@ -11,13 +12,13 @@ using Test
   lambda = 2.0
   z = ones(m)
   interm = interm_whit{FT}(; n=length(y))
-  cve = whit2!(y, w, lambda, interm; include_cve=true)
+  z, cve = whit2!(y, w, lambda, interm; include_cve=true)
   z, cve2 = whit2(y, w; lambda)
-
   @test cve ≈ cve2
+
   lamb_cv = lambda_cv(y, w, is_plot=true)
   lamb_vcurve = lambda_vcurve(y, w, is_plot=true)
-
+  
   z1, cve_cv = whit2(y, w, lambda=lamb_cv)
   z2, cve_vcurve = whit2(y, w, lambda=lamb_vcurve)
   @test cve_cv < cve
@@ -34,8 +35,19 @@ end
   z, cve2 = whit2(y, w, lambda=2)
   @test cve1 ≈ cve2
   @test_nowarn r = smooth_whit(y, w)
-end
 
+  # whit3
+  z1, cve1 = whit3(y, w; lambda=2)
+  z2, cve2 = WHIT(y, w; lambda=2, d=3)
+  @test cve1 ≈ cve2
+  @test maximum(z1 - z2) <= 1e-10
+
+  # whit2
+  z1, cve1 = whit2(y, w; lambda=2)
+  z2, cve2 = WHIT(y, w; lambda=2, d=2)
+  @test cve1 ≈ cve2
+  @test maximum(z1 - z2) <= 1e-10
+end
 
 # using BenchmarkTools
 # @benchmark