removing unnecessary variables

Author: arnavk23

src/ADNLPProblems/toint.jl

@@ -3,30 +3,27 @@ export toint
 function toint(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
   function f(x; n = length(x))
     s = zero(T)
-    for i = 1:n_local
-      xi = x[i]
+    for i = 1:n
       ci = 1 + (i / 10)
 
-      jlo = max(1, i - 2)
-      jhi = min(n_local, 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 * xi + cj * x[j])
       end
 
-      if iseven(n_local)
-        j = i + (n_local ÷ 2)
-        if 1 <= j <= n_local
+      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 * xi + cj * x[j])
         end
       end
     end
-    return s / T(n_local)
+    return s / n
   end
 
   x0 = fill(one(T), n)

src/ADNLPProblems/trig.jl

@@ -3,25 +3,23 @@ export trig
 function trig(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
   function f(x; n = length(x))
     s = zero(T)
-    for i = 1:n_local
-      term = i * (1 - cos(xi))
+    for i = 1:n
+      s += i * (1 - cos(x[i]))
 
       for j = max(1, i - 2):min(n, i + 2)
         aij = 5 * (1 + mod(i, 5) + mod(j, 5))
         bij = (i + j) / 10
-        term += aij * sin(x[j]) + bij * cos(x[j])
+        s += aij * sin(x[j]) + bij * cos(x[j])
       end
 
-      if iseven(n_local)
-        j = i + (n_local ÷ 2)
-        if 1 <= j <= n_local
+      if iseven(n)
+        j = i + (n ÷ 2)
+        if 1 <= j <= n
           aij = 5 * (1 + mod(i, 5) + mod(j, 5))
           bij = (i + j) / 10
-          term += aij * sin(x[j]) + bij * cos(x[j])
+          s += aij * sin(x[j]) + bij * cos(x[j])
         end
       end
-
-      s += term
     end
     return s / n
   end

src/ADNLPProblems/trigb.jl

@@ -3,11 +3,10 @@ export trigb
 function trigb(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
   function f(x; n = length(x))
     s = zero(T)
-    for i = 1:n_local
+    for i = 1:n
       xim = (i == 1) ? zero(T) : x[i - 1]
-      xip = (i == n_local) ? zero(T) : x[i + 1]
-      term = i * (1 - cos(xi) + sin(left) - sin(right))
-      s += term
+      xip = (i == n) ? zero(T) : x[i + 1]
+      s += i * (1 - cos(x[i]) + sin(xim) - sin(xip))
     end
     return s
   end

src/PureJuMP/trigb.jl

@@ -13,16 +13,15 @@ export trigb
 
 function trigb(args...; n::Int = default_nvar, kwargs...)
   model = Model()
-  @variable(model, x[i = 1:n], start = 1.0)
+  @variable(model, x[i = 1:n], start = 1)
 
   @objective(
     model,
     Min,
     sum(
-      i * (
-        (1 - cos(x[i])) + ((i == 1) ? sin(0) : sin(x[i - 1])) -
-        ((i == n) ? sin(0) : sin(x[i + 1]))
-      ) for i = 1:n
+      i *
+      ((1 - cos(x[i])) + ((i == 1) ? sin(0) : sin(x[i - 1])) - ((i == n) ? sin(0) : sin(x[i + 1])))
+      for i = 1:n
     )
   )