Skip to content

Commit 4c5115f

Browse files
arnavk23arnavk23
committed
genbroydenb and running JuliaFormatter
1 parent d1c06f9 commit 4c5115f

File tree

16 files changed

+102
-77
lines changed

16 files changed

+102
-77
lines changed

‎src/ADNLPProblems/auglag.jl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function auglag(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) whe
44
λ₁ = T(-0.002008)
55
λ₂ = T(-0.001900)
66
λ₃ = T(-0.000261)
7-
7+
88
function f(x; n = length(x))
99
s = zero(T)
1010
for i = 1:n
@@ -19,19 +19,19 @@ function auglag(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) whe
1919
end
2020
end
2121
s += exp(prod_term) + 10 * (sum_sq - 10 - λ₁)^2
22-
22+
2323
if i >= 4
24-
s += 10 * (x[i-3] * x[i-2] - 5 * x[i-1] * x[i] - λ₂)^2
24+
s += 10 * (x[i - 3] * x[i - 2] - 5 * x[i - 1] * x[i] - λ₂)^2
2525
end
26-
26+
2727
if i >= 4
28-
s += 10 * (x[i-4]^3 + x[i-3]^3 + 1 - λ₃)^2
28+
s += 10 * (x[i - 4]^3 + x[i - 3]^3 + 1 - λ₃)^2
2929
end
3030
end
3131
end
3232
return s
3333
end
34-
34+
3535
x0 = zeros(T, n)
3636
for i = 1:n
3737
m = mod(i, 5)
@@ -47,6 +47,6 @@ function auglag(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) whe
4747
x0[i] = T(-1)
4848
end
4949
end
50-
50+
5151
return ADNLPModels.ADNLPModel(f, x0, name = "auglag"; kwargs...)
5252
end

‎src/ADNLPProblems/browngen1.jl‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ function browngen1(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...)
44
n = max(2, n)
55
function f(x; n = length(x))
66
s = zero(T)
7-
@inbounds for i in 2:n
8-
s += (x[i - 1] - 3)^2 +
9-
(x[i - 1] - x[i])^2 +
10-
exp(20 * (x[i - 1] - x[i]))
7+
@inbounds for i = 2:n
8+
s += (x[i - 1] - 3)^2 + (x[i - 1] - x[i])^2 + exp(20 * (x[i - 1] - x[i]))
119
end
1210
return s
1311
end
14-
x0 = [isodd(i) ? zero(T) : -one(T) for i in 1:n]
12+
x0 = [isodd(i) ? zero(T) : -one(T) for i = 1:n]
1513
return ADNLPModels.ADNLPModel(f, x0, name = "browngen1"; kwargs...)
1614
end

‎src/ADNLPProblems/browngen2.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ function browngen2(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...)
55
function f(x; n = length(x))
66
s = zero(T)
77
@inbounds for i = 2:n
8-
s += (x[i-1]^2)^(x[i]^2 + 1) + (x[i]^2)^(x[i-1]^2 + 1)
8+
s += (x[i - 1]^2)^(x[i]^2 + 1) + (x[i]^2)^(x[i - 1]^2 + 1)
99
end
1010
return s
1111
end
12-
x0 = [isodd(i) ? -one(T) : one(T) for i in 1:n]
12+
x0 = [isodd(i) ? -one(T) : one(T) for i = 1:n]
1313
return ADNLPModels.ADNLPModel(f, x0, name = "browngen2"; kwargs...)
1414
end

‎src/ADNLPProblems/broyden7d.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ end
77

