test improvement

Author: TorkelE

src/benchmark.jl

@@ -372,8 +372,6 @@ end
 
 # Work precision information for a nonlinear problem.
 function WorkPrecision(prob::NonlinearProblem, alg, abstols, reltols, dts = nothing; name = nothing, appxsol = nothing, error_estimate = :l2, numruns = 20, seconds = 2, kwargs...)
-    isnothing(appxsol) && error("Must provide the real value as the \"appxsol\" kwarg.")
-
     N = length(abstols)
     errors = Vector{Float64}(undef, N)
     times = Vector{Float64}(undef, N)
@@ -397,7 +395,7 @@ function WorkPrecision(prob::NonlinearProblem, alg, abstols, reltols, dts = noth
                 if isnothing(appxsol)
                     errors[i] = sqrt(sum(abs2, sol.resid))                    
                 else
-                    errors[i] = sqrt(sum(abs2, sol .- sol.resid))
+                    errors[i] = sqrt(sum(abs2, sol .- appxsol))
                 end
             else
                 error("Unsupported norm used: $(error_estimate).")

test/nonlinearsolve_wpdiagram_tests.jl

@@ -1,28 +1,29 @@
 # Fetch pakages.
 using NonlinearSolve, DiffEqDevTools, Plots
+using Test
 
 # Prepares NonlinearProblem.
-let
-    f(u, p) = u .- p
-    u0 = [1.0, 1.0]
-    p = 2.0
-    static_prob = NonlinearProblem(f, u0, p)
-    real_sol = solve(static_prob, NewtonRaphson(), reltol = 1e-15, abstol = 1e-15)
+f(u, p) = 3u .^3 .+ 2u .^2 .+ u + .- p
+u0 = [1.0, 6.0]
+p = [1.0, 3.0]
+static_prob = NonlinearProblem(f, u0, p)
+real_sol = solve(static_prob, NewtonRaphson(), reltol = 1e-15, abstol = 1e-15)
 
-    # Sets WP input.
-    abstols = 1.0 ./ 10.0 .^ (8:12)
-    reltols = 1.0 ./ 10.0 .^ (8:12)
-    setups = [Dict(:alg=>NewtonRaphson())
-            Dict(:alg=>TrustRegion())]
-    solnames = ["NewtonRaphson";"TrustRegion"]
+# Sets WP input.
+abstols = 1.0 ./ 10.0 .^ (8:12)
+reltols = 1.0 ./ 10.0 .^ (8:12)
+setups = [Dict(:alg=>NewtonRaphson())
+          Dict(:alg=>TrustRegion())]
+solnames = ["NewtonRaphson"; "TrustRegion"]
 
-    # Makes WP-diagram
-    wp = WorkPrecisionSet(static_prob, abstols, reltols, setups; names=solnames, numruns=100, appxsol=real_sol, error_estimate=:l2) 
+# Makes WP-diagram
+wp = WorkPrecisionSet(static_prob, abstols, reltols, setups; names=solnames, numruns=100, appxsol=real_sol, error_estimate=:l2) 
 
-    # Checks that all errors are small (they definitely should be).
-    @test all(vcat(getfield.(wp.wps, :errors)...) .< 10e-9)
+# Checks that all errors are small (they definitely should be).
+@test all(vcat(getfield.(wp.wps, :errors)...) .< 10e-9)
+@test length(plot(wp).series_list) == 2
 
-    # Check without appxsol.
-    wp = WorkPrecisionSet(static_prob, abstols, reltols, setups; names=solnames, numruns=100, error_estimate=:l2) 
-    @test all(vcat(getfield.(wp.wps, :errors)...) .< 10e-9)
-end
+# Check without appxsol.
+wp = WorkPrecisionSet(static_prob, abstols, reltols, setups; names=solnames, numruns=100, error_estimate=:l2) 
+@test all(vcat(getfield.(wp.wps, :errors)...) .< 10e-9)
+@test length(plot(wp).series_list) == 2