diff --git a/src/ADNLPProblems/NZF1.jl b/src/ADNLPProblems/NZF1.jl index f217060a..e56c47ea 100644 --- a/src/ADNLPProblems/NZF1.jl +++ b/src/ADNLPProblems/NZF1.jl @@ -35,7 +35,12 @@ function NZF1(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, kwarg function F!(r, x; l = l) for i = 1:l r[i] = 3 * x[i] - 60 + 1 // 10 * (x[i + 1] - x[i + 2])^2 - r[i + l] = x[i + 1]^2 + x[i + 2]^2 + (x[i + 3]^2) * (1 + x[i + 3])^2 + x[i + 6] + x[i + 5] / (1 + x[i + 4]^2 + sin(x[i + 4] / 1000)) + r[i + l] = + x[i + 1]^2 + + x[i + 2]^2 + + (x[i + 3]^2) * (1 + x[i + 3])^2 + + x[i + 6] + + x[i + 5] / (1 + x[i + 4]^2 + sin(x[i + 4] / 1000)) r[i + 2l] = x[i + 6] + x[i + 7] - x[i + 8]^2 + x[i + 10] r[i + 3l] = log(1 + x[i + 10]^2) + x[i + 11] - 5 * x[i + 12] + 20 r[i + 4l] = x[i + 4] + x[i + 5] + x[i + 5] * x[i + 9] + 10 * x[i + 9] - 50 diff --git a/src/ADNLPProblems/avion2.jl b/src/ADNLPProblems/avion2.jl index 626c1f57..dd40d10c 100644 --- a/src/ADNLPProblems/avion2.jl +++ b/src/ADNLPProblems/avion2.jl @@ -517,7 +517,9 @@ function avion2(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, kwa r[14] = SO - (785 // 1000) * DE^2 * PT r[15] = SS - (785 // 1000) * DS^2 * PT r[16] = CB - 2 * (VN - CA * LF^3) / (LF^2 * (3 - SO * LF)) - r[17] = IMPVOIL - (115 // 100) * SX * (15 + (15 // 100) * SX) * (8 + (MC * LX / (50 * SR * EL))^(3 // 2)) + r[17] = + IMPVOIL - + (115 // 100) * SX * (15 + (15 // 100) * SX) * (8 + (MC * LX / (50 * SR * EL))^(3 // 2)) return r end x0 = T[ @@ -791,5 +793,16 @@ function avion2(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, kwa 2, ] - return ADNLPModels.ADNLSModel!(F!, x0, 17, lvar, uvar, c!, lcon, ucon, name = "avion2-nls"; kwargs...) + return ADNLPModels.ADNLSModel!( + F!, + x0, + 17, + lvar, + uvar, + c!, + lcon, + ucon, + name = "avion2-nls"; + kwargs..., + ) end