Skip to content

Commit e0e6a32

Browse files
authored
Merge pull request #820 from JuliaControl/warnings
fix import warnings
2 parents 817e9fd + e37c7ca commit e0e6a32

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/ControlSystems.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ using ControlSystemsBase: issiso, ninputs, noutputs, nstates, numeric_type
66

77

88
using LinearAlgebra
9-
using OrdinaryDiffEq
9+
import OrdinaryDiffEq
1010
import LinearAlgebra: BlasFloat
1111
import Hungarian # For pole assignment in rlocusplot
1212
import DiffEqCallbacks: SavingCallback, SavedValues
13-
using DelayDiffEq
13+
import DelayDiffEq
1414
using SparseArrays
1515
using StaticArrays
1616
using RecipesBase

src/simulators.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import OrdinaryDiffEq: ODESolution, ODEProblem
12
abstract type AbstractSimulator end
23

34
# ============================================================================================
@@ -52,4 +53,4 @@ Simulate the system represented by `s` from initial state `x0` over time span `t
5253
5354
See also `Simulator` `lsim`
5455
"""
55-
DiffEqBase.solve(s::AbstractSimulator, x0, tspan, solver=Tsit5(), args...; kwargs...) = solve(ODEProblem(s.f,x0,tspan), solver, args...; kwargs...)
56+
DiffEqBase.solve(s::AbstractSimulator, x0, tspan, solver=Tsit5(), args...; kwargs...) = DiffEqBase.solve(ODEProblem(s.f,x0,tspan), solver, args...; kwargs...)

src/timeresp.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
import OrdinaryDiffEq: ODEProblem, SavedValues, SavingCallback, Tsit5, DiffEqBase, solve, BS3
12
import ControlSystemsBase: lsim, step, impulse, HammersteinWienerSystem, DelayLtiSystem, PartitionedStateSpace, SimResult
3+
import DelayDiffEq: MethodOfSteps
24
# Function for DifferentialEquations lsim
35
"""
46
f_lsim(dx, x, p, t)
@@ -193,7 +195,7 @@ function _lsim(sys::DelayLtiSystem{T,S}, Base.@nospecialize(u!), t::AbstractArra
193195

194196
# The states are x(t), Y(t), D(t), where Y, D are integrals of y(t), d(t)
195197
u0 = [x0;zeros(T,ny);zeros(T,nd)]
196-
prob = DDEProblem{true}(dde_param, u0, h!,
198+
prob = DelayDiffEq.DDEProblem{true}(dde_param, u0, h!,
197199
(T(t[1]), T(t[end])),
198200
p,
199201
constant_lags=sort(Tau),# Not sure if sort needed

0 commit comments

Comments
 (0)