Skip to content

Commit

Permalink
Merge pull request #940 from JuliaControl/DECv4
Browse files Browse the repository at this point in the history
bump compat DiffEqCallbacks
  • Loading branch information
baggepinnen authored Oct 24, 2024
2 parents 0334073 + 1612043 commit 613f0d0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name = "ControlSystems"
uuid = "a6e380b2-a6ca-5380-bf3e-84a91bcd477e"
authors = ["Dept. Automatic Control, Lund University"]
repo = "https://github.com/JuliaControl/ControlSystems.jl.git"
version = "1.10.4"
version = "1.10.5"

[deps]
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
Expand All @@ -23,7 +23,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Aqua = "0.5"
ControlSystemsBase = "1.3"
DelayDiffEq = "5.31"
DiffEqCallbacks = "2.16, 3"
DiffEqCallbacks = "2.16, 3, 4"
ForwardDiff = "0.10"
Hungarian = "0.6, 0.7"
OrdinaryDiffEq = "6.60"
Expand Down
2 changes: 1 addition & 1 deletion lib/ControlSystemsBase/src/matrix_comps.jl
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ For more advanced model reduction, see [RobustAndOptimalControl.jl - Model Reduc
# Extended help
$(_scaling_notice)
"""
function baltrunc(sys::ST; atol = sqrt(eps()), rtol = 1e-3, n = nothing, residual=false) where ST <: AbstractStateSpace
function baltrunc(sys::ST; atol = sqrt(eps(numeric_type(sys))), rtol = 1e-3, n = nothing, residual=false) where ST <: AbstractStateSpace
sysbal, S, T = balreal(sys)
if n === nothing
S = S[S .>= atol]
Expand Down
1 change: 1 addition & 0 deletions lib/ControlSystemsBase/test/test_implicit_diff.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ using ImplicitDifferentiation
using ForwardDiff
using FiniteDifferences
using ComponentArrays
using Test, LinearAlgebra
fdgrad(f, x) = FiniteDifferences.grad(central_fdm(3, 1), f, x) |> first

P = ssrand(1, 1, 2)
Expand Down

2 comments on commit 613f0d0

@baggepinnen
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/117954

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.10.5 -m "<description of version>" 613f0d051288efbb49f8d2fbb0f68a768777d5a9
git push origin v1.10.5

Please sign in to comment.