Skip to content

Commit 5f03f47

Browse files
committed
further changes
1 parent 8b80602 commit 5f03f47

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/ADNLPProblems/toint.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ function toint(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) wher
55
s = zero(T)
66
for i 1:n
77
ci = 1 + (i // 10)
8+
js = max(1, i-2):min(n, i+2)
9+
if iseven(n)
10+
js = sort(collect(union(collect(js), [j for j in (i + n ÷ 2, i - n ÷ 2) if 1 <= j <= n])))
11+
end
812

9-
for j max(1, i-2):min(n, i+2)
13+
for j js
1014
aij = 5 * (1 + mod(i, 5) + mod(j, 5))
1115
bij = (i + j) // 10
1216
cj = (1 + j) // 10

src/PureJuMP/toint.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ function toint(args...; n::Int = default_nvar, kwargs...)
2121
(1 / n) * sum(begin
2222
ci = 1 + i / 10
2323
s = zero(Float64)
24-
for j = max(1, i - 2):min(n, i + 2)
24+
js = max(1, i - 2):min(n, i + 2)
25+
if iseven(n)
26+
js = sort(collect(union(collect(js), [j for j in (i + n ÷ 2, i - n ÷ 2) if 1 <= j <= n])))
27+
end
28+
for j in js
2529
aij = 5 * (1 + mod(i, 5) + mod(j, 5))
2630
bij = (i + j) / 10
2731
cj = 1 + j / 10

0 commit comments

Comments
 (0)