Changeset 2669

Timestamp:

Jun 16, 2010 5:10:50 PM (11 years ago)

Author:

jwatson

Message:

Fix to runef involving the same issue as in the previous commit.

Location:

coopr.pysp/trunk/coopr/pysp

Files:

• ef.py (modified) (3 diffs)
• ef_writer_script.py (modified) (1 diff)

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

@@ -633 +633 @@
          raise RuntimeError, "Failed to create model instance for scenario=" + scenario._name
 
+      # IMPT: This is kind of a hack now, as there is currently no way to propagate
+      #       solver capabilities through to the corresponding file writer - it
+      #       has to go through the model. for now, assume the solver has all capabilities.
+      scenario_instance.has_capability = lambda x: True
+
       # name each instance with the scenario name, so the prefixes in the EF make sense.
       scenario_instance.name = scenario._name
@@ -648 +653 @@
                                          generate_weighted_cvar = generate_weighted_cvar,
                                          cvar_weight = cvar_weight,
-                                         risk_alpha = risk_alpha)   
+                                         risk_alpha = risk_alpha)
+   binding_instance.has_capability = lambda x: True   
 
    print "Starting to write extensive form"
@@ -667 +673 @@
 
    binding_instance = create_ef_instance(scenario_tree, scenario_instances)
+   binding_instance.has_capability = lambda x: True      
 
    print "Starting to write extensive form"

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

@@ -161 +161 @@
       if ef_solver is None:
          raise ValueError, "Failed to create solver manager of type="+options.solver_type+" for use in extensive form solve"
+
+      # at this point you have a specific solver - communicate solver capabilities
+      # to the writer via the instance.
+      binding_instance.has_capability = ef_solver.has_capability
+      for scenario_name, scenario_instance in scenario_instances.items():
+         scenario_instance.has_capability = ef_solver.has_capability
 
       print "Queuing extensive form solve"