remove ordering of CONES (#10)

Author: akshay326

src/conic_form.jl

@@ -22,31 +22,15 @@ mutable struct ConicForm{T, AT, VT, C} <: MOI.ModelLike
     end
 end
 
-# The ordering of CONES matches SCS
-const CONES = Dict(
-    MOI.Zeros => 1,
-    MOI.Nonnegatives => 2,
-    MOI.SecondOrderCone => 3,
-    MOI.PositiveSemidefiniteConeTriangle => 4,
-    MOI.ExponentialCone => 5,
-    MOI.DualExponentialCone => 6
-)
-
 _set_type(::MOI.ConstraintIndex{F,S}) where {F,S} = S
 cons_offset(conic::MOI.Zeros) = conic.dimension
 cons_offset(conic::MOI.Nonnegatives) = conic.dimension
 cons_offset(conic::MOI.SecondOrderCone) = conic.dimension
 cons_offset(conic::MOI.PositiveSemidefiniteConeTriangle) = Int64((conic.side_dimension*(conic.side_dimension+1))/2)
 
 function get_conic_form(::Type{T}, model::M, con_idx) where {T, M <: MOI.AbstractOptimizer}
-    # reorder constraints
-    cis = sort(
-        con_idx,
-        by = x->CONES[_set_type(x)]
-    )
-
     # extract cones
-    cones = _set_type.(cis)
+    cones = _set_type.(con_idx)
     cones = unique(cones)
 
     conic = ConicForm{T, SparseMatrixCSRtoCSC{Int64}, Array{T, 1}}(Tuple(cones))

test/conic_form.jl

@@ -57,30 +57,8 @@ CONIC_OPTIMIZERS = [SCS.Optimizer, ProxSDP.Optimizer, COSMO.Optimizer]
         MatModel = MatOI.get_conic_form(Float64, model, [cX; cx; c1; c2])
 
         @test MatModel.c' ≈ [2. 2. 2. 0. 2. 2. 1. 0. 0.]
-        @test MatModel.b' ≈ [-1.  -0.5  0.   0.   0.   0.   0.   0.   0.   0.   0. ]
-        @test MatModel.A.nzval ≈ [-1.0, -1.0, -1.0, -2.0, -1.0, -1.0, -1.0, -1.0, -2.0, -1.0, -2.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0] atol=ATOL rtol=RTOL
-        # note below matrix is in SCS format (scaled)
-        # @test A[1, 1] ≈	-1.0 
-        # @test A[2, 1] ≈	-1.0
-        # @test A[6, 1] ≈	-1.0
-        # @test A[2, 2] ≈	-2.0
-        # @test A[7, 2] ≈	-1.41421 atol=ATOL rtol=RTOL
-        # @test A[1, 3] ≈	-1.0
-        # @test A[2, 3] ≈	-1.0
-        # @test A[9, 3] ≈	-1.0
-        # @test A[2, 4] ≈	-2.0
-        # @test A[8, 4] ≈	-1.41421 atol=ATOL rtol=RTOL
-        # @test A[2, 5] ≈	-2.0
-        # @test A[10, 5] ≈ -1.41421 atol=ATOL rtol=RTOL
-        # @test A[1, 6] ≈	-1.0
-        # @test A[2, 6] ≈	-1.0
-        # @test A[11, 6] ≈ -1.0
-        # @test A[1, 7] ≈	-1.0
-        # @test A[3, 7] ≈	-1.0
-        # @test A[2, 8] ≈	-1.0
-        # @test A[4, 8] ≈	-1.0
-        # @test A[2, 9] ≈	-1.0
-        # @test A[5, 9] ≈	-1.0
+        @test MatModel.b' ≈ [0.   0.   0.   0.   0.   0.   0.   0.   0.  -1.  -0.5 ]
+        @test MatModel.A.nzval ≈ [-1.0, -1.0, -1.0, -1.0, -2.0, -1.0, -1.0, -1.0, -1.0, -2.0, -1.0, -2.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0] atol=ATOL rtol=RTOL
     end
 end
 
@@ -128,35 +106,8 @@ end
         MatModel = MatOI.get_conic_form(Float64, model, [c1; c2; c3; c4])
 
         @test MatModel.c ≈ [-0.0, -0.0, -0.0, -0.0, -0.0, -0.0, -1.0]
-        @test MatModel.b ≈ [0.0, 10.0, -0.0, -0.0, -0.0, -0.0, -0.0, -0.0, 0.0, 0.0, 0.0]
+        @test MatModel.b ≈ [10.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
         @test MatModel.A.nzval ≈ [1.0, -1.0, -0.45, 0.318198, -0.45, 1.0, -1.0, -0.8, 0.225, -0.1, 1.0, -1.0, -0.9, 1.0, -1.0, -0.225, 1.0, -1.0, -0.1125, 0.0795495, -0.1125, 1.0, -1.0, -0.225, 1.0, 1.0] atol=ATOL rtol=RTOL
-        # note below matrix is in SCS format (scaled)
-        # @test A[2 , 1]  ≈  1.0
-        # @test A[3 , 1]  ≈  -1.0
-        # @test A[9 , 1]  ≈  -0.45
-        # @test A[10, 1]  ≈  0.45
-        # @test A[11, 1]  ≈  -0.45
-        # @test A[2 , 2]  ≈  1.0
-        # @test A[4 , 2]  ≈  -1.0
-        # @test A[9 , 2]  ≈  -0.8
-        # @test A[10, 2]  ≈  0.318198 atol=ATOL rtol=RTOL
-        # @test A[11, 2]  ≈  -0.1
-        # @test A[2 , 3]  ≈  1.0
-        # @test A[5 , 3]  ≈  -1.0
-        # @test A[9 , 3]  ≈  -0.9
-        # @test A[2 , 4]  ≈  1.0
-        # @test A[6 , 4]  ≈  -1.0
-        # @test A[9 , 4]  ≈  -0.225
-        # @test A[2 , 5]  ≈  1.0
-        # @test A[7 , 5]  ≈  -1.0
-        # @test A[9 , 5]  ≈  -0.1125
-        # @test A[10, 5]  ≈  0.1125
-        # @test A[11, 5]  ≈  -0.1125
-        # @test A[2 , 6]  ≈  1.0
-        # @test A[8 , 6]  ≈  -1.0
-        # @test A[11, 6]  ≈  -0.225
-        # @test A[9 , 7]  ≈  1.0
-        # @test A[11, 7]  ≈  1.0
     end
 end