88
function broyden7d(::Val{:nlp}; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
99
p = 7 // 3
10-
function f(x; n = length(x), p = p)
10+
function f(x; n = length(x), p = p)
1111
x0 = zero(T)
1212
xn1 = zero(T)
1313
s = zero(T)

‎src/ADNLPProblems/chainwoo.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ function chainwoo(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, k
3030
r[1] = 1
3131
idx = 2
3232
@inbounds for i = 1:nb
33-
r[idx] = 10 * (x[2*i] - x[2*i - 1]^2)
34-
r[idx + 1] = 1 - x[2*i - 1]
35-
r[idx + 2] = T(sqrt(90)) * (x[2*i + 2] - x[2*i + 1]^2)
36-
r[idx + 3] = 1 - x[2*i + 1]
37-
r[idx + 4] = T(sqrt(10)) * (x[2*i] + x[2*i + 2] - 2)
38-
r[idx + 5] = (x[2*i] - x[2*i + 2]) / T(sqrt(10))
33+
r[idx] = 10 * (x[2 * i] - x[2 * i - 1]^2)
34+
r[idx + 1] = 1 - x[2 * i - 1]
35+
r[idx + 2] = T(sqrt(90)) * (x[2 * i + 2] - x[2 * i + 1]^2)
36+
r[idx + 3] = 1 - x[2 * i + 1]
37+
r[idx + 4] = T(sqrt(10)) * (x[2 * i] + x[2 * i + 2] - 2)
38+
r[idx + 5] = (x[2 * i] - x[2 * i + 2]) / T(sqrt(10))
3939
idx += 6
4040
end
4141
return r

‎src/ADNLPProblems/genbroydenb.jl‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ function genbroydenb(; use_nls::Bool = false, kwargs...)
55
return genbroydenb(Val(model); kwargs...)
66
end
77

8-
function genbroydenb(::Val{:nlp}; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
8+
function genbroydenb(
9+
::Val{:nlp};
10+
n::Int = default_nvar,
11+
type::Type{T} = Float64,
12+
kwargs...,
13+
) where {T}
914
p = 7 // 3
1015
function f(x; n = length(x))
1116
s = zero(T)
@@ -25,23 +30,27 @@ function genbroydenb(::Val{:nlp}; n::Int = default_nvar, type::Type{T} = Float64
2530
return ADNLPModels.ADNLPModel(f, x0, name = "genbroydenb", minimize = true; kwargs...)
2631
end
2732

28-
function genbroydenb(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
33+
function genbroydenb(
34+
::Val{:nls};
35+
n::Int = default_nvar,
36+
type::Type{T} = Float64,
37+
kwargs...,
38+
) where {T}
2939
p = 7 // 6
30-
function F!(r, x; n = length(x))
31-
@inbounds for i = 1:n
40+
function F!(r, x)
41+
m = length(x)
42+
@inbounds for i = 1:m
3243
diag = (2 + 5 * x[i]^2) * x[i] + 1
33-
neigh = zero(T)
34-
lo = max(1, i - 5)
35-
hi = min(n, i + 1)
36-
for j = lo:hi
44+
neigh = 0
45+
for j = max(1, i - 5):min(m, i + 1)
3746
if j != i
3847
neigh += x[j] * (1 + x[j])
3948
end
4049
end
41-
r[i] = abs(diag + neigh)^p
50+
z = diag + neigh
51+
r[i] = sign(z) * abs(z)^(p)
4252
end
4353
return r
4454
end
45-
x0 = fill(-one(T), n)
4655
return ADNLPModels.ADNLSModel!(F!, x0, n, name = "genbroydenb-nls"; kwargs...)
4756
end

‎src/ADNLPProblems/genbroydentri.jl‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ function genbroydentri(; use_nls::Bool = false, kwargs...)
55
return genbroydentri(Val(model); kwargs...)
66
end
77

8-
function genbroydentri(::Val{:nlp}; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
8+
function genbroydentri(
9+
::Val{:nlp};
10+
n::Int = default_nvar,
11+
type::Type{T} = Float64,
12+
kwargs...,
13+
) where {T}
914
p = 7 // 3
1015
function f(x; n = length(x))
1116
x0 = zero(T)
@@ -21,7 +26,12 @@ function genbroydentri(::Val{:nlp}; n::Int = default_nvar, type::Type{T} = Float
2126
return ADNLPModels.ADNLPModel(f, x0, name = "genbroydentri"; kwargs...)
2227
end
2328

24-
function genbroydentri(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
29+
function genbroydentri(
30+
::Val{:nls};
31+
n::Int = default_nvar,
32+
type::Type{T} = Float64,
33+
kwargs...,
34+
) where {T}
2535
p = 7 // 6
2636
x0 = fill(-one(T), n)
2737
function F!(r, x)

‎src/ADNLPProblems/genrose.jl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@ function genrose(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, kw
3434
return ADNLPModels.ADNLSModel!(F!, x0, nequ, name = "genrose-nls"; kwargs...)
3535
end
3636

37-
rosenbrock(args...; kwargs...) = genrose(args..., n = 2, name = "rosenbrock"; delete!(Dict(kwargs), :n)...)
37+
rosenbrock(args...; kwargs...) =
38+
genrose(args..., n = 2, name = "rosenbrock"; delete!(Dict(kwargs), :n)...)

‎src/ADNLPProblems/nazareth.jl‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function nazareth(::Val{:nlp}; n::Int = default_nvar, type::Type{T} = Float64, k
1010
neighbors = Vector{Vector{Int}}(undef, n)
1111
a_row = Vector{Vector{T}}(undef, n)
1212
b_row = Vector{Vector{T}}(undef, n)
13-
for i in 1:n
13+
for i = 1:n
1414
lo = max(1, i - 2)
1515
hi = min(n, i + 2)
1616
neigh = collect(lo:hi)
@@ -22,18 +22,18 @@ function nazareth(::Val{:nlp}; n::Int = default_nvar, type::Type{T} = Float64, k
2222
end
2323
end
2424
neighbors[i] = neigh
25-
a_row[i] = [5 * (1 + mod(i,5) + mod(j,5)) for j in neigh]
25+
a_row[i] = [5 * (1 + mod(i, 5) + mod(j, 5)) for j in neigh]
2626
b_row[i] = [(i + j) / 10 for j in neigh]
2727
end
2828

2929
function f(x; n = length(x))
3030
s = zero(T)
31-
for i in 1:n
31+
for i = 1:n
3232
sumtrig = zero(T)
3333
neigh = neighbors[i]
3434
ai = a_row[i]
3535
bi = b_row[i]
36-
@inbounds for k in 1:length(neigh)
36+
@inbounds for k = 1:length(neigh)
3737
j = neigh[k]
3838
sumtrig += ai[k] * sin(x[j]) + bi[k] * cos(x[j])
3939
end
@@ -50,7 +50,7 @@ function nazareth(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, k
5050
neighbors = Vector{Vector{Int}}(undef, n)
5151
a_row = Vector{Vector{T}}(undef, n)
5252
b_row = Vector{Vector{T}}(undef, n)
53-
for i in 1:n
53+
for i = 1:n
5454
lo = max(1, i - 2)
5555
hi = min(n, i + 2)
5656
neigh = collect(lo:hi)
@@ -62,18 +62,18 @@ function nazareth(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, k
6262
end
6363
end
6464
neighbors[i] = neigh
65-
a_row[i] = [5 * (1 + mod(i,5) + mod(j,5)) for j in neigh]
65+
a_row[i] = [5 * (1 + mod(i, 5) + mod(j, 5)) for j in neigh]
6666
b_row[i] = [(i + j) / 10 for j in neigh]
6767
end
6868

6969
x0 = fill(one(T) / n, n)
7070
function F!(r, x)
71-
@inbounds for i in 1:n
71+
@inbounds for i = 1:n
7272
sumtrig = zero(T)
7373
neigh = neighbors[i]
7474
ai = a_row[i]
7575
bi = b_row[i]
76-
for k in 1:length(neigh)
76+
for k = 1:length(neigh)
7777
j = neigh[k]
7878
sumtrig += ai[k] * sin(x[j]) + bi[k] * cos(x[j])
7979
end
@@ -83,4 +83,3 @@ function nazareth(::Val{:nls}; n::Int = default_nvar, type::Type{T} = Float64, k
8383
end
8484
return ADNLPModels.ADNLSModel!(F!, x0, n, name = "nazareth"; kwargs...)
8585
end
86-

‎src/PureJuMP/auglag.jl‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ function auglag(; n::Int = default_nvar)
1515
λ₁ = -0.002008
1616
λ₂ = -0.001900
1717
λ₃ = -0.000261
18-
18+
1919
nlp = Model()
2020
@variable(nlp, x[1:n])
21-
21+
2222
for i = 1:n
2323
m = mod(i, 5)
2424
if m == 1
@@ -33,19 +33,20 @@ function auglag(; n::Int = default_nvar)
3333
set_start_value(x[i], -1.0)
3434
end
3535
end
36-
36+
3737
# Build objective only for i where mod(i, 5) == 0 and i >= 5
3838
indices = [i for i = 5:n if mod(i, 5) == 0]
39-
40-
@objective(nlp, Min,
39+
40+
@objective(
41+
nlp,
42+
Min,
4143
sum(
42-
exp(prod(x[i+1-j] for j = 1:5)) +
43-
10 * (sum(x[i+1-j]^2 for j = 1:5) - 10 - λ₁)^2 +
44-
10 * (x[i-3]*x[i-2] - 5*x[i-1]*x[i] - λ₂)^2 +
45-
10 * (x[i-4]^3 + x[i-3]^3 + 1 - λ₃)^2
46-
for i in indices
44+
exp(prod(x[i + 1 - j] for j = 1:5)) +
45+
10 * (sum(x[i + 1 - j]^2 for j = 1:5) - 10 - λ₁)^2 +
46+
10 * (x[i - 3]*x[i - 2] - 5*x[i - 1]*x[i] - λ₂)^2 +
47+
10 * (x[i - 4]^3 + x[i - 3]^3 + 1 - λ₃)^2 for i in indices
4748
)
4849
)
49-
50+
5051
return nlp
5152
end

0 commit comments

Comments
 (0)