Skip to content

Commit b4dd38e

Browse files
Minor changes to progress bar prefix (#575)
Co-authored-by: Alberto Mercurio <[email protected]>
1 parent bd9a9cf commit b4dd38e

File tree

9 files changed

+11
-10
lines changed

9 files changed

+11
-10
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
## [Unreleased](https://github.com/qutip/QuantumToolbox.jl/tree/main)
99

1010
- 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])
11-
- Use `ProgressMeter.jl` for progress bar rather than our in-house implementation. ([#569])
11+
- Use `ProgressMeter.jl` for progress bar rather than our in-house implementation. ([#569], [#575])
1212
- Simplify type structure for time evolution solutions. ([#572])
1313

1414
## [v0.37.0]
@@ -343,3 +343,4 @@ Release date: 2024-11-13
343343
[#565]: https://github.com/qutip/QuantumToolbox.jl/issues/565
344344
[#569]: https://github.com/qutip/QuantumToolbox.jl/issues/569
345345
[#572]: https://github.com/qutip/QuantumToolbox.jl/issues/572
346+
[#575]: https://github.com/qutip/QuantumToolbox.jl/issues/575

src/time_evolution/callback_helpers/callback_helpers.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ end
5757
function _generate_save_callback(e_ops, tlist, progress_bar, method)
5858
e_ops_data = e_ops isa Nothing ? nothing : _get_e_ops_data(e_ops, method)
5959

60-
progr_desc = _get_progress_desc(method)
6160
progr =
6261
getVal(progress_bar) ?
63-
Progress(length(tlist), showspeed = true, enabled = getVal(progress_bar), desc = progr_desc) : nothing
62+
Progress(length(tlist), showspeed = true, enabled = getVal(progress_bar), desc = _get_progress_desc(method)) :
63+
nothing
6464

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

src/time_evolution/callback_helpers/mesolve_callback_helpers.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ end
1414

1515
_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
1616

17-
_get_progress_desc(::Type{SaveFuncMESolve}) = "(mesolve) "
17+
_get_progress_desc(::Type{SaveFuncMESolve}) = "[mesolve] "
1818

1919
##
2020

src/time_evolution/callback_helpers/sesolve_callback_helpers.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ end
1414

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

17-
_get_progress_desc(::Type{SaveFuncSESolve}) = "(sesolve) "
17+
_get_progress_desc(::Type{SaveFuncSESolve}) = "[sesolve] "
1818

1919
##
2020

src/time_evolution/mcsolve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ function mcsolveEnsembleProblem(
243243
progress_bar,
244244
ntraj,
245245
_mcsolve_output_func;
246-
progr_desc = "(mcsolve) ",
246+
progr_desc = "[mcsolve] ",
247247
) : output_func
248248

249249
prob_mc = mcsolveProblem(

src/time_evolution/mesolve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ function mesolve_map(
373373
progress_bar,
374374
ntraj,
375375
_standard_output_func;
376-
progr_desc = "(mesolve_map) ",
376+
progr_desc = "[mesolve_map] ",
377377
) : output_func
378378
ens_prob = TimeEvolutionProblem(
379379
EnsembleProblem(prob.prob, prob_func = _prob_func, output_func = _output_func[1], safetycopy = false),

src/time_evolution/sesolve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ function sesolve_map(
282282
progress_bar,
283283
ntraj,
284284
_standard_output_func;
285-
progr_desc = "(sesolve_map) ",
285+
progr_desc = "[sesolve_map] ",
286286
) : output_func
287287
ens_prob = TimeEvolutionProblem(
288288
EnsembleProblem(prob.prob, prob_func = _prob_func, output_func = _output_func[1], safetycopy = false),

src/time_evolution/smesolve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function smesolveEnsembleProblem(
254254
progress_bar,
255255
ntraj,
256256
_standard_output_func;
257-
progr_desc = "(smesolve) ",
257+
progr_desc = "[smesolve] ",
258258
) : output_func
259259

260260
prob_sme = smesolveProblem(

src/time_evolution/ssesolve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ function ssesolveEnsembleProblem(
248248
progress_bar,
249249
ntraj,
250250
_standard_output_func;
251-
progr_desc = "(ssesolve) ",
251+
progr_desc = "[ssesolve] ",
252252
) : output_func
253253

254254
prob_sme = ssesolveProblem(

0 commit comments

Comments
 (0)