PureJuMP

Author: arnavk23

src/PureJuMP/toint.jl

@@ -21,23 +21,12 @@ function toint(args...; n::Int = default_nvar, kwargs...)
     (1 / n) * sum(begin
       ci = 1 + i / 10
       s = zero(Float64)
-      jlo = max(1, i - 2)
-      jhi = min(n, i + 2)
-      for j = jlo:jhi
+      for j = max(1, i - 2):min(n, i + 2)
         aij = 5 * (1 + mod(i, 5) + mod(j, 5))
         bij = (i + j) / 10
         cj = 1 + j / 10
         s += aij * sin(bij + ci * x[i] + cj * x[j])
       end
-      if iseven(n)
-        j = i + (n ÷ 2)
-        if 1 <= j <= n
-          aij = 5 * (1 + mod(i, 5) + mod(j, 5))
-          bij = (i + j) / 10
-          cj = 1 + j / 10
-          s += aij * sin(bij + ci * x[i] + cj * x[j])
-        end
-      end
       s
     end for i = 1:n)
   )

src/PureJuMP/trig.jl

@@ -23,15 +23,6 @@ function trig(args...; n::Int = default_nvar, kwargs...)
       sum(
         5 * (1 + mod(i, 5) + mod(j, 5)) * sin(x[j]) + (i + j) / 10 * cos(x[j]) for
         j = max(1, i - 2):min(n, i + 2)
-      ) +
-      (
-        iseven(n) ?
-        (
-          let j = i + (n ÷ 2);
-            (1 <= j <= n) ?
-            (5 * (1 + mod(i, 5) + mod(j, 5)) * sin(x[j]) + (i + j) / 10 * cos(x[j])) : 0
-          end
-        ) : 0
       ) for i = 1:n
     )
   )