Changeset 5826


Ignore:
Timestamp:
May 29, 2012 11:39:17 AM (7 years ago)
Author:
jwatson
Message:

More messing with test-to-baseline tolerances.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • coopr.opt/trunk/coopr/opt/tests/base/test_ampl.py

    r5825 r5826  
    5555                self.fail("Unexpected ConverterError - ampl is enabled but not available: '%s'" % str(err))
    5656            return
    57         self.assertFileEqualsBaseline(currdir+'test3.nl', currdir+'test3.baseline.nl', filter=filter, tolerance=1e-5)
     57        self.assertFileEqualsBaseline(currdir+'test3.nl', currdir+'test3.baseline.nl', filter=filter, tolerance=1e-6)
    5858
    5959    def test3_write_lp(self):
     
    7070                self.fail("Unexpected ConverterError - glpsol is enabled but not available: '%s'" % str(err))
    7171            return
    72         self.assertFileEqualsBaseline(currdir+'test3.lp', currdir+'test3.baseline.lp', filter=filter, tolerance=1e-5)
     72        self.assertFileEqualsBaseline(currdir+'test3.lp', currdir+'test3.baseline.lp', filter=filter, tolerance=1e-6)
    7373
    7474    def test3_write_mps(self):
     
    8585                self.fail("Unexpected ConverterError - glpsol is enabled but not available: '%s'" % str(err))
    8686            return
    87         self.assertFileEqualsBaseline(currdir+'test3.mps', currdir+'test3.baseline.mps', filter=filter, tolerance=1e-5)
     87        self.assertFileEqualsBaseline(currdir+'test3.mps', currdir+'test3.baseline.mps', filter=filter, tolerance=1e-6)
    8888
    8989    def test3a_write_nl(self):
     
    100100                self.fail("Unexpected ConverterError - ampl is enabled but not available: '%s'" % str(err))
    101101            return
    102         self.assertFileEqualsBaseline(currdir+'test3a.nl', currdir+'test3.baseline.nl', filter=filter, tolerance=1e-5)
     102        self.assertFileEqualsBaseline(currdir+'test3a.nl', currdir+'test3.baseline.nl', filter=filter, tolerance=1e-6)
    103103
    104104    def test3a_write_lp(self):
     
    115115                self.fail("Unexpected ConverterError - glpsol is enabled but not available: '%s'" % str(err))
    116116            return
    117         self.assertFileEqualsBaseline(currdir+'test3a.lp', currdir+'test3.baseline.lp', filter=filter, tolerance=1e-5)
     117        self.assertFileEqualsBaseline(currdir+'test3a.lp', currdir+'test3.baseline.lp', filter=filter, tolerance=1e-6)
    118118
    119119    def test3a_write_mps(self):
     
    130130                self.fail("Unexpected ConverterError - glpsol is enabled but not available: '%s'" % str(err))
    131131            return
    132         self.assertFileEqualsBaseline(currdir+'test3a.mps', currdir+'test3.baseline.mps', filter=filter, tolerance=1e-5)
     132        self.assertFileEqualsBaseline(currdir+'test3a.mps', currdir+'test3.baseline.mps', filter=filter, tolerance=1e-6)
    133133
    134134    def test3_solve(self):
     
    139139        results = opt.solve(self.model, keepFiles=False)
    140140        results.write(filename=currdir+'test3.out', format='json')
    141         self.assertMatchesJsonBaseline(currdir+'test3.out', currdir+'test3.baseline.out')
     141        self.assertMatchesJsonBaseline(currdir+'test3.out', currdir+'test3.baseline.out', tolerance=1e-6)
    142142
    143143    def test3a_solve(self):
     
    148148        results = opt.solve(self.model, keepFiles=False)
    149149        results.write(filename=currdir+'test3a.out', format='json')
    150         self.assertMatchesJsonBaseline(currdir+'test3a.out', currdir+'test3.baseline.out')
     150        self.assertMatchesJsonBaseline(currdir+'test3a.out', currdir+'test3.baseline.out', tolerance=1e-6)
    151151
    152152
Note: See TracChangeset for help on using the changeset viewer.