format and try to fix tests

Author: tmigot

src/ADNLPProblems/bard.jl

@@ -8,7 +8,8 @@ end
 function bard(::Val{:nlp}; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
   y = Rational{Int}[0.14 0.18 0.22 0.25 0.29 0.32 0.35 0.39 0.37 0.58 0.73 0.16 1.34 2.10 4.39]
   function f(x)
-    return 1 // 2 * sum((y[i] - (x[1] + i / ((16 - i) * x[2] + min(i, 16 - i) * x[3])))^2 for i = 1:15)
+    return 1 // 2 *
+           sum((y[i] - (x[1] + i / ((16 - i) * x[2] + min(i, 16 - i) * x[3])))^2 for i = 1:15)
   end
   x0 = ones(T, 3)
   return ADNLPModels.ADNLPModel(f, x0, name = "bard"; kwargs...)

src/ADNLPProblems/watson.jl

@@ -20,7 +20,8 @@ function watson(::Val{:nlp}; n::Int = default_nvar, type::Type{T} = Float64, kwa
              sum((j - 1) * x[j] * x[1]^(j - 2) for j = 2:n) -
              sum(x[j] * x[1]^(j - 1) for j = 1:n)^2 - 1
            )^2 +
-           1 // 2 * (
+           1 // 2 *
+           (
              sum((j - 1) * x[j] * (x[2] - x[1]^2 - 1)^(j - 2) for j = 2:n) -
              sum(x[j] * (x[2] - x[1]^2 - 1)^(j - 1) for j = 1:n)^2 - 1
            )^2

src/PureJuMP/watson.jl

@@ -37,7 +37,8 @@ function watson(args...; n::Int = default_nvar, kwargs...)
     (
       sum((j - 1) * x[j] * x[1]^(j - 2) for j = 2:n) - sum(x[j] * x[1]^(j - 1) for j = 1:n)^2 - 1
     )^2 +
-    0.5 * (
+    0.5 *
+    (
       sum((j - 1) * x[j] * (x[2] - x[1]^2 - 1)^(j - 2) for j = 2:n) -
       sum(x[j] * (x[2] - x[1]^2 - 1)^(j - 1) for j = 1:n)^2 - 1
     )^2

test/runtests.jl

@@ -14,7 +14,8 @@ addprocs(np - 1)
   [n for n in names(mod) if isdefined(mod, n)]
 end
 
-@everywhere const list_problems = setdiff(union(defined_names(ADNLPProblems), defined_names(PureJuMP)), [:PureJuMP, :ADNLPProblems])
+@everywhere const list_problems =
+  setdiff(union(defined_names(ADNLPProblems), defined_names(PureJuMP)), [:PureJuMP, :ADNLPProblems])
 
 @testset "Test that all problems have a meta" begin
   @test sort(list_problems) == sort(Symbol.(OptimizationProblems.meta[!, :name]))
@@ -25,7 +26,8 @@ end
 # TODO: tests are limited for JuMP-only problems
 @everywhere const list_problems_not_ADNLPProblems =
   Symbol[:catmix, :gasoil, :glider, :methanol, :minsurf, :pinene, :rocket, :steering, :torsion]
-@everywhere const list_problems_ADNLPProblems = setdiff(list_problems, list_problems_not_ADNLPProblems)
+@everywhere const list_problems_ADNLPProblems =
+  setdiff(list_problems, list_problems_not_ADNLPProblems)
 @everywhere const list_problems_not_PureJuMP = Symbol[]
 @everywhere const list_problems_PureJuMP = setdiff(list_problems, list_problems_not_PureJuMP)
 
@@ -48,7 +50,7 @@ end
     error("Problem $(prob) is not defined in $mod on pid $(myid()).")
   end
   ctor = getfield(mod, prob)
-  return MathOptNLPModel(ctor(;kwargs...); name = "$prob")
+  return MathOptNLPModel(ctor(; kwargs...); name = "$prob")
 end
 
 @everywhere function make_ad_nlp(prob::Symbol; kwargs...)
@@ -85,7 +87,8 @@ include("test-in-place-residual.jl")
     @test !isnothing(obj(nlp_ad, nlp_ad.meta.x0))
   end
 
-  if pb in meta[(meta.contype .== :quadratic) .| (meta.contype .== :general), :name]
+  if (typeof(nlp_ad) <: ADNLPModels.AbstractADNLPModel) &&
+     (pb in meta[(meta.contype .== :quadratic) .| (meta.contype .== :general), :name])
     @testset "Test In-place Nonlinear Constraints for AD-$prob" begin
       test_in_place_constraints(prob, nlp_ad)
     end

test/test-in-place-residual.jl

@@ -1,36 +1,41 @@
-@everywhere function test_in_place_residual(prob::Symbol)
-  nlp = make_ad_nlp(prob; use_nls = false)
-  @test typeof(nlp) <: ADNLPModels.ADNLPModel
-  nls = make_ad_nlp(prob; use_nls = true)
-  @test typeof(nls) <: ADNLPModels.ADNLSModel
-  return test_in_place_residual(prob, nlp, nls)
-end
-
-@everywhere function test_in_place_residual(prob::Symbol, nlp::AbstractNLPModel, nls::AbstractNLSModel)
-  @testset "Test in-place residual $prob" begin
-    x = nls.meta.x0
-    Fx = similar(x, nls.nls_meta.nequ)
-    pb = String(prob)
-    if VERSION ≥ v"1.7" && !occursin("palmer", pb) && (pb != "watson") # palmer residual allocate
-        @allocated residual!(nls, x, Fx)
-        @test (@allocated residual!(nls, x, Fx)) == 0
-    end
-    m = OptimizationProblems.eval(Meta.parse("get_$(prob)_nls_nequ"))()
-    @test nls.nls_meta.nequ == m
-  end
-
-  @testset "Compare NLS with NLP $prob: x0 and obj are the same." begin
-    x0 = nlp.meta.x0
-    @test x0 == nls.meta.x0
-    nlp_fx = obj(nlp, x0)
-    nls_fx = obj(nls, x0)
-    are_almost_same = (nlp_fx ≈ nls_fx) | (nlp_fx ≈ 2 * nls_fx)
-    if !(are_almost_same)
-        @info "$prob : NLS $(nls_fx) ≈ NLP $(nlp_fx)"
-    end
-    @test are_almost_same
-  end
-end
-
-nls_name_list = intersect(Symbol.(meta[meta.objtype .== :least_squares, :name]), list_problems_ADNLPProblems)
-pmap(test_in_place_residual, nls_name_list)
+@everywhere function test_in_place_residual(prob::Symbol)
+  nlp = make_ad_nlp(prob; use_nls = false)
+  @test typeof(nlp) <: ADNLPModels.ADNLPModel
+  nls = make_ad_nlp(prob; use_nls = true)
+  @test typeof(nls) <: ADNLPModels.ADNLSModel
+  return test_in_place_residual(prob, nlp, nls)
+end
+
+@everywhere function test_in_place_residual(
+  prob::Symbol,
+  nlp::AbstractNLPModel,
+  nls::AbstractNLSModel,
+)
+  @testset "Test in-place residual $prob" begin
+    x = nls.meta.x0
+    Fx = similar(x, nls.nls_meta.nequ)
+    pb = String(prob)
+    if VERSION ≥ v"1.7" && !occursin("palmer", pb) && (pb != "watson") # palmer residual allocate
+      @allocated residual!(nls, x, Fx)
+      @test (@allocated residual!(nls, x, Fx)) == 0
+    end
+    m = OptimizationProblems.eval(Meta.parse("get_$(prob)_nls_nequ"))()
+    @test nls.nls_meta.nequ == m
+  end
+
+  @testset "Compare NLS with NLP $prob: x0 and obj are the same." begin
+    x0 = nlp.meta.x0
+    @test x0 == nls.meta.x0
+    nlp_fx = obj(nlp, x0)
+    nls_fx = obj(nls, x0)
+    are_almost_same = (nlp_fx ≈ nls_fx) | (nlp_fx ≈ 2 * nls_fx)
+    if !(are_almost_same)
+      @info "$prob : NLS $(nls_fx) ≈ NLP $(nlp_fx)"
+    end
+    @test are_almost_same
+  end
+end
+
+nls_name_list =
+  intersect(Symbol.(meta[meta.objtype .== :least_squares, :name]), list_problems_ADNLPProblems)
+pmap(test_in_place_residual, nls_name_list)