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

Minor fixes #784

Merged
merged 2 commits into from
Feb 27, 2024
Merged

Minor fixes #784

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
40acfb9
fix namespace confusions in VSCode
schillic Feb 23, 2024
609949c
remove redundant redefinition of constants
schillic Feb 23, 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 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 = get(Φpow)
Φ_power_k = IntervalMatrices.get(Φpow)
Φc, Φs = _split(Φ_power_k)

Zₖ = _overapproximate_interval_linear_map(Φc, Φs, c0, G0)
Expand Down
5 changes: 0 additions & 5 deletions src/Algorithms/TMJets/TMJets20/TMJets20.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion src/Flowpipes/setops.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Hybrid/solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/Hybrid/transitions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading