Skip to content

Commit

Permalink
Fixes issue comparing with dataset object
Browse files Browse the repository at this point in the history
  • Loading branch information
@holm10
holm10 committed Dec 6, 2023
1 parent 4e0c25d commit fbbb8d9
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions pytests/pytests/fulltests/nonog_d_c-fb_16x8/test_nonog_d_c-fb_16x8.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/fulltests/nonog_d_c-fb_32x16/test_nonog_d_c-fb_32x16.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/fulltests/nonog_d_c-fb_64x32/test_nonog_d_c-fb_64x32.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/unittests/D_only/nonog/default/test_nonog_default.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/unittests/D_only/nonog/test1/test_nonog_test1.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/unittests/D_only/nonog/test2/test_nonog_test2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/unittests/D_only/nonog/test3/test_nonog_test3.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/unittests/D_only/nonog/test5/test_nonog_test5.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/unittests/D_only/ortho/default/test_ortho_default.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/unittests/D_only/ortho/test1/test_ortho_test1.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/unittests/D_only/ortho/test2/test_ortho_test2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/unittests/D_only/ortho/test3/test_ortho_test3.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/unittests/D_only/ortho/test5/test_ortho_test5.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/pytests/unittests/slab_D_only/slab/default/test_slab_default.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down
4 changes: 2 additions & 2 deletions pytests/templates/tests/test_uedge.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def matches(save, refs, epsilon):
recoverstate(save, refs)
fnrm = bbb.get_fnrm(bbb.dtreal)
print('TEST RESULTS')
print(' REFERENCE', refs['fnrm'])
print(' REFERENCE', refs['fnrm'][()])
print(' RESULT', fnrm)
return isclose(fnrm, refs['fnrm'], atol=0.0, rtol=epsilon)
return isclose(fnrm, refs['fnrm'][()], atol=0.0, rtol=epsilon)


def print_itroub(refs):
Expand Down

0 comments on commit fbbb8d9

Please sign in to comment.