Skip to content

Commit bfa274a

Browse files
abelsiqueiraabelsiqueira
committed
🤖 Format .jl files
1 parent 0bb71a4 commit bfa274a

8 files changed

Lines changed: 30 additions & 43 deletions

‎src/feasibility-form-nls.jl‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,30 +42,30 @@ optimization problem with constraints `F(x) = r` and objective `¹/₂‖r‖²`
4242
function FeasibilityFormNLS(
4343
nls::AbstractNLSModel{T, S};
4444
name = "$(nls.meta.name)-ffnls",
45-
) where {T,S}
45+
) where {T, S}
4646
nequ = nls.nls_meta.nequ
4747
meta = nls.meta
4848
nvar = meta.nvar + nequ
4949
ncon = meta.ncon + nequ
5050
nnzh = nls.nls_meta.nnzh + nequ + (meta.ncon == 0 ? 0 : meta.nnzh) # Some indexes can be repeated
5151
x0 = similar(meta.x0, nvar)
52-
x0[1 : meta.nvar] .= meta.x0
53-
x0[meta.nvar + 1 : end] .= zero(T)
52+
x0[1:(meta.nvar)] .= meta.x0
53+
x0[(meta.nvar + 1):end] .= zero(T)
5454
lvar = similar(meta.x0, nvar)
55-
lvar[1 : meta.nvar] .= meta.lvar
56-
lvar[meta.nvar + 1 : end] .= T(-Inf)
55+
lvar[1:(meta.nvar)] .= meta.lvar
56+
lvar[(meta.nvar + 1):end] .= T(-Inf)
5757
uvar = similar(meta.x0, nvar)
58-
uvar[1 : meta.nvar] .= meta.uvar
59-
uvar[meta.nvar + 1 : end] .= T(Inf)
58+
uvar[1:(meta.nvar)] .= meta.uvar
59+
uvar[(meta.nvar + 1):end] .= T(Inf)
6060
lcon = similar(meta.y0, ncon)
61-
lcon[1 : nequ] .= zero(T)
62-
lcon[nequ + 1 : end] .= meta.lcon
61+
lcon[1:nequ] .= zero(T)
62+
lcon[(nequ + 1):end] .= meta.lcon
6363
ucon = similar(meta.y0, ncon)
64-
ucon[1 : nequ] .= zero(T)
65-
ucon[nequ + 1 : end] .= meta.ucon
64+
ucon[1:nequ] .= zero(T)
65+
ucon[(nequ + 1):end] .= meta.ucon
6666
y0 = similar(meta.y0, ncon)
67-
y0[1 : nequ] .= zero(T)
68-
y0[nequ + 1 : end] .= meta.y0
67+
y0[1:nequ] .= zero(T)
68+
y0[(nequ + 1):end] .= meta.y0
6969
meta = NLPModelMeta{T, S}(
7070
nvar,
7171
x0 = x0,
@@ -81,15 +81,7 @@ function FeasibilityFormNLS(
8181
nnzh = nnzh,
8282
name = name,
8383
)
84-
nls_meta = NLSMeta{T, S}(
85-
nequ,
86-
nvar,
87-
x0 = x0,
88-
nnzj = nequ,
89-
nnzh = 0,
90-
lin = 1:nequ,
91-
nln = Int[],
92-
)
84+
nls_meta = NLSMeta{T, S}(nequ, nvar, x0 = x0, nnzj = nequ, nnzh = 0, lin = 1:nequ, nln = Int[])
9385

9486
nlp = FeasibilityFormNLS{T, S, typeof(nls)}(meta, nls_meta, nls, NLSCounters())
9587
finalizer(nlp -> finalize(nlp.internal), nlp)

‎src/model-interaction.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ function FeasibilityFormNLS(
99
nnzj = meta.nnzj + nequ
1010
nnzh = meta.nnzh + nequ
1111
x0 = similar(meta.x0, nvar)
12-
x0[1 : meta.nvar] .= meta.x0
13-
x0[meta.nvar : end] .= zero(T)
12+
x0[1:(meta.nvar)] .= meta.x0
13+
x0[(meta.nvar):end] .= zero(T)
1414
lvar = similar(meta.x0, nvar)
15-
lvar[1 : meta.nvar] .= meta.lvar
16-
lvar[meta.nvar + 1 : end] .= T(-Inf)
15+
lvar[1:(meta.nvar)] .= meta.lvar
16+
lvar[(meta.nvar + 1):end] .= T(-Inf)
1717
uvar = similar(meta.x0, nvar)
18-
uvar[1 : meta.nvar] .= meta.uvar
19-
uvar[meta.nvar + 1 : end] .= T(Inf)
18+
uvar[1:(meta.nvar)] .= meta.uvar
19+
uvar[(meta.nvar + 1):end] .= T(Inf)
2020
meta = NLPModelMeta{T, S}(
2121
nvar,
2222
x0 = x0,

‎src/slack-model.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ function slack_meta(meta::NLPModelMeta{T, S}; name = meta.name * "-slack") where
8585
lvar = [meta.lvar; meta.lcon[[jlow; jupp; jrng]]] # l ≤ x and cₗ ≤ s
8686
uvar = [meta.uvar; meta.ucon[[jlow; jupp; jrng]]] # x ≤ u and s ≤ cᵤ
8787
lcon = similar(meta.x0, meta.ncon)
88-
lcon[setdiff(1:meta.ncon, meta.jfix)] .= zero(T)
88+
lcon[setdiff(1:(meta.ncon), meta.jfix)] .= zero(T)
8989
lcon[meta.jfix] = meta.lcon[meta.jfix]
9090
ucon = similar(meta.x0, meta.ncon)
91-
ucon[setdiff(1:meta.ncon, meta.jfix)] .= zero(T)
91+
ucon[setdiff(1:(meta.ncon), meta.jfix)] .= zero(T)
9292
ucon[meta.jfix] = meta.ucon[meta.jfix]
9393

9494
x0 = similar(meta.x0, meta.nvar + ns)
95-
x0[1 : meta.nvar] .= meta.x0
96-
x0[meta.nvar : end] .= zero(T)
95+
x0[1:(meta.nvar)] .= meta.x0
96+
x0[(meta.nvar):end] .= zero(T)
9797
return NLPModelMeta(
9898
meta.nvar + ns,
9999
x0 = x0,
@@ -132,8 +132,8 @@ function SlackNLSModel(
132132

133133
meta = slack_meta(model.meta, name = name)
134134
x0 = similar(model.meta.x0, model.meta.nvar + ns)
135-
x0[model.meta.nvar : end] .= zero(T)
136-
x0[1 : model.meta.nvar] .= model.meta.x0
135+
x0[(model.meta.nvar):end] .= zero(T)
136+
x0[1:(model.meta.nvar)] .= model.meta.x0
137137
nls_meta = NLSMeta{T, S}(
138138
model.nls_meta.nequ,
139139
model.meta.nvar + ns,

‎test/nlp/quasi-newton.jl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
c(x) = [x[1] - 2x[2] + 1; -x[1]^2 / 4 - x[2]^2 + 1]
66
J(x) = [1.0 -2.0; -0.5x[1] -2.0x[2]]
77

8-
for (QNM, QNO) in [(LSR1Model, LSR1Operator), (LBFGSModel, LBFGSOperator)],
9-
T in [Float64, Float32]
8+
for (QNM, QNO) in [(LSR1Model, LSR1Operator), (LBFGSModel, LBFGSOperator)],
9+
T in [Float64, Float32]
10+
1011
nlp = QNM(SimpleNLPModel(T))
1112
n = nlp.meta.nvar
1213
m = nlp.meta.ncon

‎test/nlp/slack-model.jl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
J(x) = [1.0 -2.0 0; -0.5x[1] -2.0x[2] -1]
88
H(x, y) = H(x) + y[2] * [-0.5 0 0; 0 -2.0 0; 0 0 0]
99

10-
1110
nlp = SlackModel(SimpleNLPModel(T))
1211
n = nlp.meta.nvar
1312
m = nlp.meta.ncon

‎test/nls/feasibility-form-nls.jl‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
JF(x) = Float64[0 0 1 0; 0 0 0 1]
55
HF(x, w) = zeros(4, 4)
66

7-
87
nls = FeasibilityFormNLS(SimpleNLSModel(T))
98
n = nls.meta.nvar
109
m = nls.meta.ncon
@@ -23,7 +22,7 @@
2322
@test jprod_residual(nls, x, v) ≈ JF(x) * v
2423
@test jtprod_residual(nls, x, w) ≈ JF(x)' * w
2524
@test jprod_residual!(nls, jac_structure_residual(nls)..., jac_coord_residual(nls, x), v, Jv) ≈
26-
JF(x) * v
25+
JF(x) * v
2726
@test jtprod_residual!(
2827
nls,
2928
jac_structure_residual(nls)...,
@@ -76,7 +75,6 @@
7675
J(x) = [-1 0 -1 0; -20x[1] 10 0 -1; 1 2x[2] 0 0; 2x[1] 1 0 0; 2x[1] 2x[2] 0 0]
7776
H(x, y) = H(x) + diagm(0 => [-20y[2] + 2y[4] + 2y[5]; 2y[3] + 2y[5]; 0; 0])
7877

79-
8078
nls = FeasibilityFormNLS(SimpleNLSModel(T))
8179
n = nls.meta.nvar
8280
m = nls.meta.ncon

‎test/nls/feasibility-residual.jl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
JF(x) = [1.0 -2.0 0; -0.5x[1] -2.0x[2] -1]
55
HF(x, w) = w[2] * diagm(0 => [-0.5; -2.0; 0.0])
66

7-
87
nls = FeasibilityResidual(SimpleNLPModel(T))
98
n = nls.meta.nvar
109
ne = nls_meta(nls).nequ
@@ -69,7 +68,6 @@
6968
∇f(x) = JF(x)' * F(x)
7069
H(x) = JF(x)' * JF(x) + HF(x, F(x))
7170

72-
7371
nls = FeasibilityResidual(SimpleNLPModel(T))
7472
n = nls.meta.nvar
7573

‎test/nls/slack-model.jl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
JF(x) = [-1.0 0 0 0; -20*x[1] 10 0 0]
55
HF(x, w) = w[2] * diagm(0 => [-20.0; zeros(3)])
66

7-
87
nls = SlackNLSModel(SimpleNLSModel(T))
98
n = nls.meta.nvar
109
m = nls.meta.ncon

0 commit comments

Comments
 (0)