From f2cf214a56b9f0fc8d053814fc46877d338f4f51 Mon Sep 17 00:00:00 2001 From: mforets Date: Wed, 30 Jan 2019 14:59:31 -0300 Subject: [PATCH 1/2] refactor reach blocks --- .../ContinuousPost/{ => BFFPSV18}/BFFPSV18.jl | 0 .../BFFPSV18}/reach_blocks.jl | 0 .../BFFPSV18}/reach_blocks_wrapping_effect.jl | 0 src/ReachSets/ReachSets.jl | 19 +++++++++++-------- 4 files changed, 11 insertions(+), 8 deletions(-) rename src/ReachSets/ContinuousPost/{ => BFFPSV18}/BFFPSV18.jl (100%) rename src/ReachSets/{ => ContinuousPost/BFFPSV18}/reach_blocks.jl (100%) rename src/ReachSets/{ => ContinuousPost/BFFPSV18}/reach_blocks_wrapping_effect.jl (100%) diff --git a/src/ReachSets/ContinuousPost/BFFPSV18.jl b/src/ReachSets/ContinuousPost/BFFPSV18/BFFPSV18.jl similarity index 100% rename from src/ReachSets/ContinuousPost/BFFPSV18.jl rename to src/ReachSets/ContinuousPost/BFFPSV18/BFFPSV18.jl diff --git a/src/ReachSets/reach_blocks.jl b/src/ReachSets/ContinuousPost/BFFPSV18/reach_blocks.jl similarity index 100% rename from src/ReachSets/reach_blocks.jl rename to src/ReachSets/ContinuousPost/BFFPSV18/reach_blocks.jl diff --git a/src/ReachSets/reach_blocks_wrapping_effect.jl b/src/ReachSets/ContinuousPost/BFFPSV18/reach_blocks_wrapping_effect.jl similarity index 100% rename from src/ReachSets/reach_blocks_wrapping_effect.jl rename to src/ReachSets/ContinuousPost/BFFPSV18/reach_blocks_wrapping_effect.jl diff --git a/src/ReachSets/ReachSets.jl b/src/ReachSets/ReachSets.jl index 8dceae98..5e27254e 100644 --- a/src/ReachSets/ReachSets.jl +++ b/src/ReachSets/ReachSets.jl @@ -182,6 +182,15 @@ export PostOperator, post, tubeā‹‚inv! +# ========================== +# Continuous post operators +# ========================== +include("ContinuousPost/BFFPSV18/BFFPSV18.jl") +include("ContinuousPost/BFFPSV18/reach_blocks.jl") +include("ContinuousPost/BFFPSV18/reach_blocks_wrapping_effect.jl") + +include("DiscretePost/ConcreteDiscretePost.jl") + # ======================== # Reachability Algorithms # ======================== @@ -191,23 +200,17 @@ import Reachability.check_aliases_and_add_default_value! available_algorithms = Dict{String, Dict{String, Any}}() # "explicit" backends -include("reach_blocks.jl") +#include("reach_blocks.jl") push!(available_algorithms, "explicit_blocks"=>Dict("func"=>reach_blocks!, "is_explicit"=>true)) -include("reach_blocks_wrapping_effect.jl") +#include("reach_blocks_wrapping_effect.jl") push!(available_algorithms, "wrap"=>Dict("func"=>reach_blocks_wrapping_effect!, "is_explicit"=>true)) export available_algorithms -# ========================== -# Continuous post operators -# ========================== -include("ContinuousPost/BFFPSV18.jl") -include("DiscretePost/ConcreteDiscretePost.jl") - # ========================== # Discrete post operators # ========================== From f71b13a90d14ee8b63e07e3cfb1797fa7a37651b Mon Sep 17 00:00:00 2001 From: mforets Date: Wed, 30 Jan 2019 15:17:04 -0300 Subject: [PATCH 2/2] review ReachSets --- src/ReachSets/ReachSets.jl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/ReachSets/ReachSets.jl b/src/ReachSets/ReachSets.jl index 5e27254e..2070e1f9 100644 --- a/src/ReachSets/ReachSets.jl +++ b/src/ReachSets/ReachSets.jl @@ -189,8 +189,6 @@ include("ContinuousPost/BFFPSV18/BFFPSV18.jl") include("ContinuousPost/BFFPSV18/reach_blocks.jl") include("ContinuousPost/BFFPSV18/reach_blocks_wrapping_effect.jl") -include("DiscretePost/ConcreteDiscretePost.jl") - # ======================== # Reachability Algorithms # ======================== @@ -200,11 +198,9 @@ import Reachability.check_aliases_and_add_default_value! available_algorithms = Dict{String, Dict{String, Any}}() # "explicit" backends -#include("reach_blocks.jl") push!(available_algorithms, "explicit_blocks"=>Dict("func"=>reach_blocks!, "is_explicit"=>true)) -#include("reach_blocks_wrapping_effect.jl") push!(available_algorithms, "wrap"=>Dict("func"=>reach_blocks_wrapping_effect!, "is_explicit"=>true)) @@ -215,6 +211,7 @@ export available_algorithms # Discrete post operators # ========================== include("DiscretePost/LazyDiscretePost.jl") +include("DiscretePost/ConcreteDiscretePost.jl") # ========================= # External reach interface