fixes to skip logic in PySP test module (fixes #1)

Pyomo · Jun 18, 2016 · 89f9aa9 · 89f9aa9
1 parent c17f0fb
commit 89f9aa9
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/pyomo/pysp/tests/examples/test_ph.py b/pyomo/pysp/tests/examples/test_ph.py
@@ -288,8 +288,8 @@ def get_cmd_base(self):
                     % (_pyomo_ns_host, _pyomo_ns_port)
         else:
             raise RuntimeError("Invalid solver manager "+str(self.solver_manager))
-        #cmd += " --solver="+self.solver_name
-        #cmd += " --solver-io="+self.solver_io
+        cmd += " --solver="+self.solver_name
+        cmd += " --solver-io="+self.solver_io
         cmd += " --xhat-method=voting"
         cmd += self.base_command_options
         return cmd
@@ -552,7 +552,9 @@ def _check_baseline_func(self, class_name, test_name):
                 self.safe_delete(join(thisDir,prefix+".ph_solution.json.out"))
                 self.safe_delete(join(thisDir,prefix+".postphef_solution.json.out"))
 
-        new_options_string = options_string+(" --solve-ef")
+        new_options_string = options_string+(" --solve-ef"
+                                             " --ef-solver="+self.solver_name+
+                                             " --ef-solver-io="+self.solver_io)
         self._baseline_test(options_string=new_options_string,
                             validation_options_string=validation_options_string,
                             cleanup_func=_cleanup_func,
@@ -985,7 +987,7 @@ def setUpClass(cls):
         cls.model_directory = farmer_model_dir
         cls.instance_directory = farmer_data_dir
         cls.solver_manager = 'pyro'
-        cls.solver_name = 'ipopt'
+        cls.solver_name = 'cplex' #'ipopt'
         cls.solver_io = 'nl'
         cls.diff_filter = staticmethod(filter_pyro)
         PHTester._setUpClass(cls)
@@ -1000,7 +1002,7 @@ def setUpClass(cls):
         cls.model_directory = farmer_model_dir
         cls.instance_directory = farmer_trivialbundlesdata_dir
         cls.solver_manager = 'serial'
-        cls.solver_name = 'ipopt'
+        cls.solver_name = 'cplex' #'ipopt'
         cls.solver_io = 'nl'
         cls.diff_filter = staticmethod(filter_time_and_data_dirs)
         PHTester._setUpClass(cls)