Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump IntervalMatrices and Symbolics #870

Merged
merged 2 commits into from
Sep 10, 2024
Merged

Bump IntervalMatrices and Symbolics #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1f1aa7
use IntervalMatrices v0.11
schillic Sep 10, 2024
6183257
allow Symbolics v6 in tests and docs
schillic Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ CommonSolve = "0.2"
ExprTools = "0.1"
HybridSystems = "0.4"
IntervalArithmetic = "0.16 - 0.20, =0.20.9" # new versions require updates and are incompatible with dependencies
IntervalMatrices = "0.6 - 0.10"
IntervalMatrices = "0.11"
LazySets = "2.14"
LinearAlgebra = "<0.0.1, 1.6"
MathematicalSystems = "0.11 - 0.13"
Expand Down
2 changes: 1 addition & 1 deletion docs/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ MathematicalSystems = "0.11 - 0.13"
OrdinaryDiffEq = "6"
Plots = "1"
ReachabilityBase = "0.2.3 - 0.3"
Symbolics = "5"
Symbolics = "5 - 6"
2 changes: 1 addition & 1 deletion src/Algorithms/ASB07/reach_homog.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function reach_homog_ASB07!(F::Vector{ReachSet{N,Zonotope{N,VN,MN}}},

k = 2
@inbounds while k <= NSTEPS
Φ_power_k = IntervalMatrices.get(Φpow)
Φ_power_k = IntervalMatrices.matrix(Φpow)
Φc, Φs = _split(Φ_power_k)

Zₖ = _overapproximate_interval_linear_map(Φc, Φs, c0, G0)
Expand Down
1 change: 1 addition & 0 deletions src/Discretization/Overapproximate.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ module Overapproximate

using LazySets
using IntervalMatrices
using LazySets: matrix
using StaticArrays: SVector, SMatrix, MMatrix, StaticArray
import IntervalArithmetic as IA

Expand Down
2 changes: 1 addition & 1 deletion src/Initialization/init.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ using ExprTools: splitdef, combinedef
using LazySets: AffineMap, ResetMap

# required to avoid conflicts with IntervalMatrices
using LazySets: Interval, radius, sample, ∅, dim, scale, scale!, ⊂
using LazySets: Interval, radius, sample, ∅, dim, scale, scale!, ⊂, matrix

# JuliaReach internal functions
using ReachabilityBase.Arrays: projection_matrix, SingleEntryVector,
Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ OrdinaryDiffEq = "6"
Polyhedra = "0.5 - 0.7"
StaticArrays = "0.12, 1"
Suppressor = "0.2"
Symbolics = "4 - 5"
Symbolics = "4 - 6"
TaylorModels = "0.7"