add spec/nuc cones to MOF

Author: chriscoey

src/FileFormats/MOF/MOF.jl

@@ -30,13 +30,11 @@ MOI.Utilities.@model(InnerModel,
     (MOI.EqualTo, MOI.GreaterThan, MOI.LessThan, MOI.Interval,
         MOI.Semicontinuous, MOI.Semiinteger),
     (MOI.Reals, MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives,
-        MOI.SecondOrderCone, MOI.RotatedSecondOrderCone,
-        MOI.GeometricMeanCone,
+        MOI.SecondOrderCone, MOI.RotatedSecondOrderCone, MOI.GeometricMeanCone, MOI.ExponentialCone, MOI.DualExponentialCone, MOI.NormOneCone,
+        MOI.NormInfinityCone, MOI.NormSpectralCone, MOI.NormNuclearCone,
         MOI.RootDetConeTriangle, MOI.RootDetConeSquare,
         MOI.LogDetConeTriangle, MOI.LogDetConeSquare,
-        MOI.PositiveSemidefiniteConeTriangle, MOI.PositiveSemidefiniteConeSquare,
-        MOI.ExponentialCone, MOI.DualExponentialCone, MOI.NormOneCone,
-        MOI.NormInfinityCone),
+        MOI.PositiveSemidefiniteConeTriangle, MOI.PositiveSemidefiniteConeSquare),
     (MOI.PowerCone, MOI.DualPowerCone, MOI.SOS1, MOI.SOS2),
     (Nonlinear,),
     (MOI.ScalarAffineFunction, MOI.ScalarQuadraticFunction),

src/FileFormats/MOF/read.jl

@@ -307,6 +307,8 @@ end
 set_info(::Type{Val{:GeometricMeanCone}}) = (MOI.GeometricMeanCone, "dimension")
 set_info(::Type{Val{:NormOneCone}}) = (MOI.NormOneCone, "dimension")
 set_info(::Type{Val{:NormInfinityCone}}) = (MOI.NormInfinityCone, "dimension")
+set_info(::Type{Val{:NormSpectralCone}}) = (MOI.NormSpectralCone, "row_dim", "column_dim")
+set_info(::Type{Val{:NormNuclearCone}}) = (MOI.NormNuclearCone, "row_dim", "column_dim")
 function set_info(::Type{Val{:RootDetConeTriangle}})
     return MOI.RootDetConeTriangle, "side_dimension"
 end

src/FileFormats/MOF/v0.4.0.json

@@ -812,6 +812,40 @@
                         "minimum": 2
                     }
                 }
+            }, {
+                "description": "(t, X) ∈ {R^{1+row_dim×column_dim}: t ≥ σ₁(X)}",
+                "examples": ["{\"head\": \"NormSpectralCone\", \"row_dim\": 1, \"column_dim\": 2}"],
+                "required": ["row_dim", "column_dim"],
+                "properties": {
+                    "head": {
+                        "const": "NormSpectralCone"
+                    },
+                    "row_dim": {
+                        "type": "integer",
+                        "minimum": 1
+                    },
+                    "column_dim": {
+                        "type": "integer",
+                        "minimum": 1
+                    }
+                }
+            }, {
+                "description": "(t, X) ∈ {R^{1+row_dim×column_dim}: t ≥ σ₁(X)}",
+                "examples": ["{\"head\": \"NormNuclearCone\", \"row_dim\": 1, \"column_dim\": 2}"],
+                "required": ["row_dim", "column_dim"],
+                "properties": {
+                    "head": {
+                        "const": "NormNuclearCone"
+                    },
+                    "row_dim": {
+                        "type": "integer",
+                        "minimum": 1
+                    },
+                    "column_dim": {
+                        "type": "integer",
+                        "minimum": 1
+                    }
+                }
             }]
         }
     }

src/FileFormats/MOF/write.jl

@@ -238,6 +238,8 @@ head_name(::Type{MOI.ExponentialCone}) = "ExponentialCone"
 head_name(::Type{MOI.DualExponentialCone}) = "DualExponentialCone"
 head_name(::Type{MOI.NormOneCone}) = "NormOneCone"
 head_name(::Type{MOI.NormInfinityCone}) = "NormInfinityCone"
+head_name(::Type{MOI.NormSpectralCone}) = "NormSpectralCone"
+head_name(::Type{MOI.NormNuclearCone}) = "NormNuclearCone"
 head_name(::Type{MOI.RootDetConeTriangle}) = "RootDetConeTriangle"
 head_name(::Type{MOI.RootDetConeSquare}) = "RootDetConeSquare"
 head_name(::Type{MOI.LogDetConeTriangle}) = "LogDetConeTriangle"

test/FileFormats/MOF/MOF.jl

@@ -393,6 +393,20 @@ end
             c2: x >= 0.0
         """, ["x", "y"], ["c1", "c2"])
     end
+    @testset "NormSpectralCone" begin
+        test_model_equality("""
+            variables: x, y, z
+            minobjective: x
+            c1: [x, y, z] in NormSpectralCone(1, 2)
+        """, ["x", "y", "z"], ["c1"])
+    end
+    @testset "NormNuclearCone" begin
+        test_model_equality("""
+            variables: x, y, z
+            minobjective: x
+            c1: [x, y, z] in NormNuclearCone(1, 2)
+        """, ["x", "y", "z"], ["c1"])
+    end
     # Clean up
     sleep(1.0)  # allow time for unlink to happen
     rm(TEST_MOF_FILE, force=true)