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

Fixed comparison of numbers of the form 2e-008 in the regression tests

Browse source
This commit is contained in:
Ray Speth 2012-02-27 18:15:31 +00:00
parent 1e5d4d50e1
commit fde60d2f38
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
site_scons/buildutils.py
View file

@ -192,7 +192,7 @@ def compareTextFiles(env, file1, file2):
# Replace nearly-equal floating point numbers with exactly equivalent
# representations to avoid confusing difflib
reFloat = re.compile(r'(\s*)([+-]{0,1}\d+\.\d+[eE]{0,1}[+-]{0,1}\d*)')
reFloat = re.compile(r'(\s*)([+-]{0,1}\d+\.{0,1}\d*[eE]{0,1}[+-]{0,1}\d*)')
for i in range(min(len(text1), len(text2))):
line1 = text1[i]
line2 = text2[i]
@ -243,11 +243,15 @@ def getPrecision(x):
the number represented by the string 'x'.
"""
x = x.lower()
decimalPt = x.find('.')
if decimalPt == -1:
decimalPt = 0
if x.find('e') != -1:
precision = x.find('.') - x.find('e') + 1
precision = decimalPt - x.find('e') + 1
precision += int(x[x.find('e')+1:])
else:
precision = x.find('.') - len(x) + 1
precision = decimalPt - len(x) + 1
return 10**precision