From 40acfb9654f0b9964dffd76868ab4612dc45929d Mon Sep 17 00:00:00 2001 From: schillic Date: Fri, 23 Feb 2024 09:52:56 +0100 Subject: [PATCH 1/2] fix namespace confusions in VSCode --- src/Algorithms/ASB07/reach_homog.jl | 2 +- src/Flowpipes/setops.jl | 2 +- src/Hybrid/solve.jl | 2 +- src/Hybrid/transitions.jl | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Algorithms/ASB07/reach_homog.jl b/src/Algorithms/ASB07/reach_homog.jl index 7b556338b0..3ef1479e88 100644 --- a/src/Algorithms/ASB07/reach_homog.jl +++ b/src/Algorithms/ASB07/reach_homog.jl @@ -57,7 +57,7 @@ function reach_homog_ASB07!(F::Vector{ReachSet{N,Zonotope{N,VN,MN}}}, k = 2 @inbounds while k <= NSTEPS - Φ_power_k = get(Φpow) + Φ_power_k = IntervalMatrices.get(Φpow) Φc, Φs = _split(Φ_power_k) Zₖ = _overapproximate_interval_linear_map(Φc, Φs, c0, G0) diff --git a/src/Flowpipes/setops.jl b/src/Flowpipes/setops.jl index e373c84236..a480b4c7a3 100644 --- a/src/Flowpipes/setops.jl +++ b/src/Flowpipes/setops.jl @@ -352,7 +352,7 @@ has_backend(alg::FallbackIntersection) = !isnothing(alg.backend) function _intersection(X::AbstractPolyhedron{N}, Y::AbstractPolyhedron{N}, alg::FallbackIntersection) where {N} if has_backend(alg) - return intersection(X, Y; backend=alg.backend) + return LazySets.intersection(X, Y; backend=alg.backend) else return intersection(X, Y) end diff --git a/src/Hybrid/solve.jl b/src/Hybrid/solve.jl index a4a90abc7f..6f7876ac57 100644 --- a/src/Hybrid/solve.jl +++ b/src/Hybrid/solve.jl @@ -442,7 +442,7 @@ or the guard of any outgoing transition. A dictionary mapping (`::Dict{Int,Vector{Int}}`) the index of each location ``ℓ`` to the dimension indices that are constrained in ``ℓ``. """ -function constrained_dimensions(HS::HybridSystem) +function constrained_dimensions(HS::HybridSystems.HybridSystem) result = Dict{Int,Vector{Int}}() sizehint!(result, nstates(HS)) for mode in states(HS) diff --git a/src/Hybrid/transitions.jl b/src/Hybrid/transitions.jl index 0544c41484..db510c9136 100644 --- a/src/Hybrid/transitions.jl +++ b/src/Hybrid/transitions.jl @@ -41,8 +41,8 @@ function DiscreteTransition(; guard::GT, source_invariant::IT⁻, return DiscreteTransition(IdentityMap(n), ZeroSet(n), guard, source_invariant, target_invariant) end -# constructor from hybrid system given source and target modes id's and the transition t -function DiscreteTransition(H::HybridSystem, transition) +# constructor from hybrid system given the transition +function DiscreteTransition(H::HybridSystems.HybridSystem, transition) assignment = resetmap(H, transition) R = _state_matrix(assignment) W = _affine_term(assignment) From 609949c3f33ff94433372f86a1dee6729ce30f37 Mon Sep 17 00:00:00 2001 From: schillic Date: Fri, 23 Feb 2024 09:57:13 +0100 Subject: [PATCH 2/2] remove redundant redefinition of constants --- src/Algorithms/TMJets/TMJets20/TMJets20.jl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Algorithms/TMJets/TMJets20/TMJets20.jl b/src/Algorithms/TMJets/TMJets20/TMJets20.jl index a5d15a68e2..194d1443e4 100644 --- a/src/Algorithms/TMJets/TMJets20/TMJets20.jl +++ b/src/Algorithms/TMJets/TMJets20/TMJets20.jl @@ -39,11 +39,6 @@ and `TaylorSeries.jl` is used to work with truncated Taylor series. disjointness::DM = ZonotopeEnclosure() end -const DEFAULT_MAX_STEPS_TMJETS = 2000 -const DEFAULT_ABS_TOL_TMJETS = 1e-10 -const DEFAULT_ORDER_T_TMJETS = 8 -const DEFAULT_ORDER_Q_TMJETS = 2 - numtype(::TMJets20{N}) where {N} = N rsetrep(::TMJets20{N}) where {N} = TaylorModelReachSet{N}