Update the problem hs117

Author: amontoison

src/ADNLPProblems/hs117.jl

@@ -1,33 +1,31 @@
 export hs117
 
 function hs117(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) where {T}
-  a = Array{Rational{Int}}(undef, 10, 5)
-  a[1, :] = [-16, 2, 0, 1, 0]
-  a[2, :] = [0, -2, 0, 4, 2]
-  a[3, :] = [-35 // 10, 0, 2, 0, 0]
-  a[4, :] = [0, -2, 0, -4, -1]
-  a[5, :] = [0, -9, -2, 1, -2.8]
-  a[6, :] = [2, 0, -4, 0, 0]
-  a[7, :] = [-1, -1, -1, -1, -1]
-  a[8, :] = [-1, -2, -3, -2, -1]
-  a[9, :] = [1, 2, 3, 4, 5]
-  a[10, :] = [1, 1, 1, 1, 1]
+  a = Rational{Int}[-16 2 0 1 0;
+                     0 -2 0 4 2;
+                    -7 // 2 0 2 0 0;
+                     0 -2 0 -4 -1;
+                     0 -9 -2 1 -14 // 5;
+                     2 0 -4 0 0;
+                    -1 -1 -1 -1 -1;
+                    -1 -2 -3 -2 -1;
+                     1 2 3 4 5;
+                     1 1 1 1 1]
 
   b = [-40, -2, -25 // 100, -4, -4, -1, -40, -60, 5, 1]
 
-  ci = Array{Int}(undef, 5, 5)
-  ci[1, :] = [30, -20, -10, 32, -10]
-  ci[2, :] = [-20, 39, -6, -31, 32]
-  ci[3, :] = [-10, -6, 10, -6, -10]
-  ci[4, :] = [32, -31, -6, 39, -20]
-  ci[5, :] = [-10, 32, -10, -20, 30]
+  c = [ 30 -20 -10  32 -10;
+       -20  39 -6  -31  32;
+       -10 -6   10 -6  -10;
+        32 -31 -6   39 -20;
+       -10  32 -10 -20  30]
 
   d = [4, 8, 10, 6, 2]
 
   e = T[-15, -27, -36, -18, -12]
-  function f(x; b = b, ci = ci, d = d)
+  function f(x; b = b, c = c, d = d)
     return -sum(b[j] * x[j] for j = 1:10) +
-           sum(sum(ci[k, j] * x[10 + k] * x[10 + j] for k = 1:5) for j = 1:5) +
+           sum(sum(c[k, j] * x[10 + k] * x[10 + j] for k = 1:5) for j = 1:5) +
            2 * sum(d[j] * x[10 + j]^3 for j = 1:5)
   end
   x0 = T(0.001) * [1, 1, 1, 1, 1, 1, 60000, 1, 1, 1, 1, 1, 1, 1, 1]
@@ -36,7 +34,7 @@ function hs117(; n::Int = default_nvar, type::Type{T} = Float64, kwargs...) wher
   function c!(cx, x)
     for j = 1:5
       cx[j] =
-        2 * sum(ci[k, j] * x[10 + k] + 3 * d[j] * x[10 + j]^2 for k = 1:5) -
+        2 * sum(c[k, j] * x[10 + k] + 3 * d[j] * x[10 + j]^2 for k = 1:5) -
         sum(a[k, j] * x[k] for k = 1:10)
     end
     return cx

src/PureJuMP/hs117.jl

@@ -33,12 +33,11 @@ function hs117(args...; kwargs...)
 
   b = [-40, -2, -0.25, -4, -4, -1, -40, -60, 5, 1]
 
-  c = Array{Float64}(undef, 5, 5)
-  c[1, :] = [30, -20, -10, 32, -10]
-  c[2, :] = [-20, 39, -6, -31, 32]
-  c[3, :] = [-10, -6, 10, -6, -10]
-  c[4, :] = [32, -31, -6, 39, -20]
-  c[5, :] = [-10, 32, -10, -20, 30]
+  c = Float64[ 30 -20 -10  32 -10;
+              -20  39 -6  -31  32;
+              -10 -6   10 -6  -10;
+               32 -31 -6   39 -20;
+              -10  32 -10 -20  30]
 
   d = [4, 8, 10, 6, 2]