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

Do not pass redundant max_order to algorithm #847

Merged
merged 1 commit into from
Aug 27, 2024
Merged

Do not pass redundant max_order to algorithm #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/Algorithms/GLGM06/post.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ function post(alg::GLGM06{N}, ivp::IVP{<:AbstractContinuousSystem}, tspan;
end
=#

reach_homog_GLGM06!(F, Ω0, Φ, NSTEPS, δ, max_order, X, preallocate, Δt0,
disjointness_method)
reach_homog_GLGM06!(F, Ω0, Φ, NSTEPS, δ, X, preallocate, Δt0, disjointness_method)
else
# TODO: implement preallocate option for this scenario
U = inputset(ivp_discr)
Expand Down
8 changes: 0 additions & 8 deletions src/Algorithms/GLGM06/reach_homog.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@
# X is the universal set => it is ignored
# in this case order reduction only has to be applied to the
# initial set because the loop does not create new generators
# it is assumed that order(Ω0) <= max_order
function reach_homog_GLGM06!(F::Vector{ReachSet{N,Zonotope{N,VN,MN}}},
Ω0::Zonotope{N,VN,MN},
Φ::AbstractMatrix,
NSTEPS::Integer,
δ::Float64,
max_order::Integer,
X::Universe,
preallocate::Val{false},
Δt0::TimeInterval,
Expand All @@ -37,7 +35,6 @@ function reach_homog_GLGM06!(F::Vector{ReachSet{N,Zonotope{N,Vector{N},Matrix{N}
Φ::AbstractMatrix,
NSTEPS::Integer,
δ::Float64,
max_order::Integer,
X::Universe,
preallocate::Val{true},
Δt0::TimeInterval,
Expand Down Expand Up @@ -81,7 +78,6 @@ function reach_homog_GLGM06!(F::Vector{ReachSet{N,Zonotope{N,VN,MN}}},
Φ::AbstractMatrix,
NSTEPS::Integer,
δ::Float64,
max_order::Integer,
X::LazySet,
preallocate::Val{false},
Δt0::TimeInterval,
Expand Down Expand Up @@ -110,7 +106,6 @@ function reach_homog_GLGM06!(F::Vector{ReachSet{N,Zonotope{N,Vector{N},Matrix{N}
Φ::AbstractMatrix,
NSTEPS::Integer,
δ::Float64,
max_order::Integer,
X::LazySet,
preallocate::Val{true},
Δt0::TimeInterval,
Expand Down Expand Up @@ -153,13 +148,11 @@ end

#= O L D
# homogeneous case using StaticArrays
# it is assumed that the order of Ω0 is at most max_order
function reach_homog_GLGM06!(F::Vector{ReachSet{N, Zonotope{N, VN, MN}}},
Ω0::Zonotope{N, VN, MN},
Φ::SMatrix,
NSTEPS::Integer,
δ::Float64,
max_order::Integer,
X::Universe) where {N, VN<:SVector, MN<:SMatrix}

# initial reach set
Expand Down Expand Up @@ -198,7 +191,6 @@ function reach_homog_GLGM06!(F::Vector{ReachSet{N, Zonotope{N, VN, MN}}},
Φ::SMatrix,
NSTEPS::Integer,
δ::Float64,
max_order::Integer,
X::Universe) where {N, VN<:SVector, MN<:SMatrix}

# initial reach set
Expand Down