Changeset 4905


Ignore:
Timestamp:
09/15/11 08:53:09 (3 years ago)
Author:
wehart
Message:

Update to IPOPT tester to use Yaml comparisons, and corresponding baseline files.

Location:
coopr.plugins/trunk/coopr/plugins/tests/mip
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • coopr.plugins/trunk/coopr/plugins/tests/mip/test_ipopt.py

    r4887 r4905  
    109109        results = self.asl.solve(currdir+"sisser.pyomo.nl", logfile=currdir+"test_solve_from_nl.log") 
    110110        results.write(filename=currdir+"test_solve_from_nl.txt",times=False) 
    111         self.assertFileEqualsBaseline(currdir+"test_solve_from_nl.txt", currdir+"test_solve_from_nl.baseline") 
     111        self.assertMatchesYamlBaseline(currdir+"test_solve_from_nl.txt", currdir+"test_solve_from_nl.baseline") 
    112112 
    113113    @unittest.skipIf(not ipopt_available, "The 'ipopt' executable is not available") 
     
    116116        results = self.asl.solve(self.sisser_instance) 
    117117        results.write(filename=currdir+"test_solve_from_instance.txt",times=False) 
    118         self.assertFileEqualsBaseline(currdir+"test_solve_from_instance.txt", currdir+"test_solve_from_instance.baseline") 
     118        self.assertMatchesYamlBaseline(currdir+"test_solve_from_instance.txt", currdir+"test_solve_from_instance.baseline") 
    119119        self.sisser_instance.load(results) 
    120120 
  • coopr.plugins/trunk/coopr/plugins/tests/mip/test_solve_from_instance.baseline

    r4877 r4905  
    1919Solver:  
    2020- Status: ok 
    21   Message: Ipopt 3.9.3\x3a Optimal Solution Found 
    22   Termination condition: OPTIMAL SOLUTION FOUND! 
     21  Termination condition: optimal 
    2322  Id: 0 
    2423  Error rc: 0 
     
    3029- number of solutions: 1 
    3130  number of solutions displayed: 1 
    32 - Status: OPTIMAL SOLUTION FOUND! 
    33   Message: Ipopt 3.9.3\x3a Optimal Solution Found 
     31- Status: optimal 
    3432  Variable:  
    3533    v0: 
    36       Id: 0 
    3734      Value: 0.000741168592849 
    3835    v1: 
    39       Id: 1 
    4036      Value: 0.000365046337016 
  • coopr.plugins/trunk/coopr/plugins/tests/mip/test_solve_from_nl.baseline

    r4877 r4905  
    2020- Status: ok 
    2121  Message: Ipopt 3.9.3\x3a Optimal Solution Found 
    22   Termination condition: OPTIMAL SOLUTION FOUND! 
     22  Termination condition: optimal 
    2323  Id: 0 
    2424  Error rc: 0 
     
    3030- number of solutions: 1 
    3131  number of solutions displayed: 1 
    32 - Status: OPTIMAL SOLUTION FOUND! 
     32- Status: optimal 
    3333  Message: Ipopt 3.9.3\x3a Optimal Solution Found 
    3434  Variable:  
Note: See TracChangeset for help on using the changeset viewer.