Changeset 3155

Timestamp:

Oct 25, 2010 12:15:29 AM (10 years ago)

Author:

jwatson

Message:

Added --linearize-expression and associated processing to runef PySP script.

Location:

coopr.pysp/trunk/coopr/pysp

Files:

• ef.py (modified) (3 diffs)
• ef_writer_script.py (modified) (2 diffs)

coopr.pysp/trunk/coopr/pysp/ef.py

@@ -10 +10 @@
 from coopr.pysp.convergence import *
 from coopr.pysp.ph import *
+from coopr.pysp.phutils import *
 
 from coopr.pyomo.base import *
@@ -505 +506 @@
 
 def write_ef_from_scratch(model_directory, instance_directory, output_filename,
-                          verbose_output,
+                          verbose_output, linearize,
                           generate_weighted_cvar, cvar_weight, risk_alpha):
 
@@ -617 +618 @@
    for scenario in scenario_tree._scenarios:
 
-      scenario_instance = None
-
-      if verbose_output is True:
-         print "Creating instance for scenario=" + scenario._name
-
-      try:
-         if scenario_tree._scenario_based_data == 1:
-            scenario_data_filename = scenario_data_directory_name + os.sep + scenario._name + ".dat"
-            scenario_instance = master_scenario_model.create(scenario_data_filename)
-         else:
-            scenario_instance = master_scenario_model.clone()
-            scenario_data = ModelData()
-            current_node = scenario._leaf_node
-            while current_node is not None:
-               node_data_filename = scenario_data_directory_name + os.sep + current_node._name + ".dat"
-               scenario_data.add(node_data_filename)
-               current_node = current_node._parent
-            scenario_data.read(model=scenario_instance)
-            scenario_instance.load(scenario_data)
-            scenario_instance.preprocess()
-      except:
-         print "Encountered exception in model instance creation - traceback:"
-         traceback.print_exc()
-         raise RuntimeError, "Failed to create model instance for scenario=" + scenario._name
-
+      scenario_instance = construct_scenario_instance(scenario_tree,
+                                                      instance_directory,
+                                                      scenario._name,
+                                                      master_scenario_model,
+                                                      verbose=verbose_output,
+                                                      preprocess=True,
+                                                      linearize=linearize)
+
+      scenario_instances[scenario._name] = scenario_instance
       # name each instance with the scenario name, so the prefixes in the EF make sense.
       scenario_instance.name = scenario._name
-      
-      scenario_instances[scenario._name] = scenario_instance
 
    if re_enable_gc is True:

coopr.pysp/trunk/coopr/pysp/ef_writer_script.py

@@ -82 +82 @@
      type='float',
      default=0.95)
+   efOpts.add_option("--linearize-expressions",
+     help="EXPERIMENTAL: An option intended for use on linear or mixed-integer models " \
+          "in which expression trees in a model (constraints or objectives) are compacted " \
+          "into a more memory-efficient and concise form. The trees themselves are eliminated. ",
+     action="store_true",
+     dest="linearize_expressions",
+     default=False)
 
    solverOpts.add_option('--mipgap',
@@ -184 +191 @@
                                                                                os.path.expanduser(options.output_file),
                                                                                options.verbose,
+                                                                               options.linearize_expressions,
                                                                                generate_weighted_cvar, cvar_weight, risk_alpha)