Update to 1.0 release (#19)

Author: odow

README.md

@@ -5,7 +5,7 @@ called _MathOptFormat_ with the file extension `.mof.json`.
 
 MathOptFormat is rigidly defined by the [JSON schema](http://json-schema.org/)
 available at
-[`https://jump.dev/MathOptFormat/schemas/mof.0.6.schema.json`](https://jump.dev/MathOptFormat/schemas/mof.0.6.schema.json).
+[`https://jump.dev/MathOptFormat/schemas/mof.1.0.schema.json`](https://jump.dev/MathOptFormat/schemas/mof.1.0.schema.json).
 
 It is intended for the schema to be self-documenting. Instead of modifying or
 adding to this documentation, clarifying edits should be made to the
@@ -82,7 +82,7 @@ Encoded into the MathOptFormat file format, this example becomes:
     },
     "constraints": [{
         "name": "x >= 1",
-        "function": {"type": "SingleVariable", "variable": "x"},
+        "function": {"type": "Variable", "name": "x"},
         "set": {"type": "GreaterThan", "lower": 1}
     }]
 }
@@ -185,7 +185,7 @@ Here is a summary of the functions defined by MathOptFormat.
 
 | Name | Description | Example |
 | ---- | ----------- | ------- |
-| `"SingleVariable"` | The scalar variable `variable`. | {"type": "SingleVariable", "variable": "x"} |
+| `"Variable"` | The scalar variable `x`. | {"type": "Variable", "name": "x"} |
 | `"ScalarAffineFunction"` | The function `a'x + b`, where `a` is a sparse vector specified by a list of `ScalarAffineTerm`s in `terms` and `b` is the scalar in `constant`. Duplicate variables in `terms` are accepted, and the corresponding coefficients are summed together. | {"type": "ScalarAffineFunction", "constant": 1.0, "terms": [{"coefficient": 2.5, "variable": "x"}]} |
 | `"ScalarQuadraticFunction"` | The function `0.5x'Qx + a'x + b`, where `a` is a sparse vector of `ScalarAffineTerm`s in `affine_terms`, `b` is the scalar `constant`, and `Q` is a symmetric matrix specified by a list of `ScalarQuadraticTerm`s in `quadratic_terms`. Duplicate indices in `affine_terms` and `quadratic` are accepted, and the corresponding coefficients are summed together. Mirrored indices in `quadratic_terms` (i.e., `(i,j)` and `(j, i)`) are considered duplicates; only one need to be specified. | {"type": "ScalarQuadraticFunction", "constant": 1.0, "affine_terms": [{"coefficient": 2.5, "variable": "x"}], "quadratic_terms": [{"coefficient": 2.0, "variable_1": "x", "variable_2": "y"}]} |
 | `"ScalarNonlinearFunction"` | An expression graph representing a scalar nonlinear function. |  |

examples/biobjective.mof.json

@@ -1,8 +1,8 @@
 {
     "description": "The problem: [min{2x - y + 1, -y}]",
     "version": {
-        "major": 0,
-        "minor": 7
+        "major": 1,
+        "minor": 0
     },
     "variables": [{
         "name": "x"

examples/milp.mof.json

@@ -1,8 +1,8 @@
 {
     "description": "The problem: min{x | x + y >= 1, x ∈ [0, 1], y ∈ {0, 1}}",
     "version": {
-        "major": 0,
-        "minor": 7
+        "major": 1,
+        "minor": 0
     },
     "variables": [{
         "name": "x",
@@ -14,8 +14,8 @@
     "objective": {
         "sense": "min",
         "function": {
-            "type": "SingleVariable",
-            "variable": "x"
+            "type": "Variable",
+            "name": "x"
         }
     },
     "constraints": [{
@@ -40,8 +40,8 @@
     }, {
         "name": "x ∈ [0, 1]",
         "function": {
-            "type": "SingleVariable",
-            "variable": "x"
+            "type": "Variable",
+            "name": "x"
         },
         "set": {
             "type": "Interval",
@@ -51,8 +51,8 @@
     }, {
         "name": "y ∈ {0, 1}",
         "function": {
-            "type": "SingleVariable",
-            "variable": "y"
+            "type": "Variable",
+            "name": "y"
         },
         "set": {
             "type": "ZeroOne"

examples/nlp.mof.json

@@ -1,8 +1,8 @@
 {
     "description": "The problem: min{2x + sin(x)^2 + y}.",
     "version": {
-        "major": 0,
-        "minor": 7
+        "major": 1,
+        "minor": 0
     },
     "variables": [{
         "name": "x"

examples/quadratic.mof.json

@@ -1,8 +1,8 @@
 {
     "description": "The problem: min{x^2 + x * y + y^2}",
     "version": {
-        "major": 0,
-        "minor": 7
+        "major": 1,
+        "minor": 0
     },
     "variables": [{
         "name": "x"

examples/vector.mof.json

@@ -1,8 +1,8 @@
 {
     "description": "The problem: min{0 | [1 2; 3 4][x, y] + [5, 6] ∈ R+.",
     "version": {
-        "major": 0,
-        "minor": 7
+        "major": 1,
+        "minor": 0
     },
     "variables": [{
         "name": "x"

schemas/mof.0.7.schema.json schemas/mof.1.0.schema.jsonschemas/mof.0.7.schema.json renamed to schemas/mof.1.0.schema.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/schema#",
-    "$id": "https://jump.dev/MathOptFormat/schemas/mof.0.7.schema.json",
+    "$id": "https://jump.dev/MathOptFormat/schemas/mof.1.0.schema.json",
     "title": "The schema for MathOptFormat",
     "type": "object",
     "required": ["version", "variables", "objective", "constraints"],
@@ -11,10 +11,10 @@
             "required": ["minor", "major"],
             "properties": {
                 "minor": {
-                    "const": 6
+                    "const": 0
                 },
                 "major": {
-                    "const": 0
+                    "const": 1
                 }
             }
         },
@@ -281,14 +281,14 @@
             "type": "object",
             "required": ["type"],
             "oneOf": [{
-                "description": "The scalar variable `variable`.",
-                "examples": ["{\"type\": \"SingleVariable\", \"variable\": \"x\"}"],
-                "required": ["variable"],
+                "description": "The scalar variable `x`.",
+                "examples": ["{\"type\": \"Variable\", \"name\": \"x\"}"],
+                "required": ["name"],
                 "properties": {
                     "type": {
-                        "const": "SingleVariable"
+                        "const": "Variable"
                     },
-                    "variable": {
+                    "name": {
                         "type": "string"
                     }
                 }