Skip to content
Snippets Groups Projects
Commit 6fcfd391 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

Merge branch 'fixup_assertion' into 'NIFTy_7'

Test for domain equality

See merge request !690
parents 4b4d311c 4517b8e7
No related branches found
No related tags found
2 merge requests!755Draft: Resolve "correlated Field model linearization adjoint very slow if total_N != 0",!690Test for domain equality
Pipeline #110718 passed
...@@ -136,6 +136,8 @@ def check_operator(op, loc, tol=1e-12, ntries=100, perf_check=True, ...@@ -136,6 +136,8 @@ def check_operator(op, loc, tol=1e-12, ntries=100, perf_check=True,
def assert_allclose(f1, f2, atol=0, rtol=1e-7): def assert_allclose(f1, f2, atol=0, rtol=1e-7):
if isinstance(f1, Field): if isinstance(f1, Field):
return np.testing.assert_allclose(f1.val, f2.val, atol=atol, rtol=rtol) return np.testing.assert_allclose(f1.val, f2.val, atol=atol, rtol=rtol)
if f1.domain is not f2.domain:
raise AssertionError
for key, val in f1.items(): for key, val in f1.items():
assert_allclose(val, f2[key], atol=atol, rtol=rtol) assert_allclose(val, f2[key], atol=atol, rtol=rtol)
...@@ -143,6 +145,8 @@ def assert_allclose(f1, f2, atol=0, rtol=1e-7): ...@@ -143,6 +145,8 @@ def assert_allclose(f1, f2, atol=0, rtol=1e-7):
def assert_equal(f1, f2): def assert_equal(f1, f2):
if isinstance(f1, Field): if isinstance(f1, Field):
return np.testing.assert_equal(f1.val, f2.val) return np.testing.assert_equal(f1.val, f2.val)
if f1.domain is not f2.domain:
raise AssertionError
for key, val in f1.items(): for key, val in f1.items():
assert_equal(val, f2[key]) assert_equal(val, f2[key])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment