Changeset 2268


Ignore:
Timestamp:
Feb 5, 2010 5:25:52 PM (9 years ago)
Author:
wehart
Message:

A fix to the tests.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • coopr.pysp/trunk/coopr/pysp/tests/unit/test_ph.py

    r2267 r2268  
    5858        model_dir = farmer_examples_dir + os.sep + "models"
    5959        instance_dir = farmer_examples_dir + os.sep + "scenariodata"       
    60         pyutilib.subprocess.run("runph --solver=cplex --solver-manager=serial --model-directory="+model_dir+" --instance-directory="+instance_dir,outfile="farmer_quadratic.out")
     60        pyutilib.subprocess.run("lbin runph --solver=cplex --solver-manager=serial --model-directory="+model_dir+" --instance-directory="+instance_dir,outfile="farmer_quadratic.out")
    6161        # if the test passes, the first argument is deleted.
    6262        self.failUnlessFileEqualsBaseline(currdir+"farmer_quadratic.out",currdir+"farmer_quadratic.baseline", filter=filter_time)
     
    7373        model_dir = farmer_examples_dir + os.sep + "models"
    7474        instance_dir = farmer_examples_dir + os.sep + "scenariodata"       
    75         pyutilib.subprocess.run("runph --solver=cplex --solver-manager=serial --model-directory="+model_dir+" --instance-directory="+instance_dir+" --linearize-nonbinary-penalty-terms=10",outfile="farmer_linearized.out")
     75        pyutilib.subprocess.run("lbin runph --solver=cplex --solver-manager=serial --model-directory="+model_dir+" --instance-directory="+instance_dir+" --linearize-nonbinary-penalty-terms=10",outfile="farmer_linearized.out")
    7676        # if the test passes, the first argument is deleted.
    7777        self.failUnlessFileEqualsBaseline(currdir+"farmer_linearized.out",currdir+"farmer_linearized.baseline", filter=filter_time)
Note: See TracChangeset for help on using the changeset viewer.