Skip to content

Feature/merge trajectories #170

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 8 commits into from
Nov 15, 2024
Merged

Feature/merge trajectories #170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5f30e8f
move merge trajs to NT
andgoldschmidt Nov 14, 2024
c62c9db
move state_names to problem templates
andgoldschmidt Nov 14, 2024
d9c8296
fix verbose, test separation
andgoldschmidt Nov 14, 2024
f0933ef
merge trajs
andgoldschmidt Nov 14, 2024
1dff131
v0.3.4
andgoldschmidt Nov 14, 2024
749e3dd
add rolllout for multiple unitaries & systems
andgoldschmidt Nov 14, 2024
08cdd87
docs compat
andgoldschmidt Nov 15, 2024
d189c2f
adjust robust state test
andgoldschmidt Nov 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
Prev Previous commit
Next Next commit
merge trajs
  • Loading branch information
@andgoldschmidt
andgoldschmidt committed Nov 14, 2024
commit f0933ef97715604c7ed39f01330dcb0c94c72ad2
2 changes: 1 addition & 1 deletion src/problem_templates/quantum_state_sampling_problem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function QuantumStateSamplingProblem(
)
end

traj = NamedTrajectories.merge(
traj = merge(
trajs,
merge_names=(; a=1, da=1, dda=1, Δt=1),
free_time=piccolo_options.free_time
Expand Down
2 changes: 1 addition & 1 deletion src/problem_templates/unitary_direct_sum_problem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function UnitaryDirectSumProblem(
# Build the direct sum system

# merge suffix trajectories
traj = direct_sum([add_suffix(p.trajectory, ℓ) for (p, ℓ) ∈ zip(probs, prob_labels)])
traj = merge([add_suffix(p.trajectory, ℓ) for (p, ℓ) ∈ zip(probs, prob_labels)])

# add noise to control data (avoid restoration)
if drive_reset_ratio > 0
Expand Down
2 changes: 1 addition & 1 deletion src/problem_templates/unitary_sampling_problem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function UnitarySamplingProblem(
)
end

traj = NamedTrajectories.merge(
traj = merge(
trajs,
merge_names=(; a=1, da=1, dda=1, Δt=1),
free_time=piccolo_options.free_time
Expand Down
Loading