Merge pull request #103 from blegat/bl/zeros

mariohsouto · Jun 5, 2024 · ab6a3b4 · ab6a3b4
2 parents 3afc98c + 6d3033a
commit ab6a3b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/MOI_wrapper.jl b/src/MOI_wrapper.jl
@@ -1,8 +1,6 @@
-const MOI = MathOptInterface
+MOI.Utilities.@product_of_sets(_Zeros, MOI.Zeros)
 
-MOI.Utilities.@product_of_sets(Zeros, MOI.Zeros)
-
-MOI.Utilities.@product_of_sets(Nonpositives, MOI.Nonpositives)
+MOI.Utilities.@product_of_sets(_Nonpositives, MOI.Nonpositives)
 
 MOI.Utilities.@struct_of_constraints_by_set_types(
     StructCache,
@@ -25,7 +23,7 @@ const OptimizerCache{T} = MOI.Utilities.GenericModel{
                 MOI.Utilities.OneBasedIndexing,
             },
             Vector{T},
-            Zeros{T},
+            _Zeros{T},
         },
         MOI.Utilities.MatrixOfConstraints{
             T,
@@ -35,7 +33,7 @@ const OptimizerCache{T} = MOI.Utilities.GenericModel{
                 MOI.Utilities.OneBasedIndexing,
             },
             Vector{T},
-            Nonpositives{T},
+            _Nonpositives{T},
         },
         MOI.Utilities.VectorOfConstraints{
             MOI.VectorOfVariables,
@@ -55,8 +53,8 @@ end
 
 mutable struct Optimizer <: MOI.AbstractOptimizer
     cones::Union{Nothing, ConeData}
-    zeros::Union{Nothing, Zeros{Float64}}
-    nonps::Union{Nothing, Nonpositives{Float64}}
+    zeros::Union{Nothing, _Zeros{Float64}}
+    nonps::Union{Nothing, _Nonpositives{Float64}}
     sol::Result
     options::Options
 end

diff --git a/src/ProxSDP.jl b/src/ProxSDP.jl
@@ -4,7 +4,7 @@ using PrecompileTools: @setup_workload, @compile_workload
 
 import Arpack
 import KrylovKit
-import MathOptInterface
+import MathOptInterface as MOI
 import TimerOutputs
 import TimerOutputs: @timeit
 
@@ -37,4 +37,4 @@ include("MOI_wrapper.jl")
 
 end
 
-end
+end