research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Test] Use relative and absolute tolerances for comparing files

Browse source 
Use the same tolerances for comparing text output files as is used for CSV
files. The absolute tolerance is the maximum (less restrictive) of the specified
tolerance and the tolerance implied by the recorded precision.
This commit is contained in:
Ray Speth 2013-04-24 21:47:19 +00:00
parent f90d9b80d1
commit a5bb695c24
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
site_scons/buildutils.py
View file

@ -190,6 +190,9 @@ def compareTextFiles(env, file1, file2):
if not diff:
return 0
atol = env['test_csv_threshold']
rtol = env['test_csv_tolerance']
# Replace nearly-equal floating point numbers with exactly equivalent
# representations to avoid confusing difflib
reFloat = re.compile(r'(\s*)([+-]{0,1}\d+\.{0,1}\d*[eE]{0,1}[+-]{0,1}\d*)')
@ -220,7 +223,10 @@ def compareTextFiles(env, file1, file2):
delta = max(getPrecision(floats1[j][1]), getPrecision(floats2[j][1]))
num1 = float(floats1[j][1])
num2 = float(floats2[j][1])
if not num1 - 1.1*delta < num2 < num1 + 1.1*delta:
abserr = abs(num1-num2)
relerr = abserr / (0.5 * abs(num1 + num2) + atol)
if abserr > (1.1*delta + atol) and relerr > rtol:
print 'Values differ: {: 14g} {: 14g}; rel. err = {:.3e}; abs. err = {:.3e}'.format(num1, num2, relerr, abserr)
allMatch = False
break