review changes to toint and trig problems

Author: arnavk23

src/ADNLPProblems/toint.jl

@@ -5,17 +5,32 @@ function toint(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) wher
 		s = zero(T)
 		for i ∈ 1:n
 			ci = 1 + (i // 10)
-			js = max(1, i-2):min(n, i+2)
-				if iseven(n)
-					js = sort(collect(union(collect(js), [j for j in (i + n ÷ 2, i - n ÷ 2) if 1 <= j <= n])))
-				end
-
-			for j ∈ js
+			jmin = max(1, i - 2)
+			jmax = min(n, i + 2)
+			for j ∈ jmin:jmax
 				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)
+				half = n ÷ 2
+				j1 = i + half
+				if 1 <= j1 <= n && (j1 < jmin || j1 > jmax)
+					aij = 5 * (1 + mod(i, 5) + mod(j1, 5))
+					bij = (i + j1) // 10
+					cj = (1 + j1) // 10
+					s += aij * sin(bij + ci * x[i] + cj * x[j1])
+				end
+				j2 = i - half
+				if 1 <= j2 <= n && j2 != j1 && (j2 < jmin || j2 > jmax)
+					aij = 5 * (1 + mod(i, 5) + mod(j2, 5))
+					bij = (i + j2) // 10
+					cj = (1 + j2) // 10
+					s += aij * sin(bij + ci * x[i] + cj * x[j2])
+				end
+			end
 		end
 		return s / n
 	end

src/ADNLPProblems/trig.jl

@@ -6,15 +6,29 @@ function trig(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where
     for i = 1:n
       s += i * (1 - cos(x[i]))
 
-      js = max(1, i - 2):min(n, i + 2)
-      if iseven(n)
-        js = sort(collect(union(collect(js), [j for j in (i + n ÷ 2, i - n ÷ 2) if 1 <= j <= n])))
-      end
-      for j in js
+      jmin = max(1, i - 2)
+      jmax = min(n, i + 2)
+      for j in jmin:jmax
         aij = 5 * (1 + mod(i, 5) + mod(j, 5))
         bij = (i + j) // 10
         s += aij * sin(x[j]) + bij * cos(x[j])
       end
+
+      if iseven(n)
+        half = n ÷ 2
+        j1 = i + half
+        if 1 <= j1 <= n && (j1 < jmin || j1 > jmax)
+          aij = 5 * (1 + mod(i, 5) + mod(j1, 5))
+          bij = (i + j1) // 10
+          s += aij * sin(x[j1]) + bij * cos(x[j1])
+        end
+        j2 = i - half
+        if 1 <= j2 <= n && j2 != j1 && (j2 < jmin || j2 > jmax)
+          aij = 5 * (1 + mod(i, 5) + mod(j2, 5))
+          bij = (i + j2) // 10
+          s += aij * sin(x[j2]) + bij * cos(x[j2])
+        end
+      end
     end
     return s / n
   end

src/PureJuMP/toint.jl

@@ -21,16 +21,33 @@ function toint(args...; n::Int = default_nvar, kwargs...)
     (1 / n) * sum(begin
       ci = 1 + i / 10
       s = zero(Float64)
-      js = max(1, i - 2):min(n, i + 2)
-      if iseven(n)
-        js = sort(collect(union(collect(js), [j for j in (i + n ÷ 2, i - n ÷ 2) if 1 <= j <= n])))
-      end
-      for j in js
+
+      jmin = max(1, i - 2)
+      jmax = min(n, i + 2)
+      for j in jmin:jmax
         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)
+        half = n ÷ 2
+        j1 = i + half
+        if 1 <= j1 <= n && (j1 < jmin || j1 > jmax)
+          aij = 5 * (1 + mod(i, 5) + mod(j1, 5))
+          bij = (i + j1) / 10
+          cj = 1 + j1 / 10
+          s += aij * sin(bij + ci * x[i] + cj * x[j1])
+        end
+        j2 = i - half
+        if 1 <= j2 <= n && j2 != j1 && (j2 < jmin || j2 > jmax)
+          aij = 5 * (1 + mod(i, 5) + mod(j2, 5))
+          bij = (i + j2) / 10
+          cj = 1 + j2 / 10
+          s += aij * sin(bij + ci * x[i] + cj * x[j2])
+        end
+      end
       s
     end for i = 1:n)
   )

src/PureJuMP/trig.jl

@@ -21,9 +21,32 @@ function trig(args...; n::Int = default_nvar, kwargs...)
     (1 / n) * sum(
       i * (1 - cos(x[i])) +
       (
-        sum(5 * (1 + mod(i, 5) + mod(j, 5)) * sin(x[j]) + (i + j) / 10 * cos(x[j]) for j in (
-          iseven(n) ? sort(collect(union(collect(max(1, i - 2):min(n, i + 2)), [j for j in (i + n ÷ 2, i - n ÷ 2) if 1 <= j <= n]))) : max(1, i - 2):min(n, i + 2)
-        ))
+        begin
+          jmin = max(1, i - 2)
+          jmax = min(n, i + 2)
+          s = zero(Float64)
+          for j in jmin:jmax
+            aij = 5 * (1 + mod(i, 5) + mod(j, 5))
+            bij = (i + j) / 10
+            s += aij * sin(x[j]) + bij * cos(x[j])
+          end
+          if iseven(n)
+            half = n ÷ 2
+            j1 = i + half
+            if 1 <= j1 <= n && (j1 < jmin || j1 > jmax)
+              aij = 5 * (1 + mod(i, 5) + mod(j1, 5))
+              bij = (i + j1) / 10
+              s += aij * sin(x[j1]) + bij * cos(x[j1])
+            end
+            j2 = i - half
+            if 1 <= j2 <= n && j2 != j1 && (j2 < jmin || j2 > jmax)
+              aij = 5 * (1 + mod(i, 5) + mod(j2, 5))
+              bij = (i + j2) / 10
+              s += aij * sin(x[j2]) + bij * cos(x[j2])
+            end
+          end
+          s
+        end
       ) for i = 1:n
     )
   )