Apply suggestions from code review

Co-authored-by: Tangi Migot <tangi.migot@gmail.com>

Author: arnavk23

src/ADNLPProblems/toint.jl

@@ -2,7 +2,6 @@ export toint
 
 function toint(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
   function f(x; n = length(x))
-    n_local = n
     s = zero(T)
     for i = 1:n_local
       xi = x[i]
@@ -30,6 +29,6 @@ function toint(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) wher
     return s / T(n_local)
   end
 
-  x0 = fill(1, n)
+  x0 = fill(one(T), n)
   return ADNLPModels.ADNLPModel(f, x0, name = "toint"; kwargs...)
 end

src/ADNLPProblems/trig.jl

@@ -2,15 +2,11 @@ export trig
 
 function trig(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
   function f(x; n = length(x))
-    n_local = n
     s = zero(T)
     for i = 1:n_local
-      xi = x[i]
       term = i * (1 - cos(xi))
 
-      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
         term += aij * sin(x[j]) + bij * cos(x[j])
@@ -27,9 +23,9 @@ function trig(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where
 
       s += term
     end
-    return s / T(n_local)
+    return s / n
   end
 
-  x0 = fill(1 / n, n)
+  x0 = fill(one(T) / n, n)
   return ADNLPModels.ADNLPModel(f, x0, name = "trig"; kwargs...)
 end

src/ADNLPProblems/trigb.jl

@@ -2,18 +2,16 @@ export trigb
 
 function trigb(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
   function f(x; n = length(x))
-    n_local = n
     s = zero(T)
     for i = 1:n_local
-      xi = x[i]
-      left = (i == 1) ? zero(T) : x[i - 1]
-      right = (i == n_local) ? zero(T) : x[i + 1]
+      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
     end
     return s
   end
 
-  x0 = fill(1, n)
+  x0 = fill(one(T), n)
   return ADNLPModels.ADNLPModel(f, x0, name = "trigb"; kwargs...)
 end

src/Meta/trigb.jl

@@ -24,4 +24,3 @@ get_trigb_nlin(; n::Integer = default_nvar, kwargs...) = 0
 get_trigb_nnln(; n::Integer = default_nvar, kwargs...) = 0
 get_trigb_nequ(; n::Integer = default_nvar, kwargs...) = 0
 get_trigb_nineq(; n::Integer = default_nvar, kwargs...) = 0
-get_trigb_nls_nequ(; n::Integer = default_nvar, kwargs...) = 2 * n

src/PureJuMP/trigb.jl

@@ -20,8 +20,8 @@ function trigb(args...; n::Int = default_nvar, kwargs...)
     Min,
     sum(
       i * (
-        (1 - cos(x[i])) + ((i == 1) ? sin(0.0) : sin(x[i - 1])) -
-        ((i == n) ? sin(0.0) : sin(x[i + 1]))
+        (1 - cos(x[i])) + ((i == 1) ? sin(0) : sin(x[i - 1])) -
+        ((i == n) ? sin(0) : sin(x[i + 1]))
       ) for i = 1:n
     )
   )