Skip to content

Commit 613f0d0

Browse files
authored
Merge pull request #940 from JuliaControl/DECv4
bump compat DiffEqCallbacks
2 parents 0334073 + 1612043 commit 613f0d0

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Project.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name = "ControlSystems"
22
uuid = "a6e380b2-a6ca-5380-bf3e-84a91bcd477e"
33
authors = ["Dept. Automatic Control, Lund University"]
44
repo = "https://github.com/JuliaControl/ControlSystems.jl.git"
5-
version = "1.10.4"
5+
version = "1.10.5"
66

77
[deps]
88
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
@@ -23,7 +23,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
2323
Aqua = "0.5"
2424
ControlSystemsBase = "1.3"
2525
DelayDiffEq = "5.31"
26-
DiffEqCallbacks = "2.16, 3"
26+
DiffEqCallbacks = "2.16, 3, 4"
2727
ForwardDiff = "0.10"
2828
Hungarian = "0.6, 0.7"
2929
OrdinaryDiffEq = "6.60"

lib/ControlSystemsBase/src/matrix_comps.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ For more advanced model reduction, see [RobustAndOptimalControl.jl - Model Reduc
628628
# Extended help
629629
$(_scaling_notice)
630630
"""
631-
function baltrunc(sys::ST; atol = sqrt(eps()), rtol = 1e-3, n = nothing, residual=false) where ST <: AbstractStateSpace
631+
function baltrunc(sys::ST; atol = sqrt(eps(numeric_type(sys))), rtol = 1e-3, n = nothing, residual=false) where ST <: AbstractStateSpace
632632
sysbal, S, T = balreal(sys)
633633
if n === nothing
634634
S = S[S .>= atol]

lib/ControlSystemsBase/test/test_implicit_diff.jl

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ using ImplicitDifferentiation
33
using ForwardDiff
44
using FiniteDifferences
55
using ComponentArrays
6+
using Test, LinearAlgebra
67
fdgrad(f, x) = FiniteDifferences.grad(central_fdm(3, 1), f, x) |> first
78

89
P = ssrand(1, 1, 2)

0 commit comments

Comments
 (0)