wip

JuliaSmoothOptimizers · Aug 17, 2024 · 6cffd87 · 6cffd87
1 parent 0f32d6a
commit 6cffd87
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/src/core_interface.jl b/src/core_interface.jl
@@ -147,8 +147,8 @@ linear, e_order, l_order, v_order)
   - y:         [OUT] Vector{Cdouble}
   - c_l:       [OUT] Vector{Cdouble}
   - c_u:       [OUT] Vector{Cdouble}
-  - equatn:    [OUT] Vector{Cint}
-  - linear:    [OUT] Vector{Cint}
+  - equatn:    [OUT] Vector{Bool}
+  - linear:    [OUT] Vector{Bool}
   - e_order:   [IN] Vector{Cint}
   - l_order:   [IN] Vector{Cint}
   - v_order:   [IN] Vector{Cint}
@@ -166,13 +166,13 @@ function csetup(
   y::StrideOneVector{Cdouble},
   c_l::StrideOneVector{Cdouble},
   c_u::StrideOneVector{Cdouble},
-  equatn::StrideOneVector{Cint},
-  linear::StrideOneVector{Cint},
+  equatn::StrideOneVector{Bool},
+  linear::StrideOneVector{Bool},
   e_order::StrideOneVector{Cint},
   l_order::StrideOneVector{Cint},
   v_order::StrideOneVector{Cint},
 )
-  cutest_csetup_(
+  cutest_cint_csetup_(
     status,
     input,
     out,
@@ -1083,7 +1083,7 @@ lhe_val, he_val, byrows)
   - he_row:     [OUT] Vector{Cint}
   - lhe_val:    [IN] Vector{Cint}
   - he_val:     [OUT] Vector{Cdouble}
-  - byrows:     [IN] Vector{Cint}
+  - byrows:     [IN] Vector{Bool}
 """
 function ueh(
   status::StrideOneVector{Cint},
@@ -1097,9 +1097,9 @@ function ueh(
   he_row::StrideOneVector{Cint},
   lhe_val::StrideOneVector{Cint},
   he_val::StrideOneVector{Cdouble},
-  byrows::StrideOneVector{Cint},
+  byrows::StrideOneVector{Bool},
 )
-  cutest_ueh_(
+  cutest_cint_ueh_(
     status,
     n,
     x,
@@ -1482,17 +1482,17 @@ Usage:
   - x:       [IN] Vector{Cdouble}
   - f:       [OUT] Vector{Cdouble}
   - g:       [OUT] Vector{Cdouble}
-  - grad:    [IN] Vector{Cint}
+  - grad:    [IN] Vector{Bool}
 """
 function cofg(
   status::StrideOneVector{Cint},
   n::StrideOneVector{Cint},
   x::StrideOneVector{Cdouble},
   f::StrideOneVector{Cdouble},
   g::StrideOneVector{Cdouble},
-  grad::StrideOneVector{Cint},
+  grad::StrideOneVector{Bool},
 )
-  cutest_cofg_(
+  cutest_cint_cofg_(
     status,
     n,
     x,

diff --git a/src/julia_interface.jl b/src/julia_interface.jl
@@ -164,6 +164,7 @@ function cons_coord!(
   nvar = Ref{Cint}(nlp.meta.nvar)
   ncon = Ref{Cint}(nlp.meta.ncon)
   status = Ref{Cint}(0)
+  nnzj = Ref{Cint}(nlp.meta.nnzj)
   jsize = Ref{Cint}(nlp.meta.nnzj)
   get_j = Ref{Cint}(1)
 

diff --git a/src/model.jl b/src/model.jl
@@ -108,8 +108,8 @@ function CUTEstModel(
   v = Vector{Float64}(undef, ncon[])
   cl = Vector{Float64}(undef, ncon[])
   cu = Vector{Float64}(undef, ncon[])
-  equatn = Vector{Int32}(undef, ncon[])
-  linear = Vector{Int32}(undef, ncon[])
+  equatn = Vector{Bool}(undef, ncon[])
+  linear = Vector{Bool}(undef, ncon[])
 
   if ncon[] > 0
     e_order = efirst ? Ref{Cint}(1) : Ref{Cint}(0)

diff --git a/test/test_core.jl b/test/test_core.jl
@@ -59,8 +59,8 @@ function test_coreinterface(nlp::CUTEstModel, comp_nlp::AbstractNLPModel; test_v
     nnzg = view(Cint[0], 1:1)
     nnzj = view(Cint[0], 1:1)
     nnzh = view(Cint[0], 1:1)
-    True = view(Cint[true], 1:1)
-    False = view(Cint[false], 1:1)
+    True = view(Bool[true], 1:1)
+    False = view(Bool[false], 1:1)
     Jx = Array{Cdouble}(undef, ncon[1], nvar[1])
     Jtx = Array{Cdouble}(undef, nvar[1], ncon[1])
     Jval = @view(Array{Cdouble}(undef, nlp.meta.nnzj + nlp.meta.nvar + 1)[2:end])