Merge pull request #36 from SECQUOIA/split_logical

Separate the positioning and spectralog instances into two folders

benchmark.py

@@ -79,7 +79,8 @@ def benchmark(model, strategy, timelimit, result_dir, subsolver="scip"):
         # "hda",
         "jobshop",
         # "kaibel",
-        # "logical",
+        # "positioning",
+        # "spectralog",
         # "med_term_purchasing",
         # "methanol",
         # "mod_hens",

gdplib/__init__.py

@@ -1,7 +1,8 @@
 import gdplib.mod_hens
 import gdplib.modprodnet
 import gdplib.biofuel
-import gdplib.logical  # Requires logical expression system
+import gdplib.positioning
+import gdplib.spectralog
 import gdplib.stranded_gas  # Requires logical expression system
 import gdplib.gdp_col
 import gdplib.hda

gdplib/positioning/README.md

@@ -0,0 +1,24 @@
+# Optimal positioning
+
+``positioning`` is a demonstration problems for the Pyomo.GDP logical expression system, adapted from its equivalent in LOGMIP.
+
+Source paper (Example 4):
+
+> Duran, M. A., & Grossmann, I. E. (1986). An outer-approximation algorithm for a class of mixed-integer nonlinear programs. *Mathematical Programming*, 36(3), 307. https://doi.org/10.1007/BF02592064
+
+## Problem Details
+
+### Solution
+
+Optimal objective value: -8.06
+
+### Size
+- Variables: 56
+    - Boolean: 50
+    - Binary: 0
+    - Integer: 0
+    - Continuous: 6
+- Constraints: 30
+    - Nonlinear: 25
+- Disjuncts: 50
+- Disjunctions: 25

gdplib/positioning/__init__.py

@@ -0,0 +1,3 @@
+from .positioning import build_model
+
+__all__ = ['build_model']

gdplib/spectralog/README.md

@@ -0,0 +1,24 @@
+# Spectralog
+
+``spectralog`` is a demonstration problems for the Pyomo.GDP logical expression system, adapted from its equivalent in LOGMIP.
+
+Source paper (Example 2):
+
+> Vecchietti, A., & Grossmann, I. E. (1999). LOGMIP: A disjunctive 0-1 non-linear optimizer for process system models. *Computers and Chemical Engineering*, 23(4–5), 555–565. https://doi.org/10.1016/S0098-1354(98)00293-2
+
+## Problem Details
+
+### Solution
+
+Optimal objective value: 12.0893
+
+### Size
+- Variables: 128
+    - Boolean: 60
+    - Binary: 0
+    - Integer: 0
+    - Continuous: 68
+- Constraints: 158
+    - Nonlinear: 8
+- Disjuncts: 60
+- Disjunctions: 30

gdplib/spectralog/__init__.py

@@ -0,0 +1,3 @@
+from .spectralog import build_model
+
+__all__ = ['build_model']