Skip to content

Commit

Permalink
Merge pull request #71 from SciML/progress
Browse files Browse the repository at this point in the history
Fix for progress bars update
  • Loading branch information
ChrisRackauckas authored Nov 8, 2023
2 parents 03ab5e4 + 711924e commit b5f6a02
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
1 change: 0 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
matrix:
version:
- '1'
- '1.6'
os:
- ubuntu-latest
arch:
Expand Down
10 changes: 7 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,17 @@ DataStructures = "0.18"
DelayDiffEq = "5.28.3"
DiffEqBase = "6.122"
DiffEqNoiseProcess = "5"
LinearAlgebra = "1.9"
Logging = "1.9"
Random = "1.9"
RandomNumbers = "1"
RecursiveArrayTools = "1,2"
Reexport = "0.2, 1.0"
StaticArrays = "0.11, 0.12, 1.0"
Reexport = "1.0"
SparseArrays = "1.9"
StaticArrays = "1.0"
StochasticDiffEq = "6.19"
UnPack = "0.1, 1.0"
julia = "1.6"
julia = "1.9"

[extras]
DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
Expand Down
6 changes: 4 additions & 2 deletions src/solve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ function DiffEqBase.__init(prob::AbstractSDDEProblem,# TODO DiffEqBasee.Abstract
advance_to_tstop = false, stop_at_next_tstop = false,
initialize_save = true,
progress = false, progress_steps = 1000, progress_name = "SDDE",
progress_id=gensym("StochasticDiffEq"),
progress_message = DiffEqBase.ODE_DEFAULT_PROG_MESSAGE,
userdata = nothing,
initialize_integrator = true,
Expand Down Expand Up @@ -98,7 +99,8 @@ function DiffEqBase.__init(prob::AbstractSDDEProblem,# TODO DiffEqBasee.Abstract
if haskey(kwargs, :minimal_solution)
@warn "minimal_solution is ignored"
end
progress && @logmsg(-1, progress_name, _id=_id = :StochasticDiffEq, progress=0)

progress && @logmsg(LogLevel(-1),progress_name,_id=progress_id,progress=0)

tType = eltype(prob.tspan)
noise = prob.noise
Expand Down Expand Up @@ -398,7 +400,7 @@ function DiffEqBase.__init(prob::AbstractSDDEProblem,# TODO DiffEqBasee.Abstract
tstops, saveat, d_discontinuities,
userdata,
progress, progress_steps,
progress_name, progress_message,
progress_name, progress_message,progress_id,
timeseries_errors, dense_errors,
convert.(uBottomEltypeNoUnits, delta),
dense, save_on, save_start, save_end, save_end_user,
Expand Down

0 comments on commit b5f6a02

Please sign in to comment.