Skip to content

Commit b5f6a02

Browse files
Merge pull request #71 from SciML/progress
Fix for progress bars update
2 parents 03ab5e4 + 711924e commit b5f6a02

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.github/workflows/CI.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
matrix:
1515
version:
1616
- '1'
17-
- '1.6'
1817
os:
1918
- ubuntu-latest
2019
arch:

Project.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,17 @@ DataStructures = "0.18"
2424
DelayDiffEq = "5.28.3"
2525
DiffEqBase = "6.122"
2626
DiffEqNoiseProcess = "5"
27+
LinearAlgebra = "1.9"
28+
Logging = "1.9"
29+
Random = "1.9"
2730
RandomNumbers = "1"
2831
RecursiveArrayTools = "1,2"
29-
Reexport = "0.2, 1.0"
30-
StaticArrays = "0.11, 0.12, 1.0"
32+
Reexport = "1.0"
33+
SparseArrays = "1.9"
34+
StaticArrays = "1.0"
3135
StochasticDiffEq = "6.19"
3236
UnPack = "0.1, 1.0"
33-
julia = "1.6"
37+
julia = "1.9"
3438

3539
[extras]
3640
DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"

src/solve.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ function DiffEqBase.__init(prob::AbstractSDDEProblem,# TODO DiffEqBasee.Abstract
5858
advance_to_tstop = false, stop_at_next_tstop = false,
5959
initialize_save = true,
6060
progress = false, progress_steps = 1000, progress_name = "SDDE",
61+
progress_id=gensym("StochasticDiffEq"),
6162
progress_message = DiffEqBase.ODE_DEFAULT_PROG_MESSAGE,
6263
userdata = nothing,
6364
initialize_integrator = true,
@@ -98,7 +99,8 @@ function DiffEqBase.__init(prob::AbstractSDDEProblem,# TODO DiffEqBasee.Abstract
9899
if haskey(kwargs, :minimal_solution)
99100
@warn "minimal_solution is ignored"
100101
end
101-
progress && @logmsg(-1, progress_name, _id=_id = :StochasticDiffEq, progress=0)
102+
103+
progress && @logmsg(LogLevel(-1),progress_name,_id=progress_id,progress=0)
102104

103105
tType = eltype(prob.tspan)
104106
noise = prob.noise
@@ -398,7 +400,7 @@ function DiffEqBase.__init(prob::AbstractSDDEProblem,# TODO DiffEqBasee.Abstract
398400
tstops, saveat, d_discontinuities,
399401
userdata,
400402
progress, progress_steps,
401-
progress_name, progress_message,
403+
progress_name, progress_message,progress_id,
402404
timeseries_errors, dense_errors,
403405
convert.(uBottomEltypeNoUnits, delta),
404406
dense, save_on, save_start, save_end, save_end_user,

0 commit comments

Comments
 (0)