Skip to content

Fix crash when the traveling-salesman local-search budget is exhausted #43

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

Open
grahamfindlay wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix crash when the traveling-salesman local-search budget is exhausted #43

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
95aa0d5
Don't track rastermap.egg-info/
grahamfindlay Jun 19, 2026
d73fd41
Fix crash when the traveling-salesman local-search budget is exhausted
grahamfindlay Jun 19, 2026
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jupyter/__pycache__/
.ipynb_checkpoints/
__pycache__/
dist/
suite2p.egg-info/
*.egg-info/
build/
suite2p/classifiers/classifier_user.npy
suite2p/ops/ops_user.npy
Expand Down
6 changes: 4 additions & 2 deletions rastermap/sort.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,17 @@ def traveling_salesman(cc, n_iter=400, locality=0.0, circular=False,

cc, inds, seg_len, start_pos, end_pos, flipped = tsp_fast(
cc, n_iter, n_nodes, n_skip, BBt.astype(np.float32), verbose)
iter_completed = np.nonzero(seg_len == -1)[0][0]
nz = np.nonzero(seg_len == -1)[0]
iter_completed = nz[0] if nz.size > 0 else n_iter
seg_len = seg_len[:iter_completed]
start_pos = start_pos[:iter_completed]
end_pos = end_pos[:iter_completed]
flipped = flipped[:iter_completed]
if n_skip > 1:
cc, inds2, seg_len2, start_pos2, end_pos2, flipped2 = tsp_fast(
cc, n_iter, n_nodes, 1, BBt.astype(np.float32), verbose)
iter_completed = np.nonzero(seg_len2 == -1)[0][0]
nz = np.nonzero(seg_len2 == -1)[0]
iter_completed = nz[0] if nz.size > 0 else n_iter
seg_len = np.append(seg_len, seg_len2[:iter_completed])
start_pos = np.append(start_pos, start_pos2[:iter_completed])
end_pos = np.append(end_pos, end_pos2[:iter_completed])
Expand Down