Skip to content

Commit e77ef90

Browse files
🤖 Format .jl files (#341)
Co-authored-by: tmigot <[email protected]>
1 parent c00b101 commit e77ef90

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

src/ADNLPProblems/NZF1.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ function NZF1(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, kwarg
3535
function F!(r, x; l = l)
3636
for i = 1:l
3737
r[i] = 3 * x[i] - 60 + 1 // 10 * (x[i + 1] - x[i + 2])^2
38-
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))
38+
r[i + l] =
39+
x[i + 1]^2 +
40+
x[i + 2]^2 +
41+
(x[i + 3]^2) * (1 + x[i + 3])^2 +
42+
x[i + 6] +
43+
x[i + 5] / (1 + x[i + 4]^2 + sin(x[i + 4] / 1000))
3944
r[i + 2l] = x[i + 6] + x[i + 7] - x[i + 8]^2 + x[i + 10]
4045
r[i + 3l] = log(1 + x[i + 10]^2) + x[i + 11] - 5 * x[i + 12] + 20
4146
r[i + 4l] = x[i + 4] + x[i + 5] + x[i + 5] * x[i + 9] + 10 * x[i + 9] - 50

src/ADNLPProblems/avion2.jl

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,9 @@ function avion2(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, kwa
517517
r[14] = SO - (785 // 1000) * DE^2 * PT
518518
r[15] = SS - (785 // 1000) * DS^2 * PT
519519
r[16] = CB - 2 * (VN - CA * LF^3) / (LF^2 * (3 - SO * LF))
520-
r[17] = IMPVOIL - (115 // 100) * SX * (15 + (15 // 100) * SX) * (8 + (MC * LX / (50 * SR * EL))^(3 // 2))
520+
r[17] =
521+
IMPVOIL -
522+
(115 // 100) * SX * (15 + (15 // 100) * SX) * (8 + (MC * LX / (50 * SR * EL))^(3 // 2))
521523
return r
522524
end
523525
x0 = T[
@@ -791,5 +793,16 @@ function avion2(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, kwa
791793
2,
792794
]
793795

794-
return ADNLPModels.ADNLSModel!(F!, x0, 17, lvar, uvar, c!, lcon, ucon, name = "avion2-nls"; kwargs...)
796+
return ADNLPModels.ADNLSModel!(
797+
F!,
798+
x0,
799+
17,
800+
lvar,
801+
uvar,
802+
c!,
803+
lcon,
804+
ucon,
805+
name = "avion2-nls";
806+
kwargs...,
807+
)
795808
end

0 commit comments

Comments
 (0)