Skip to content

Commit 6669332

Browse files
committed
updated unit tests
1 parent e39c3d7 commit 6669332

1 file changed

Lines changed: 33 additions & 11 deletions

File tree

‎tests/unit/CodeEntropy/levels/test_axes.py‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,7 +1680,9 @@ def _select_atoms(q):
16801680
lambda system, atom, dimensions: (np.eye(3), np.array([1.0, 1.0, 1.0])),
16811681
)
16821682

1683-
monkeypatch.setattr(ax, "get_custom_axes", lambda a, b, c: 2 * np.eye(3))
1683+
monkeypatch.setattr(
1684+
ax, "get_custom_axes", lambda a, b_list, c, dimensions: 2 * np.eye(3)
1685+
)
16841686

16851687
trans_axes, rot_axes, rot_center, moi = ax.get_UA_axes(
16861688
data_container=residue_group, index=0, res_position=1
@@ -1720,7 +1722,9 @@ def _select_atoms(q):
17201722
"get_bonded_axes",
17211723
lambda system, atom, dimensions: (np.eye(3), 3 * np.eye(3)),
17221724
)
1723-
monkeypatch.setattr(ax, "get_custom_axes", lambda a, b, c: 2 * np.eye(3))
1725+
monkeypatch.setattr(
1726+
ax, "get_custom_axes", lambda a, b_list, c, dimensions: 2 * np.eye(3)
1727+
)
17241728
monkeypatch.setattr(ax, "get_chain", lambda residue, first, last: [])
17251729
trans_axes, rot_axes, rot_center, moi = ax.get_UA_axes(
17261730
data_container=residue_group, index=0, res_position=0
@@ -1756,7 +1760,9 @@ def _select_atoms(q):
17561760
u.atoms.select_atoms.side_effect = _select_atoms
17571761
residue.select_atoms.side_effect = residue
17581762
monkeypatch.setattr(ax, "get_chain", lambda residue, first, last: [])
1759-
monkeypatch.setattr(ax, "get_custom_axes", lambda a, b, c: 2 * np.eye(3))
1763+
monkeypatch.setattr(
1764+
ax, "get_custom_axes", lambda a, b_list, c, dimensions: 2 * np.eye(3)
1765+
)
17601766
monkeypatch.setattr(
17611767
ax,
17621768
"get_custom_residue_moment_of_inertia",
@@ -1805,7 +1811,9 @@ def _select_atoms(q):
18051811
u.atoms.select_atoms.side_effect = _select_atoms
18061812
residue.select_atoms.side_effect = _select_atoms
18071813
residue.atoms.select_atoms.side_effect = _select_atoms
1808-
monkeypatch.setattr(ax, "get_custom_axes", lambda a, b, c: 2 * np.eye(3))
1814+
monkeypatch.setattr(
1815+
ax, "get_custom_axes", lambda a, b_list, c, dimensions: 2 * np.eye(3)
1816+
)
18091817
monkeypatch.setattr(
18101818
ax,
18111819
"get_custom_residue_moment_of_inertia",
@@ -1936,7 +1944,9 @@ def _select_atoms(q):
19361944

19371945
residue.atoms.select_atoms.side_effect = _select_atoms
19381946
residue.atoms.principal_axes.return_value = np.eye(3)
1939-
centre, axes = ax.get_terminal_axes(residue, heavy_atoms[0])
1947+
centre, axes = ax.get_terminal_axes(
1948+
residue, heavy_atoms[0], dimensions=np.array([1, 1, 1])
1949+
)
19401950
assert np.allclose(centre, [1, 0, 0])
19411951
assert np.allclose(axes, np.eye(3))
19421952

@@ -1959,8 +1969,12 @@ def _select_atoms(q):
19591969
return [heavy_atoms[1]]
19601970

19611971
residue.atoms.select_atoms.side_effect = _select_atoms
1962-
monkeypatch.setattr(ax, "get_custom_axes", lambda a, b, c: 2 * np.eye(3))
1963-
centre, axes = ax.get_terminal_axes(residue, heavy_atoms[0])
1972+
monkeypatch.setattr(
1973+
ax, "get_custom_axes", lambda a, b_list, c, dimensions: 2 * np.eye(3)
1974+
)
1975+
centre, axes = ax.get_terminal_axes(
1976+
residue, heavy_atoms[0], dimensions=np.array([1, 1, 1])
1977+
)
19641978
assert np.allclose(centre, [1, 0, 0])
19651979
assert np.allclose(axes, 2 * np.eye(3))
19661980

@@ -1989,7 +2003,9 @@ def _select_atoms(q):
19892003
ax, "get_residue_custom_axes", lambda edges, center: ([1, 0, 0], 3 * np.eye(3))
19902004
)
19912005

1992-
centre, axes = ax.get_terminal_axes(residue, heavy_atoms[0])
2006+
centre, axes = ax.get_terminal_axes(
2007+
residue, heavy_atoms[0], dimensions=np.array([1, 1, 1])
2008+
)
19932009

19942010
assert np.allclose(centre, [1, 0, 0])
19952011
assert np.allclose(axes, 3 * np.eye(3))
@@ -2006,8 +2022,12 @@ def test_get_non_terminal_axes_2points(monkeypatch):
20062022
],
20072023
)
20082024
monkeypatch.setattr(ax, "get_chain", lambda residue, first, last: [])
2009-
monkeypatch.setattr(ax, "get_custom_axes", lambda a, b, c: 2 * np.eye(3))
2010-
centre, axes = ax.get_non_terminal_axes(residue, heavy_atoms)
2025+
monkeypatch.setattr(
2026+
ax, "get_custom_axes", lambda a, b_list, c, dimensions: 2 * np.eye(3)
2027+
)
2028+
centre, axes = ax.get_non_terminal_axes(
2029+
residue=residue, edges=heavy_atoms, dimensions=np.array([1, 1, 1])
2030+
)
20112031
assert np.allclose(centre, [1, 1, 0])
20122032
assert np.allclose(axes, 2 * np.eye(3))
20132033

@@ -2036,7 +2056,9 @@ def test_get_non_terminal_axes_3points(monkeypatch):
20362056
monkeypatch.setattr(
20372057
ax, "get_residue_custom_axes", lambda edges, center: ([1, 0, 0], 3 * np.eye(3))
20382058
)
2039-
centre, axes = ax.get_non_terminal_axes(residue, edges)
2059+
centre, axes = ax.get_non_terminal_axes(
2060+
residue=residue, edges=edges, dimensions=np.array([1, 1, 1])
2061+
)
20402062

20412063
assert np.allclose(centre, [1, 0, 0])
20422064
assert np.allclose(axes, 3 * np.eye(3))

0 commit comments

Comments
 (0)