Changeset 2362


Ignore:
Timestamp:
Feb 17, 2010 12:19:40 PM (10 years ago)
Author:
wehart
Message:

Fix to run with glpk but not cplex.

File:
1 edited

Legend:

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

    r2275 r2362  
    7979    def test_linearized_farmer(self):
    8080
    81         if cplex_available is False:
    82            return       
     81        if (cplex_available or glpk_available) is False:
     82           return
    8383
    8484        pyutilib.misc.setup_redirect(current_directory+"farmer_linearized.out")
     
    116116        self.cleanup()       
    117117
    118     def run(self, result=None):
    119        global cplex_available
    120        if not cplex_available:
    121           return
    122        pyutilib.th.TestCase.run(self,result)
     118    #def run(self, result=None):
     119       #global cplex_available
     120       #if not cplex_available:
     121          #return
     122       #pyutilib.th.TestCase.run(self,result)
    123123
    124124if __name__ == "__main__":
Note: See TracChangeset for help on using the changeset viewer.