Changeset 2364

Timestamp:

Feb 17, 2010 1:27:18 PM (10 years ago)

Author:

wehart

Message:

Bug fix when using glpk but not cplex.

File:

• coopr.pysp/trunk/coopr/pysp/tests/unit/test_ph.py (modified) (2 diffs)

coopr.pysp/trunk/coopr/pysp/tests/unit/test_ph.py

@@ -79 +79 @@
     def test_linearized_farmer(self):
 
-        if (cplex_available or glpk_available) is False:
+        if cplex_available:
+            solver='cplex'
+        elif glpk_available:
+            solver='glpk'
+        else:
            return
 
@@ -86 +90 @@
         model_dir = farmer_examples_dir + os.sep + "models"
         instance_dir = farmer_examples_dir + os.sep + "scenariodata"        
-        argstring = "runph --solver=cplex --solver-manager=serial --model-directory="+model_dir+" --instance-directory="+instance_dir+" --linearize-nonbinary-penalty-terms=10"
+        argstring = "runph --solver="+solver+" --solver-manager=serial --model-directory="+model_dir+" --instance-directory="+instance_dir+" --linearize-nonbinary-penalty-terms=10"
         args = string.split(argstring)
         coopr.pysp.phinit.run(args=args)