Skip to content

Commit

Permalink
🤖 Format .jl files (#341)
Browse files Browse the repository at this point in the history
Co-authored-by: tmigot <tmigot@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and tmigot authored Sep 1, 2024
1 parent c00b101 commit e77ef90
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
7 changes: 6 additions & 1 deletion src/ADNLPProblems/NZF1.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 15 additions & 2 deletions src/ADNLPProblems/avion2.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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[
Expand Down Expand Up @@ -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

0 comments on commit e77ef90

Please sign in to comment.