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

Generalize or concretize ReachSet container types #695

Merged
merged 2 commits into from
Oct 13, 2019
Merged

Generalize or concretize ReachSet container types #695

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
7515913
generalize or concretize container types
schillic Oct 7, 2019
d55a1d6
use ReachSets of type SVector in TMJets
schillic Oct 13, 2019
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
1 change: 1 addition & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
TaylorIntegration = "92b13dbe-c966-51a2-8445-caca9f8a7d42"
TaylorModels = "314ce334-5f6e-57ae-acf6-00b6e903104a"
Expand Down
2 changes: 2 additions & 0 deletions src/ReachSets/ContinuousPost/TMJets/TMJets.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ export TMJets

using IntervalArithmetic: IntervalBox

using StaticArrays: SVector

struct TMJets <: ContinuousPost
options::TwoLayerOptions

Expand Down
3 changes: 2 additions & 1 deletion src/ReachSets/ContinuousPost/TMJets/post.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ function post(𝒜::TMJets,

# convert to hyperrectangle and wrap around the reach solution
N = length(xTM)
Rsets = Vector{ReachSet{Hyperrectangle{Float64}}}(undef, N-1)
SET_TYPE = Hyperrectangle{Float64, SVector{n, Float64}, SVector{n, Float64}}
Rsets = Vector{ReachSet{SET_TYPE}}(undef, N-1)
@inbounds for i in 1:N-1
Hi = convert(Hyperrectangle, xTM[i])
t0 = tTM[i]; t1 = tTM[i+1]
Expand Down
2 changes: 1 addition & 1 deletion src/ReachSets/project_reach.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function project_reach(
else
set_type = options[:set_type_proj]
oa = x -> overapproximate(x, set_type)
RsetsProj = Vector{ReachSet{set_type{N}}}(undef, length(Rsets))
RsetsProj = Vector{ReachSet{<:set_type{N}}}(undef, length(Rsets))
end

@inbounds for (i, rs) in enumerate(Rsets)
Expand Down