Skip to content
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

Densities, random walks & travelling salesman #206

Merged
merged 21 commits into from
Dec 16, 2024
Merged

Densities, random walks & travelling salesman #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a26e6ca
Split trajectory.maths.py into a submodule
Daval-G Nov 1, 2024
0f12b7e
Add densities, random walk and travelling salesman trajectories
Daval-G Nov 1, 2024
e72f52e
fixup! Add densities, random walk and travelling salesman trajectories
Daval-G Nov 3, 2024
1665906
Add docstrings for random walk and TSP solver
Daval-G Nov 3, 2024
55b3ba4
fixup! Add densities, random walk and travelling salesman trajectories
Daval-G Nov 7, 2024
74b08f8
Add docstrings to TSP & sampling densities
Daval-G Nov 11, 2024
362ca9f
Add samplings to random walk initializations and fix boundaries
Daval-G Nov 23, 2024
fcf699b
Add utils to examples to show densities
Daval-G Nov 23, 2024
fdcda55
Add sampling density example skeleton
Daval-G Nov 24, 2024
3d2d043
Merge branch 'master' into chauffert_update
Daval-G Nov 24, 2024
2f631ca
Add descriptions to sampling density examples
Daval-G Nov 25, 2024
83b9081
Add dependency to pywavelet
Daval-G Nov 28, 2024
3fc0bba
Merge branch 'master' into chauffert_update
Daval-G Nov 28, 2024
82172be
Improve cutoff/decay density, fix dependencies
Daval-G Dec 2, 2024
34144b8
Gather extra dependencies, homogeneize extra imports
Daval-G Dec 10, 2024
e7589f2
Fix imports to pywavelets
Daval-G Dec 10, 2024
432df36
Fix black format in smaps
Daval-G Dec 10, 2024
4ff1bf0
Remove except duplicate in io/siemens
Daval-G Dec 10, 2024
cbb1f83
Merge branch 'master' into chauffert_update
chaithyagr Dec 11, 2024
e60da32
Update CI with new [extra] dependencies
Daval-G Dec 12, 2024
2f34957
[docs] Trigger documentation build
Daval-G Dec 16, 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 .github/workflows/test-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ jobs:
shell: bash
run: |
python -m pip install --upgrade pip
python -m pip install -e .[test,dev]
python -m pip install -e .[extra,test,dev]
python -m pip install finufft pooch brainweb-dl torch fastmri

- name: Install GPU related interfaces
Expand Down
44 changes: 22 additions & 22 deletions examples/example_2D_trajectories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# External
import matplotlib.pyplot as plt
import numpy as np
from utils import show_argument, show_trajectory
from utils import show_trajectories, show_trajectory

# Internal
import mrinufft as mn
Expand Down Expand Up @@ -75,7 +75,7 @@

arguments = [8, 16, 32, 64]
function = lambda x: mn.initialize_2D_radial(x, Ns, tilt=tilt, in_out=in_out)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand All @@ -89,7 +89,7 @@

arguments = [8, 16, 32, 64]
function = lambda x: mn.initialize_2D_radial(Nc, x, tilt=tilt, in_out=in_out)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand All @@ -105,7 +105,7 @@

arguments = ["uniform", "golden", "mri-golden", np.pi / 17]
function = lambda x: mn.initialize_2D_radial(Nc, Ns, tilt=x, in_out=in_out)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand All @@ -128,7 +128,7 @@

arguments = [True, False]
function = lambda x: mn.initialize_2D_radial(Nc, Ns, tilt=tilt, in_out=x)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand Down Expand Up @@ -170,7 +170,7 @@
function = lambda x: mn.initialize_2D_spiral(
Nc, Ns, tilt=tilt, nb_revolutions=x, in_out=in_out
)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand All @@ -194,7 +194,7 @@

arguments = ["galilean", "archimedes", "fermat", 1 / 4]
function = lambda x: mn.initialize_2D_spiral(Nc, Ns, tilt=tilt, spiral=x, in_out=in_out)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand All @@ -221,7 +221,7 @@
Ns,
patch_center=x,
)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand Down Expand Up @@ -267,7 +267,7 @@
Ns,
spiral_reduction=x,
)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand All @@ -293,7 +293,7 @@
Ns,
patch_center=x,
)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand Down Expand Up @@ -333,7 +333,7 @@
function = lambda x: mn.initialize_2D_cones(
Nc, Ns, tilt=tilt, in_out=in_out, nb_zigzags=x
)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand All @@ -348,7 +348,7 @@

arguments = [0.2, 1, 2, 3]
function = lambda x: mn.initialize_2D_cones(Nc, Ns, tilt=tilt, in_out=in_out, width=x)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand Down Expand Up @@ -413,7 +413,7 @@

arguments = [2, 3, 4, 6]
function = lambda x: mn.initialize_2D_propeller(Nc, Ns, nb_strips=x)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand Down Expand Up @@ -450,7 +450,7 @@

arguments = [Nc, int(2 * Nc / 3), int(Nc / 3)]
function = lambda x: mn.initialize_2D_rings(Nc=x, Ns=Ns, nb_rings=x)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)

# %%
#
Expand All @@ -461,7 +461,7 @@

arguments = [Nc, int(4 * Nc / 3), 2 * Nc]
function = lambda x: mn.initialize_2D_rings(Nc=x, Ns=Ns, nb_rings=Nc)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand Down Expand Up @@ -501,7 +501,7 @@

arguments = [0, 1, 5, 10]
function = lambda x: mn.initialize_2D_rosette(Nc, Ns, in_out=in_out, coprime_index=x)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand Down Expand Up @@ -541,7 +541,7 @@
function = lambda x: mn.initialize_2D_polar_lissajous(
Nc, Ns, in_out=in_out, coprime_index=x
)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand All @@ -564,7 +564,7 @@
function = lambda x: mn.initialize_2D_polar_lissajous(
Nc, Ns, in_out=in_out, nb_segments=x
)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand All @@ -588,7 +588,7 @@
function = lambda x: mn.initialize_2D_polar_lissajous(
Nc, Ns, in_out=io, coprime_index=cpi, nb_segments=x
)
show_argument(
show_trajectories(
function, arguments, one_shot=one_shot, subfig_size=subfigure_size
)

Expand Down Expand Up @@ -625,7 +625,7 @@

arguments = [1, 2.5, 5, 10]
function = lambda x: mn.initialize_2D_waves(Nc, Ns, nb_zigzags=x)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand All @@ -644,7 +644,7 @@

arguments = [0, 1, 1.5, 3]
function = lambda x: mn.initialize_2D_waves(Nc, Ns, width=x)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand Down Expand Up @@ -679,7 +679,7 @@

arguments = [1, 1.5, 2, 3]
function = lambda x: mn.initialize_2D_lissajous(Nc, Ns, density=x)
show_argument(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)
show_trajectories(function, arguments, one_shot=one_shot, subfig_size=subfigure_size)


# %%
Expand Down
Loading
Loading