[Breaking] Rename IndicatorSet to Indicator (#18)

Author: dourouc05

README.md

@@ -246,7 +246,7 @@ Here is a summary of the sets defined by MathOptFormat.
 | `"PositiveSemidefiniteConeSquare"` | The cone of symmetric positive semidefinite matrices, with side length `side_dimension`. The entries of the matrix are given column by column (or equivalently, row by row). The matrix is both constrained to be symmetric and to be positive semidefinite. That is, if the functions in entries `(i, j)` and `(j, i)` are different, then a constraint will be added to make sure that the entries are equal. | {"type": "PositiveSemidefiniteConeSquare", "side_dimension": 2} |
 | `"PowerCone"` | [x, y, z] ∈ {R³: x^{exponent} y^{1-exponent} ≥ \|z\|; x, y ≥ 0} | {"type": "PowerCone", "exponent": 2.0} |
 | `"DualPowerCone"` | [u, v, w] ∈ {R³: (u / exponent)^{exponent} (v / (1-exponent))^{1-exponent} ≥ \|w\|; u, v ≥ 0} | {"type": "DualPowerCone", "exponent": 2.0} |
-| `"IndicatorSet"` | If `activate_on=one`: (y, x) ∈ {0,1}×Rᴺ: y = 0 ⟹ x ∈ S, otherwise when `activate_on=zero`: (y, x) ∈ {0,1}×Rᴺ: y = 1 ⟹ x ∈ S. | {"type": "IndicatorSet", "set": {"type": "LessThan", "upper": 2.0}, "activate_on": "one"} |
+| `"Indicator"` | If `activate_on=one`: (y, x) ∈ {0,1}×Rᴺ: y = 0 ⟹ x ∈ S, otherwise when `activate_on=zero`: (y, x) ∈ {0,1}×Rᴺ: y = 1 ⟹ x ∈ S. | {"type": "Indicator", "set": {"type": "LessThan", "upper": 2.0}, "activate_on": "one"} |
 | `"NormOneCone"` | (t, x) ∈ {R^{dimension}: t ≥ Σᵢ\|xᵢ\|} | {"type": "NormOneCone", "dimension": 2} |
 | `"NormInfinityCone"` | (t, x) ∈ {R^{dimension}: t ≥ maxᵢ\|xᵢ\|} | {"type": "NormInfinityCone", "dimension": 2} |
 | `"RelativeEntropyCone"` | (u, v, w) ∈ {R^{dimension}: u ≥ sumᵢ wᵢlog(wᵢ/vᵢ), vᵢ ≥ 0, wᵢ ≥ 0} | {"type": "RelativeEntropyCone", "dimension": 3} |

examples/biobjective.mof.json

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

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": 6
+        "minor": 7
     },
     "variables": [{
         "name": "x",

examples/nlp.mof.json

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

examples/quadratic.mof.json

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

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": 6
+        "minor": 7
     },
     "variables": [{
         "name": "x"

python/mof.py

@@ -2,17 +2,18 @@
 import jsonschema
 import os
 
-SCHEMA_FILENAME = '../schemas/mof.0.6.schema.json'
+
+SCHEMA_FILENAME = '../schemas/mof.0.7.schema.json'
 
 def validate(filename):
-    with open(filename, 'r') as io:
+    with open(filename, 'r', encoding='utf-8') as io:
         instance = json.load(io)
-    with open(SCHEMA_FILENAME, 'r') as io:
+    with open(SCHEMA_FILENAME, 'r', encoding='utf-8') as io:
         schema = json.load(io)
     jsonschema.validate(instance = instance, schema = schema)
 
 def summarize_schema():
-    with open(SCHEMA_FILENAME, 'r') as io:
+    with open(SCHEMA_FILENAME, 'r', encoding='utf-8') as io:
         schema = json.load(io)
     summary = "## Sets\n"
     summary += "\n### Scalar Sets\n\n" + summarize(schema, "scalar_sets")