Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/FileFormats/MOF/mof.schema.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/schema#",
"$id": "https://jump.dev/MathOptFormat/schemas/mof.1.8.schema.json",
"$id": "https://jump.dev/MathOptFormat/schemas/mof.1.9.schema.json",
"title": "The schema for MathOptFormat",
"type": "object",
"required": ["version", "variables", "objective", "constraints"],
Expand All @@ -11,7 +11,7 @@
"required": ["major", "minor"],
"properties": {
"major": {"const": 1},
"minor": {"enum": [0, 1, 2, 3, 4, 5, 6, 7, 8]}
"minor": {"enum": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]}
}
},
"name": {
Expand Down Expand Up @@ -638,13 +638,21 @@
"dimension": {"type": "integer", "minimum": 1}
}
}, {
"description": "(u, v, w) ∈ {R^{dimension}: u ≥ Σᵢ wᵢlog(wᵢ/vᵢ), vᵢ 0, wᵢ 0}",
"description": "(u, v, w) ∈ {R^{dimension}: u ≥ Σᵢ wᵢlog(wᵢ/vᵢ), vᵢ > 0, wᵢ > 0}",
"examples": ["{\"type\": \"RelativeEntropyCone\", \"dimension\": 3}"],
"required": ["dimension"],
"properties": {
"type": {"const": "RelativeEntropyCone"},
"dimension": {"type": "integer", "minimum": 3}
}
}, {
"description": "(u, v, w) ∈ {R^{dimension}: ∀i, wᵢ ≥ u(log(u/vᵢ) - 1), vᵢ > 0, u > 0}",
"examples": ["{\"type\": \"DualRelativeEntropyCone\", \"dimension\": 3}"],
"required": ["dimension"],
"properties": {
"type": {"const": "DualRelativeEntropyCone"},
"dimension": {"type": "integer", "minimum": 3}
}
}, {
"description": "(t, X) ∈ {R^{1+row_dim×column_dim}: t ≥ σ₁(X)}",
"examples": ["{\"type\": \"NormSpectralCone\", \"row_dim\": 1, \"column_dim\": 2}"],
Expand Down
5 changes: 5 additions & 0 deletions src/FileFormats/MOF/read.jl
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@ end
NormInfinityCone,
NormCone,
RelativeEntropyCone,
DualRelativeEntropyCone,
NormSpectralCone,
NormNuclearCone,
RootDetConeTriangle,
Expand Down Expand Up @@ -632,6 +633,10 @@ function set_to_moi(::Val{:RelativeEntropyCone}, object::Dict)
return MOI.RelativeEntropyCone(object["dimension"])
end

function set_to_moi(::Val{:DualRelativeEntropyCone}, object::Dict)
return MOI.DualRelativeEntropyCone(object["dimension"])
end

function set_to_moi(::Val{:NormSpectralCone}, object::Dict)
return MOI.NormSpectralCone(object["row_dim"], object["column_dim"])
end
Expand Down
1 change: 1 addition & 0 deletions src/FileFormats/MOF/write.jl
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ head_name(::Type{MOI.NormOneCone}) = "NormOneCone"
head_name(::Type{MOI.NormInfinityCone}) = "NormInfinityCone"
head_name(::Type{MOI.NormCone}) = "NormCone"
head_name(::Type{MOI.RelativeEntropyCone}) = "RelativeEntropyCone"
head_name(::Type{MOI.DualRelativeEntropyCone}) = "DualRelativeEntropyCone"
head_name(::Type{MOI.NormSpectralCone}) = "NormSpectralCone"
head_name(::Type{MOI.NormNuclearCone}) = "NormNuclearCone"
head_name(::Type{MOI.RootDetConeTriangle}) = "RootDetConeTriangle"
Expand Down
12 changes: 12 additions & 0 deletions test/FileFormats/MOF/test_MOF.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1045,6 +1045,18 @@ function test_RelativeEntropyCone()
)
end

function test_DualRelativeEntropyCone()
return _test_model_equality(
"""
variables: x, y, z
minobjective: x
c1: [x, y, z] in DualRelativeEntropyCone(3)
""",
["x", "y", "z"],
["c1"],
)
end

function test_NormSpectralCone()
return _test_model_equality(
"""
Expand Down
Loading