diff --git a/src/Algorithms/A20/A20.jl b/src/Algorithms/A20/A20.jl index b58fc3c3b..26f3cad54 100644 --- a/src/Algorithms/A20/A20.jl +++ b/src/Algorithms/A20/A20.jl @@ -31,7 +31,7 @@ numtype(::A20{N}) where {N} = N function rsetrep(::A20{N}) where {N} VT = Vector{N} MT = Matrix{N} - return RT = ReachSet{N,Zonotope{N,VT,MT}} + return ReachSet{N,Zonotope{N,VT,MT}} end include("post.jl") diff --git a/src/Algorithms/ASB07/ASB07.jl b/src/Algorithms/ASB07/ASB07.jl index 531d2eb3f..0b8c9d5ce 100644 --- a/src/Algorithms/ASB07/ASB07.jl +++ b/src/Algorithms/ASB07/ASB07.jl @@ -78,15 +78,15 @@ end step_size(alg::ASB07) = alg.δ numtype(::ASB07{N}) where {N} = N -function rsetrep(alg::ASB07{N,AM,RM,Val{false}}) where {N,AM,RM} - return RT = ReachSet{N,Zonotope{N,Vector{N},Matrix{N}}} +function rsetrep(::ASB07{N,AM,RM,Val{false}}) where {N,AM,RM} + return ReachSet{N,Zonotope{N,Vector{N},Matrix{N}}} end -function rsetrep(alg::ASB07{N,AM,RM,S,R,Val{n},Val{p}}) where {N,AM,RM,S,R,n,p} +function rsetrep(::ASB07{N,AM,RM,S,R,Val{n},Val{p}}) where {N,AM,RM,S,R,n,p} VT = SVector{n,N} MT = SMatrix{n,p,N,n * p} ZT = Zonotope{N,VT,MT} - return RT = ReachSet{N,ZT} + return ReachSet{N,ZT} end include("post.jl") diff --git a/src/Algorithms/ASB07/reach_homog.jl b/src/Algorithms/ASB07/reach_homog.jl index 3ef1479e8..73fa2575f 100644 --- a/src/Algorithms/ASB07/reach_homog.jl +++ b/src/Algorithms/ASB07/reach_homog.jl @@ -7,7 +7,7 @@ function reach_homog_ASB07!(F::Vector{ReachSet{N,Zonotope{N,VN,MN}}}, NSTEPS::Integer, δ::N, max_order::Integer, - X::Universe, + ::Universe, recursive::Val{true}, reduction_method::AbstractReductionMethod, Δt0::TN) where {N,TN,VN,MN} @@ -42,7 +42,7 @@ function reach_homog_ASB07!(F::Vector{ReachSet{N,Zonotope{N,VN,MN}}}, NSTEPS::Integer, δ::N, max_order::Integer, - X::Universe, + ::Universe, recursive::Val{false}, reduction_method::AbstractReductionMethod, Δt0::TN) where {N,TN,VN,MN} diff --git a/src/Algorithms/ASB07/reach_inhomog.jl b/src/Algorithms/ASB07/reach_inhomog.jl index 25069bf46..46f47b432 100644 --- a/src/Algorithms/ASB07/reach_inhomog.jl +++ b/src/Algorithms/ASB07/reach_inhomog.jl @@ -5,7 +5,7 @@ function reach_inhomog_ASB07!(F::Vector{ReachSet{N,Zonotope{N,VN,MN}}}, NSTEPS::Integer, δ::N, max_order::Integer, - X::Universe, + ::Universe, U::Zonotope, recursive::Val{true}, reduction_method::AbstractReductionMethod, diff --git a/src/Algorithms/BFFPSV18/BFFPSV18.jl b/src/Algorithms/BFFPSV18/BFFPSV18.jl index e6ad2757b..90c802adb 100644 --- a/src/Algorithms/BFFPSV18/BFFPSV18.jl +++ b/src/Algorithms/BFFPSV18/BFFPSV18.jl @@ -117,8 +117,8 @@ function BFFPSV18(; δ::N, lazy_initial_set, lazy_input, sparse, view) end -_concretize_setrep(setrep::Type{Interval}, N) = Interval{N} -_concretize_setrep(setrep::Type{Hyperrectangle}, N) = Hyperrectangle{N,Vector{N},Vector{N}} +_concretize_setrep(::Type{Interval}, N) = Interval{N} +_concretize_setrep(::Type{Hyperrectangle}, N) = Hyperrectangle{N,Vector{N},Vector{N}} # blocks of size 1 function _parse_opts_1D(vars, dim::Integer, partition) diff --git a/src/Algorithms/BFFPSV18/reach_homog.jl b/src/Algorithms/BFFPSV18/reach_homog.jl index f38f38da2..cec44ac80 100644 --- a/src/Algorithms/BFFPSV18/reach_homog.jl +++ b/src/Algorithms/BFFPSV18/reach_homog.jl @@ -6,7 +6,7 @@ # Matrix operations: Dense # Invariant: No function reach_homog_BFFPSV18!(F, Xhat0::CartesianProductArray{N}, Φ::AbstractMatrix{NM}, NSTEPS, δ, - X::Universe, ST::Type{<:Interval{N}}, vars, block_indices, + ::Universe, ST::Type{<:Interval{N}}, vars, block_indices, row_blocks, column_blocks, Δt0, viewval::Val{true}) where {NM,N} @@ -45,7 +45,7 @@ end # Matrix operations: Dense # Invariant: No function reach_homog_BFFPSV18!(F, Xhat0::CartesianProductArray{N}, Φ::MT, NSTEPS, δ::N, - X::Universe, ST, vars, block_indices, + ::Universe, ST, vars, block_indices, row_blocks::AbstractVector{<:RBLKi}, column_blocks::AbstractVector{<:CBLKj}, Δt0, @@ -87,7 +87,7 @@ end # Matrix operations: Sparse # Invariant: No function reach_homog_BFFPSV18!(F, Xhat0::CartesianProductArray{N}, Φ::MT, NSTEPS, δ::N, - X::Universe, ST, vars, block_indices, + ::Universe, ST, vars, block_indices, row_blocks::AbstractVector{<:RBLKi}, column_blocks::AbstractVector{<:CBLKj}, Δt0, diff --git a/src/Algorithms/BFFPSV18/reach_inhomog.jl b/src/Algorithms/BFFPSV18/reach_inhomog.jl index feeff1b8a..5dd3fcb06 100644 --- a/src/Algorithms/BFFPSV18/reach_inhomog.jl +++ b/src/Algorithms/BFFPSV18/reach_inhomog.jl @@ -6,7 +6,7 @@ # Matrix operations: Dense # Invariant: No function reach_inhomog_BFFPSV18!(F, Xhat0::CartesianProductArray{N}, Φ::MT, NSTEPS, δ, - X::Universe, U, ST::Type{<:Interval{N}}, vars, block_indices, + ::Universe, U, ST::Type{<:Interval{N}}, vars, block_indices, row_blocks::AbstractVector{<:RBLKi}, column_blocks::AbstractVector{<:CBLKj}, Δt0, @@ -60,7 +60,7 @@ end # Matrix operations: Dense # Invariant: No function reach_inhomog_BFFPSV18!(F, Xhat0::CartesianProductArray{N}, Φ::MT, NSTEPS, δ, - X::Universe, U, ST, vars, block_indices, + ::Universe, U, ST, vars, block_indices, row_blocks::AbstractVector{<:RBLKi}, column_blocks::AbstractVector{<:CBLKj}, Δt0, @@ -114,7 +114,7 @@ end # Matrix operations: Sparse # Invariant: No function reach_inhomog_BFFPSV18!(F, Xhat0::CartesianProductArray{N}, Φ::MT, NSTEPS, δ::N, - X::Universe, U, ST, vars, block_indices, + ::Universe, U, ST, vars, block_indices, row_blocks::AbstractVector{<:RBLKi}, column_blocks::AbstractVector{<:CBLKj}, Δt0, @@ -168,7 +168,7 @@ function reach_inhomog_BFFPSV18!(F, Xhat0::CartesianProductArray{N}, Φ::MT, NST end function reach_inhomog_BFFPSV18!(F, Xhat0::CartesianProductArray{N}, Φ::MT, NSTEPS, δ::N, - X::Universe, U, ST, vars, block_indices, + ::Universe, U, ST, vars, block_indices, row_blocks::AbstractVector{<:RBLKi}, column_blocks::AbstractVector{<:CBLKj}, Δt0, diff --git a/src/Algorithms/BOX/BOX.jl b/src/Algorithms/BOX/BOX.jl index 98e15fb6d..b8528b6b1 100644 --- a/src/Algorithms/BOX/BOX.jl +++ b/src/Algorithms/BOX/BOX.jl @@ -70,17 +70,17 @@ numtype(::BOX{N}) where {N} = N function setrep(::BOX{N,AM,Val{false},D,R}) where {N,AM,D,R} VT = Vector{N} - return ST = Hyperrectangle{N,VT,VT} + return Hyperrectangle{N,VT,VT} end function rsetrep(::BOX{N,AM,Val{true},Val{n},R}) where {N,AM,n,R} VT = SVector{n,N} - return ST = Hyperrectangle{N,VT,VT} + return Hyperrectangle{N,VT,VT} end function rsetrep(alg::BOX{N}) where {N} ST = setrep(alg) - return RT = ReachSet{N,ST} + return ReachSet{N,ST} end include("post.jl") diff --git a/src/Algorithms/BOX/reach_homog.jl b/src/Algorithms/BOX/reach_homog.jl index c33ffd5ed..db07f4896 100644 --- a/src/Algorithms/BOX/reach_homog.jl +++ b/src/Algorithms/BOX/reach_homog.jl @@ -8,7 +8,7 @@ function reach_homog_BOX!(F::Vector{ReachSet{N,Hyperrectangle{N,VNC,VNR}}}, Φ::AbstractMatrix, NSTEPS::Integer, δ::N, - X::Universe, + ::Universe, recursive::Val{false}, Δt0::TN) where {N,TN,VNC,VNR} @@ -55,7 +55,7 @@ function reach_homog_BOX!(F::Vector{ReachSet{N,Hyperrectangle{N,VNC,VNR}}}, Φ::AbstractMatrix, NSTEPS::Integer, δ::Float64, - X::Universe, + ::Universe, recursive::Val{true}, Δt0::TN) where {N,TN,VNC,VNR} diff --git a/src/Algorithms/BOX/reach_inhomog.jl b/src/Algorithms/BOX/reach_inhomog.jl index ad7d03ad1..7284fe3df 100644 --- a/src/Algorithms/BOX/reach_inhomog.jl +++ b/src/Algorithms/BOX/reach_inhomog.jl @@ -10,7 +10,7 @@ function reach_inhomog_BOX!(F::Vector{ReachSet{N,Hyperrectangle{N,VNC,VNR}}}, Φ::AbstractMatrix, NSTEPS::Integer, δ::N, - X::Universe, + ::Universe, U::Hyperrectangle, recursive::Val{false}, Δt0::TN) where {N,TN,VNC,VNR} diff --git a/src/Algorithms/CARLIN/post.jl b/src/Algorithms/CARLIN/post.jl index b5d6c9fb1..94b9c8e65 100644 --- a/src/Algorithms/CARLIN/post.jl +++ b/src/Algorithms/CARLIN/post.jl @@ -15,7 +15,7 @@ end # TODO check if it can be removed function _project(sol, vars) - return πsol_1n = Flowpipe([ReachSet(set(project(R, vars)), tspan(R)) for R in sol]) + return Flowpipe([ReachSet(set(project(R, vars)), tspan(R)) for R in sol]) end struct CanonicalQuadraticForm{T,MT<:AbstractMatrix{T}} <: AbstractContinuousSystem diff --git a/src/Algorithms/GLGM06/GLGM06.jl b/src/Algorithms/GLGM06/GLGM06.jl index e8539ab23..c0b87254b 100644 --- a/src/Algorithms/GLGM06/GLGM06.jl +++ b/src/Algorithms/GLGM06/GLGM06.jl @@ -98,27 +98,27 @@ end step_size(alg::GLGM06) = alg.δ numtype(::GLGM06{N}) where {N} = N -@inline function setrep(alg::GLGM06{N,AM,Val{false}}) where {N,AM} - return ST = Zonotope{N,Vector{N},Matrix{N}} +@inline function setrep(::GLGM06{N,AM,Val{false}}) where {N,AM} + return Zonotope{N,Vector{N},Matrix{N}} end @inline function rsetrep(alg::GLGM06{N,AM,Val{false}}) where {N,AM} ST = setrep(alg) - return RT = ReachSet{N,ST} + return ReachSet{N,ST} end -@inline function setrep(alg::GLGM06{N,AM,Val{true},Val{n},Val{p}}) where {N,AM,n,p} +@inline function setrep(::GLGM06{N,AM,Val{true},Val{n},Val{p}}) where {N,AM,n,p} VT = SVector{n,N} MT = SMatrix{n,p,N,n * p} - return ZT = Zonotope{N,VT,MT} + return Zonotope{N,VT,MT} end @inline function rsetrep(alg::GLGM06{N,AM,Val{true},Val{n},Val{p}}) where {N,AM,n,p} ZT = setrep(alg) - return RT = ReachSet{N,ZT} + return ReachSet{N,ZT} end -@inline function rsetrep(alg::GLGM06{N,AM,Val{true},Missing,Missing}) where {N,AM} +@inline function rsetrep(::GLGM06{N,AM,Val{true},Missing,Missing}) where {N,AM} throw(ArgumentError("the reach-set representation for a statically sized zonotope " * "that the system's dimension argument has been defined; add `dim=...`" * "to the algorithm constructor")) diff --git a/src/Algorithms/GLGM06/reach_homog.jl b/src/Algorithms/GLGM06/reach_homog.jl index 9fdf7fb2d..ff9124bf8 100644 --- a/src/Algorithms/GLGM06/reach_homog.jl +++ b/src/Algorithms/GLGM06/reach_homog.jl @@ -10,7 +10,7 @@ function reach_homog_GLGM06!(F::Vector{ReachSet{N,Zonotope{N,VN,MN}}}, Φ::AbstractMatrix, NSTEPS::Integer, δ::Float64, - X::Universe, + ::Universe, preallocate::Val{false}, Δt0::TimeInterval, disjointness_method::AbstractDisjointnessMethod) where {N,VN,MN} @@ -35,7 +35,7 @@ function reach_homog_GLGM06!(F::Vector{ReachSet{N,Zonotope{N,Vector{N},Matrix{N} Φ::AbstractMatrix, NSTEPS::Integer, δ::Float64, - X::Universe, + ::Universe, preallocate::Val{true}, Δt0::TimeInterval, disjointness_method::AbstractDisjointnessMethod) where {N} diff --git a/src/Algorithms/GLGM06/reach_inhomog.jl b/src/Algorithms/GLGM06/reach_inhomog.jl index 03d9ecd4a..406d3fc27 100644 --- a/src/Algorithms/GLGM06/reach_inhomog.jl +++ b/src/Algorithms/GLGM06/reach_inhomog.jl @@ -9,7 +9,7 @@ function reach_inhomog_GLGM06!(F::Vector{ReachSet{N,Zonotope{N,VN,MN}}}, NSTEPS::Integer, δ::Float64, max_order::Integer, - X::Universe, + ::Universe, U::LazySet, reduction_method::AbstractReductionMethod, Δt0::TimeInterval, diff --git a/src/Algorithms/INT/reach_homog.jl b/src/Algorithms/INT/reach_homog.jl index d3811c44e..6ebe81af5 100644 --- a/src/Algorithms/INT/reach_homog.jl +++ b/src/Algorithms/INT/reach_homog.jl @@ -8,7 +8,7 @@ function reach_homog_INT!(F::Vector{ReachSet{N,Interval{N}}}, Φ::N, NSTEPS::Integer, δ::Float64, - X::Universe, + ::Universe, Δt0::TimeInterval) where {N} # initial reach set Δt = (zero(N) .. δ) + Δt0 diff --git a/src/Algorithms/INT/reach_inhomog.jl b/src/Algorithms/INT/reach_inhomog.jl index 6761dfb79..3e4450086 100644 --- a/src/Algorithms/INT/reach_inhomog.jl +++ b/src/Algorithms/INT/reach_inhomog.jl @@ -8,7 +8,7 @@ function reach_inhomog_INT!(F::Vector{ReachSet{N,Interval{N}}}, Φ::N, NSTEPS::Integer, δ::Float64, - X::Universe, + ::Universe, U::Interval, Δt0::TimeInterval) where {N} diff --git a/src/Algorithms/LGG09/LGG09.jl b/src/Algorithms/LGG09/LGG09.jl index 29024e620..1e23a8be2 100644 --- a/src/Algorithms/LGG09/LGG09.jl +++ b/src/Algorithms/LGG09/LGG09.jl @@ -132,7 +132,7 @@ step_size(alg::LGG09) = alg.δ numtype(::LGG09{N}) where {N} = N setrep(alg::LGG09) = setrep(alg.template) -function rsetrep(alg::LGG09{N,AM,VN,TN}) where {N,AM,VN,TN} +function rsetrep(::LGG09{N,AM,VN,TN}) where {N,AM,VN,TN} SN = SubArray{N,1,Matrix{N},Tuple{Base.Slice{Base.OneTo{Int}},Int},true} return TemplateReachSet{N,VN,TN,SN} end diff --git a/src/Algorithms/LGG09/reach_homog.jl b/src/Algorithms/LGG09/reach_homog.jl index 55685168f..eda97e5b5 100644 --- a/src/Algorithms/LGG09/reach_homog.jl +++ b/src/Algorithms/LGG09/reach_homog.jl @@ -9,7 +9,7 @@ function reach_homog_LGG09!(F::Vector{RT}, Φ::AbstractMatrix, NSTEPS::Integer, δ::N, - X::Universe, # no invariant + ::Universe, # no invariant Δt0::TimeInterval, cache, threaded) where {N,VN,TN,SN,RT<:TemplateReachSet{N,VN,TN,SN}} diff --git a/src/Algorithms/LGG09/reach_inhomog.jl b/src/Algorithms/LGG09/reach_inhomog.jl index 2b8c00ea9..9e9b08cbe 100644 --- a/src/Algorithms/LGG09/reach_inhomog.jl +++ b/src/Algorithms/LGG09/reach_inhomog.jl @@ -8,7 +8,7 @@ function reach_inhomog_LGG09!(F::Vector{RT}, Φ::AbstractMatrix{N}, NSTEPS::Integer, δ::N, - X::Universe, + ::Universe, U::LazySet, Δt0::TimeInterval, cache, diff --git a/src/Algorithms/ORBIT/post.jl b/src/Algorithms/ORBIT/post.jl index 1ba45063a..afa1d5c2b 100644 --- a/src/Algorithms/ORBIT/post.jl +++ b/src/Algorithms/ORBIT/post.jl @@ -104,7 +104,7 @@ end # Φ^2*Ω0 + Φ*V + V # .... # Φ^(NSTEPS)*Ω0 + Φ^(NSTEPS-1)*V + ... + Φ*V + V -function _orbit!(F, Φ::AbstractMatrix{N}, Ω0, V, NSTEPS, δ, X::Universe, Δt0) where {N} +function _orbit!(F, Φ::AbstractMatrix{N}, Ω0, V, NSTEPS, δ, ::Universe, Δt0) where {N} # preallocate output sequence n = size(Φ, 1) VT = vector_type(typeof(Φ)) diff --git a/src/Algorithms/TMJets/common.jl b/src/Algorithms/TMJets/common.jl index 07f0c9e5a..dda1853cf 100644 --- a/src/Algorithms/TMJets/common.jl +++ b/src/Algorithms/TMJets/common.jl @@ -28,7 +28,7 @@ function _initialize(X0::LazySet, orderQ, orderT) return _initialize(box_approximation(X0), orderQ, orderT) end -# taylor model representations +# Taylor model representations function _initialize(X0::TaylorModelReachSet, orderQ, orderT) return set(X0) end diff --git a/src/Algorithms/VREP/VREP.jl b/src/Algorithms/VREP/VREP.jl index e25f87d15..04df72816 100644 --- a/src/Algorithms/VREP/VREP.jl +++ b/src/Algorithms/VREP/VREP.jl @@ -23,11 +23,11 @@ end step_size(alg::VREP) = alg.δ numtype(::VREP{N}) where {N} = N -function setrep(alg::VREP{N,AM,Val{false},Missing}) where {N,AM} +function setrep(::VREP{N,AM,Val{false},Missing}) where {N,AM} return VPolytope{N,Vector{N}} end -function setrep(alg::VREP{N,AM,Val{false},D}) where {N,AM,D} +function setrep(::VREP{N,AM,Val{false},D}) where {N,AM,D} return VPolygon{N,Vector{N}} end @@ -35,17 +35,17 @@ function setrep(alg::VREP{N,AM,Val{true},Missing}) where {N,AM} return error("the set representation of this algorithm requires the dimension to be specified, but it is $(alg.dim)") end -function setrep(alg::VREP{N,AM,Val{true},Val{2}}) where {N,AM} +function setrep(::VREP{N,AM,Val{true},Val{2}}) where {N,AM} return VPolygon{N,SVector{2,N}} end -function setrep(alg::VREP{N,AM,Val{true},Val{n}}) where {N,AM,n} +function setrep(::VREP{N,AM,Val{true},Val{n}}) where {N,AM,n} return VPolytope{N,SVector{n,N}} end function rsetrep(alg::VREP{N}) where {N} ST = setrep(alg) - return RT = ReachSet{N,ST} + return ReachSet{N,ST} end include("post.jl") diff --git a/src/Algorithms/VREP/reach_homog.jl b/src/Algorithms/VREP/reach_homog.jl index 5854e107f..faccc88a0 100644 --- a/src/Algorithms/VREP/reach_homog.jl +++ b/src/Algorithms/VREP/reach_homog.jl @@ -7,7 +7,7 @@ function reach_homog_VREP!(F::Vector{ReachSet{N,VP}}, Φ::AbstractMatrix, NSTEPS::Integer, δ::Float64, - X::Universe, + ::Universe, Δt0::TimeInterval) where {N,VN,VP<:VPOLY{N,VN}} # initial reach set