Merge pull request #695 from JuliaReach/schillic/690

Generalize or concretize ReachSet container types
JuliaReach · Oct 13, 2019 · fe950d7 · fe950d7
2 parents 5bd9bc8 + d55a1d6
commit fe950d7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -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"

diff --git a/src/ReachSets/ContinuousPost/TMJets/TMJets.jl b/src/ReachSets/ContinuousPost/TMJets/TMJets.jl
@@ -2,6 +2,8 @@ export TMJets
 
 using IntervalArithmetic: IntervalBox
 
+using StaticArrays: SVector
+
 struct TMJets <: ContinuousPost
     options::TwoLayerOptions
 

diff --git a/src/ReachSets/ContinuousPost/TMJets/post.jl b/src/ReachSets/ContinuousPost/TMJets/post.jl
@@ -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]

diff --git a/src/ReachSets/project_reach.jl b/src/ReachSets/project_reach.jl
@@ -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)