Skip to content

Commit 6e6902d

Browse files
🤖 Format .jl files (#395)
Co-authored-by: tmigot <[email protected]>
1 parent 79d19e4 commit 6e6902d

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

src/ADNLPProblems/variational.jl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@ function variational(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...
44
h = 1 // (n + 1)
55
x0 = T[(i * h) * (1 - i * h) for i = 1:n]
66

7-
function f(x; n = length(x))
8-
Ti = eltype(x)
7+
function f(x; n = length(x))
8+
Ti = eltype(x)
99

10-
term1 = zero(Ti)
11-
term2 = zero(Ti)
12-
@inbounds for k = 1:n
13-
xi = x[k]
14-
xip = (k < n) ? x[k + 1] : zero(Ti)
10+
term1 = zero(Ti)
11+
term2 = zero(Ti)
12+
@inbounds for k = 1:n
13+
xi = x[k]
14+
xip = (k < n) ? x[k + 1] : zero(Ti)
1515

16-
term1 += xi * (xi - xip) / h
16+
term1 += xi * (xi - xip) / h
1717

18-
a_prev = (k == 1) ? zero(Ti) : x[k - 1]
19-
b_prev = xi
20-
term2 += (exp(b_prev) - exp(a_prev)) / (b_prev - a_prev)
18+
a_prev = (k == 1) ? zero(Ti) : x[k - 1]
19+
b_prev = xi
20+
term2 += (exp(b_prev) - exp(a_prev)) / (b_prev - a_prev)
2121

22-
if k == n
23-
a_last, b_last = xi, zero(Ti)
24-
term2 += (exp(b_last) - exp(a_last)) / (b_last - a_last)
22+
if k == n
23+
a_last, b_last = xi, zero(Ti)
24+
term2 += (exp(b_last) - exp(a_last)) / (b_last - a_last)
25+
end
2526
end
27+
return 2 * (term1 + 2 * h * term2)
2628
end
27-
return 2 * (term1 + 2 * h * term2)
28-
end
2929

3030
return ADNLPModels.ADNLPModel(f, x0, name = "variational"; kwargs...)
3131
end

src/PureJuMP/variational.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ function variational(; n::Int = default_nvar, kwargs...)
2121
Min,
2222
2 * (
2323
(sum(x[i] * (x[i] - x[i + 1]) / h for i 1:(n - 1)) + x[n] * x[n] / h) +
24-
2 * h *
24+
2 *
25+
h *
2526
(
2627
(exp(x[1]) - exp(0)) / (x[1] - 0) +
2728
sum((exp(x[j + 1]) - exp(x[j])) / (x[j + 1] - x[j]) for j 1:(n - 1)) +

0 commit comments

Comments
 (0)