JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improving diff report format

Browse Source
This commit is contained in:
Michael Tryby
2018-07-12 10:28:25 -04:00
parent 86c55a2373
commit db40fa7bbe
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/nrtest-epanet/report_diff.py
View File

@@ -17,6 +17,8 @@ import numpy as np
# project imports # project imports
import nrtest_epanet.output_reader as ordr import nrtest_epanet.output_reader as ordr
from numpy.f2py.auxfuncs import hasinitvalue
from numpy.tests.test_numpy_version import test_valid_numpy_version
def report_diff(path_test, path_ref, min_cdd): def report_diff(path_test, path_ref, min_cdd):
@@ -52,7 +54,7 @@ def log_relative_error(q, c):
diff = np.subtract(q, c) diff = np.subtract(q, c)
tmp_c = np.copy(c) tmp_c = np.copy(c)
# If ref value is small compute absolute error # If ref value is small compute absolute error
tmp_c[np.fabs(tmp_c) <= 1.0e-6] = 1.0 tmp_c[np.fabs(tmp_c) < 1.0e-6] = 1.0
re = np.fabs(diff)/np.fabs(tmp_c) re = np.fabs(diff)/np.fabs(tmp_c)
# If re is tiny set lre to number of digits # If re is tiny set lre to number of digits
@@ -64,5 +66,13 @@ def log_relative_error(q, c):
def print_diff(idx, lre, test, ref): def print_diff(idx, lre, test, ref):
print("LRE: %f\nIdx: %s\nSut: %f\nRef: %f\n"
% ((lre[idx]),(idx[0], ref[1]),(test[0][idx[0]]),(ref[0][idx[0]]))) idx_val = (idx[0], ref[1])
test_val = (test[0][idx[0]])
ref_val = (ref[0][idx[0]])
diff_val = (test_val - ref_val)
lre_val = (lre[idx[0]])
print("Idx: %s\nSut: %f Ref: %f Diff: %f LRE: %f\n"
% (idx_val, test_val, ref_val, diff_val, lre_val))