Skip to content

J-sync Bug #1117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 16, 2024
Merged

J-sync Bug #1117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3769855
Test that catches sign_times_v bug. Fix bug.
j-c-c May 15, 2024
5b5de73
Update docstring.
j-c-c May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/aspire/abinitio/commonline_c3_c4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ def _signs_times_v(self, vijs, vec):
# Update multiplication of signs times vec
new_vec[ij] += s_ij_jk * vec[jk] + s_ij_ik * vec[ik]
new_vec[jk] += s_ij_jk * vec[ij] + s_ik_jk * vec[ik]
new_vec[ik] += s_ij_jk * vec[ij] + s_ik_jk * vec[jk]
new_vec[ik] += s_ij_ik * vec[ij] + s_ik_jk * vec[jk]

return new_vec

Expand Down
32 changes: 22 additions & 10 deletions tests/test_orient_symmetric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,10 +435,19 @@ def test_commonlines(n_img, L, order, dtype):
assert within_1 > 0.90


@pytest.mark.parametrize("dtype", [np.float32, np.float64])
def test_global_J_sync(dtype):
L = 16
n_img = 20
@pytest.mark.parametrize(
"n_img, dtype",
[(3, np.float32), (3, np.float64), (20, np.float32), (20, np.float64)],
)
def test_global_J_sync(n_img, dtype):
"""
For this test we build a set of 3rd row outer products, vijs and viis, and
randomly J_conjugate them. We then test that J-synchronization is correct up
to conjugation of the entire set. To expose bugs in the implementation, we use
n_img = 3 as the smallest possible example to run the algorithm, which computes
relative handedness over all triplets of images (in this case 1 triplet).
"""
L = 16 # test not dependent on L
order = 3 # test not dependent on order
_, orient_est = source_orientation_objs(n_img, L, order, dtype)

Expand All @@ -447,8 +456,10 @@ def test_global_J_sync(dtype):

# J-conjugate some of these outer products (every other element).
vijs_conj, viis_conj = vijs.copy(), viis.copy()
vijs_conj[::2] = J_conjugate(vijs_conj[::2])
viis_conj[::2] = J_conjugate(viis_conj[::2])
inds_ij = np.random.choice(len(vijs), size=len(vijs) // 2, replace=False)
inds_ii = np.random.choice(len(viis), size=len(viis) // 2, replace=False)
vijs_conj[inds_ij] = J_conjugate(vijs[inds_ij])
viis_conj[inds_ii] = J_conjugate(viis[inds_ii])

# Synchronize vijs_conj and viis_conj.
# Note: `_global_J_sync()` does not depend on cyclic order, so we can use
Expand All @@ -457,12 +468,13 @@ def test_global_J_sync(dtype):

# Check that synchronized outer products equal original
# up to J-conjugation of the entire set.
if (vijs[0] == vijs_sync[0]).all():
assert np.allclose(vijs, vijs_sync)
assert np.allclose(viis, viis_sync)
else:
need_to_conj_vijs = not np.allclose(vijs_sync[inds_ij][0], vijs[inds_ij][0])
if need_to_conj_vijs:
assert np.allclose(vijs, J_conjugate(vijs_sync))
assert np.allclose(viis, J_conjugate(viis_sync))
else:
assert np.allclose(vijs, vijs_sync)
assert np.allclose(viis, viis_sync)


@pytest.mark.parametrize("dtype", [np.float32, np.float64])
Expand Down