Merge pull request #3331 from ZedongPeng/dsda_dev

Add Logic-Based Discrete-Steepest Descent Algorithm in GDPOpt

Author: blnicho

pyomo/contrib/gdpopt/config_options.py

@@ -22,6 +22,9 @@
 from pyomo.contrib.gdpopt.discrete_problem_initialize import valid_init_strategies
 from pyomo.contrib.gdpopt.nlp_initialization import restore_vars_to_original_values
 from pyomo.contrib.gdpopt.util import a_logger, _DoNothing
+from pyomo.util.config_domains import ComponentDataSet
+from pyomo.core.base import LogicalConstraint
+from pyomo.gdp.disjunct import Disjunction
 
 _supported_algorithms = {
     'LOA': ('gdpopt.loa', 'Logic-based Outer Approximation'),
@@ -528,3 +531,40 @@ def _add_tolerance_configs(CONFIG):
             description="Tolerance for bound convergence.",
         ),
     )
+
+
+def _add_ldsda_configs(CONFIG):
+    CONFIG.declare(
+        "direction_norm",
+        ConfigValue(
+            default='L2',
+            domain=In(['L2', 'Linf']),
+            description="The norm to use for the search direction",
+        ),
+    )
+    CONFIG.declare(
+        "starting_point",
+        ConfigValue(default=None, description="The value list of external variables."),
+    )
+    CONFIG.declare(
+        "logical_constraint_list",
+        ConfigValue(
+            default=None,
+            domain=ComponentDataSet(LogicalConstraint),
+            description="""
+            The list of logical constraints to be reformulated into external variables.
+            The logical constraints should be in the same order of provided starting point.
+            The provided logical constraints should be ExactlyExpressions.""",
+        ),
+    )
+    CONFIG.declare(
+        "disjunction_list",
+        ConfigValue(
+            default=None,
+            domain=ComponentDataSet(Disjunction),
+            description="""
+            The list of disjunctions to be reformulated into external variables.
+            The disjunctions should be in the same order of provided starting point.
+            """,
+        ),
+    )