Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased](https://github.com/qutip/QuantumToolbox.jl/tree/main)

- Introduce new methods of `sesolve_map` and `mesolve_map` for advanced usage. Users can now customize their own `iter`ator structure, `prob_func` and `output_func`. ([#565])
- Use `ProgressMeter.jl` for progress bar rather than our in-house implementation. ([#569])
- Use `ProgressMeter.jl` for progress bar rather than our in-house implementation. ([#569], [#575])
- Simplify type structure for time evolution solutions. ([#572])

## [v0.37.0]
Expand Down Expand Up @@ -343,3 +343,4 @@ Release date: 2024-11-13
[#565]: https://github.com/qutip/QuantumToolbox.jl/issues/565
[#569]: https://github.com/qutip/QuantumToolbox.jl/issues/569
[#572]: https://github.com/qutip/QuantumToolbox.jl/issues/572
[#575]: https://github.com/qutip/QuantumToolbox.jl/issues/575
4 changes: 2 additions & 2 deletions src/time_evolution/callback_helpers/callback_helpers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ end
function _generate_save_callback(e_ops, tlist, progress_bar, method)
e_ops_data = e_ops isa Nothing ? nothing : _get_e_ops_data(e_ops, method)

progr_desc = _get_progress_desc(method)
progr =
getVal(progress_bar) ?
Progress(length(tlist), showspeed = true, enabled = getVal(progress_bar), desc = progr_desc) : nothing
Progress(length(tlist), showspeed = true, enabled = getVal(progress_bar), desc = _get_progress_desc(method)) :
nothing

expvals = e_ops isa Nothing ? nothing : Array{ComplexF64}(undef, length(e_ops), length(tlist))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end

_get_e_ops_data(e_ops, ::Type{SaveFuncMESolve}) = [_generate_mesolve_e_op(op) for op in e_ops] # Broadcasting generates type instabilities on Julia v1.10

_get_progress_desc(::Type{SaveFuncMESolve}) = "(mesolve) "
_get_progress_desc(::Type{SaveFuncMESolve}) = "[mesolve] "

##

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end

_get_e_ops_data(e_ops, ::Type{SaveFuncSESolve}) = get_data.(e_ops)

_get_progress_desc(::Type{SaveFuncSESolve}) = "(sesolve) "
_get_progress_desc(::Type{SaveFuncSESolve}) = "[sesolve] "

##

Expand Down
2 changes: 1 addition & 1 deletion src/time_evolution/mcsolve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ function mcsolveEnsembleProblem(
progress_bar,
ntraj,
_mcsolve_output_func;
progr_desc = "(mcsolve) ",
progr_desc = "[mcsolve] ",
) : output_func

prob_mc = mcsolveProblem(
Expand Down
2 changes: 1 addition & 1 deletion src/time_evolution/mesolve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ function mesolve_map(
progress_bar,
ntraj,
_standard_output_func;
progr_desc = "(mesolve_map) ",
progr_desc = "[mesolve_map] ",
) : output_func
ens_prob = TimeEvolutionProblem(
EnsembleProblem(prob.prob, prob_func = _prob_func, output_func = _output_func[1], safetycopy = false),
Expand Down
2 changes: 1 addition & 1 deletion src/time_evolution/sesolve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ function sesolve_map(
progress_bar,
ntraj,
_standard_output_func;
progr_desc = "(sesolve_map) ",
progr_desc = "[sesolve_map] ",
) : output_func
ens_prob = TimeEvolutionProblem(
EnsembleProblem(prob.prob, prob_func = _prob_func, output_func = _output_func[1], safetycopy = false),
Expand Down
2 changes: 1 addition & 1 deletion src/time_evolution/smesolve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ function smesolveEnsembleProblem(
progress_bar,
ntraj,
_standard_output_func;
progr_desc = "(smesolve) ",
progr_desc = "[smesolve] ",
) : output_func

prob_sme = smesolveProblem(
Expand Down
2 changes: 1 addition & 1 deletion src/time_evolution/ssesolve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ function ssesolveEnsembleProblem(
progress_bar,
ntraj,
_standard_output_func;
progr_desc = "(ssesolve) ",
progr_desc = "[ssesolve] ",
) : output_func

prob_sme = ssesolveProblem(
Expand Down
Loading