MathOptFormat v0.5 (#14)

* Rename head->type * Add latest sets from MathOptInterface.jl
jump-dev · Aug 23, 2020 · 81c3550 · 81c3550
1 parent 58d9a35
commit 81c3550
Show file tree

Hide file tree

Showing 9 changed files with 973 additions and 106 deletions.
diff --git a/README.md b/README.md
diff --git a/examples/biobjective.mof.json b/examples/biobjective.mof.json
@@ -2,7 +2,7 @@
     "description": "The problem: [min{2x - y + 1, -y}]",
     "version": {
         "major": 0,
-        "minor": 4
+        "minor": 5
     },
     "variables": [{
         "name": "x"
@@ -12,7 +12,7 @@
     "objective": {
         "sense": "min",
         "function": {
-            "head": "VectorAffineFunction",
+            "type": "VectorAffineFunction",
             "terms": [{
                 "output_index": 1,
                 "scalar_term": {

diff --git a/examples/milp.mof.json b/examples/milp.mof.json
@@ -2,7 +2,7 @@
     "description": "The problem: min{x | x + y >= 1, x ∈ [0, 1], y ∈ {0, 1}}",
     "version": {
         "major": 0,
-        "minor": 4
+        "minor": 5
     },
     "variables": [{
         "name": "x",
@@ -14,14 +14,14 @@
     "objective": {
         "sense": "min",
         "function": {
-            "head": "SingleVariable",
+            "type": "SingleVariable",
             "variable": "x"
         }
     },
     "constraints": [{
         "name": "x + y >= 1",
         "function": {
-            "head": "ScalarAffineFunction",
+            "type": "ScalarAffineFunction",
             "terms": [{
                     "coefficient": 1,
                     "variable": "x"
@@ -34,28 +34,28 @@
             "constant": 0
         },
         "set": {
-            "head": "GreaterThan",
+            "type": "GreaterThan",
             "lower": 1
         }
     }, {
         "name": "x ∈ [0, 1]",
         "function": {
-            "head": "SingleVariable",
+            "type": "SingleVariable",
             "variable": "x"
         },
         "set": {
-            "head": "Interval",
+            "type": "Interval",
             "lower": 0,
             "upper": 1
         }
     }, {
         "name": "y ∈ {0, 1}",
         "function": {
-            "head": "SingleVariable",
+            "type": "SingleVariable",
             "variable": "y"
         },
         "set": {
-            "head": "ZeroOne"
+            "type": "ZeroOne"
         }
     }]
 }
diff --git a/examples/nlp.mof.json b/examples/nlp.mof.json
@@ -2,7 +2,7 @@
     "description": "The problem: min{2x + sin(x)^2 + y}.",
     "version": {
         "major": 0,
-        "minor": 4
+        "minor": 5
     },
     "variables": [{
         "name": "x"
@@ -12,45 +12,45 @@
     "objective": {
         "sense": "min",
         "function": {
-            "head": "ScalarNonlinearFunction",
+            "type": "ScalarNonlinearFunction",
             "root": {
-                "head": "node",
+                "type": "node",
                 "index": 4
             },
             "node_list": [{
-                "head": "*",
+                "type": "*",
                 "args": [{
-                    "head": "real",
+                    "type": "real",
                     "value": 2
                 }, {
-                    "head": "variable",
+                    "type": "variable",
                     "name": "x"
                 }]
             }, {
-                "head": "sin",
+                "type": "sin",
                 "args": [{
-                    "head": "variable",
+                    "type": "variable",
                     "name": "x"
                 }]
             }, {
-                "head": "^",
+                "type": "^",
                 "args": [{
-                    "head": "node",
+                    "type": "node",
                     "index": 2
                 }, {
-                    "head": "real",
+                    "type": "real",
                     "value": 2
                 }]
             }, {
-                "head": "+",
+                "type": "+",
                 "args": [{
-                    "head": "node",
+                    "type": "node",
                     "index": 1
                 }, {
-                    "head": "node",
+                    "type": "node",
                     "index": 3
                 }, {
-                    "head": "variable",
+                    "type": "variable",
                     "name": "y"
                 }]
             }]

diff --git a/examples/quadratic.mof.json b/examples/quadratic.mof.json
@@ -2,7 +2,7 @@
     "description": "The problem: min{x^2 + x * y + y^2}",
     "version": {
         "major": 0,
-        "minor": 4
+        "minor": 5
     },
     "variables": [{
         "name": "x"
@@ -13,7 +13,7 @@
         "sense": "min",
         "function": {
             "description": "Note that the format is `a'x + 0.5 x' Q x + c`.",
-            "head": "ScalarQuadraticFunction",
+            "type": "ScalarQuadraticFunction",
             "affine_terms": [],
             "quadratic_terms": [{
                     "coefficient": 2,

diff --git a/examples/vector.mof.json b/examples/vector.mof.json
@@ -2,7 +2,7 @@
     "description": "The problem: min{0 | [1 2; 3 4][x, y] + [5, 6] ∈ R+.",
     "version": {
         "major": 0,
-        "minor": 4
+        "minor": 5
     },
     "variables": [{
         "name": "x"
@@ -14,7 +14,7 @@
     },
     "constraints": [{
         "function": {
-            "head": "VectorAffineFunction",
+            "type": "VectorAffineFunction",
             "terms": [{
                 "output_index": 1,
                 "scalar_term": {
@@ -43,7 +43,7 @@
             "constants": [5, 6]
         },
         "set": {
-            "head": "Nonnegatives",
+            "type": "Nonnegatives",
             "dimension": 2
         }
     }]

diff --git a/python/mof.py b/python/mof.py
@@ -2,7 +2,7 @@
 import jsonschema
 import os
 
-SCHEMA_FILENAME = '../mof.0.4.schema.json'
+SCHEMA_FILENAME = '../schemas/mof.0.5.schema.json'
 
 def validate(filename):
     with open(filename, 'r') as io:
@@ -27,7 +27,7 @@ def summarize_schema():
     return summary
 
 def oneOf_to_object(item):
-    head = item["properties"]["head"]
+    head = item["properties"]["type"]
     ret = []
     if "const" in head:
         description = item.get("description", "").replace("|", "\\|")

diff --git a/mof.0.4.schema.json → schemas/mof.0.4.schema.json b/mof.0.4.schema.json → schemas/mof.0.4.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/schema#",
-    "$id": "https://jump.dev/MathOptFormat/mof.0.4.schema.json",
+    "$id": "https://jump.dev/MathOptFormat/schemas/mof.0.4.schema.json",
     "title": "The schema for MathOptFormat",
     "type": "object",
     "required": ["version", "variables", "objective", "constraints"],