Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/test-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
arch:
- x64
include:
- version: '1.6' # test on oldest supported version
- version: '1.10' # test on oldest supported version
arch: x64
os: ubuntu-latest
env:
Expand Down
4 changes: 3 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ReachabilityBase = "379f33d0-9447-4353-bd03-d664070e549f"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
TaylorModels = "314ce334-5f6e-57ae-acf6-00b6e903104a"
TaylorSeries = "6aa5eb33-94cf-58f4-a9d0-e4b2c4fc25ea"

[compat]
CommonSolve = "0.2"
Expand All @@ -27,7 +28,8 @@ ReachabilityBase = "0.3"
Reexport = "0.2, 1"
Requires = "0.5, 1"
TaylorModels = "0.7 - 0.9"
julia = "1.6"
TaylorSeries = "0.21.10"
julia = "1.10"

[extensions]
OrdinaryDiffEqExt = "OrdinaryDiffEq"
Expand Down
2 changes: 1 addition & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ OrdinaryDiffEq = "6"
Plots = "1"
ReachabilityBase = "0.3"
TaylorIntegration = "=0.18.5"
TaylorSeries = "=0.21.9"
TaylorSeries = "0.21.10"
1 change: 1 addition & 0 deletions src/init.jl
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ using ReachabilityAnalysis: AbstractContinuousPost, AbstractLazyReachSet, # NOT
using ReachabilityBase.Require: require
using ReachabilityBase.Comparison: isapproxzero
using TaylorModels: TaylorModel1, TaylorModelN, fp_rpa
import TaylorSeries as TS

using Parameters: @with_kw

Expand Down
6 changes: 3 additions & 3 deletions src/setops.jl
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ function _reconstruct(method::TaylorModelReconstructor, P₀::LazySet, U₀::Laz
vTM = Vector{TaylorModel1{TaylorN{N},N}}(undef, n + m)

# construct state variables
orderT = get_order(first(S))
orderQ = get_order(X_Δt[1])
orderT = TS.get_order(first(S))
orderQ = TS.get_order(X_Δt[1])

zeroI = interval(zero(N), zero(N))
Δtn = zeroI
Expand Down Expand Up @@ -90,7 +90,7 @@ function _reconstruct(method::TaylorModelReconstructor, P₀::LazySet, U₀::Laz
# vTM[n+i] = Utm₀[i]
# end

x = set_variables("x"; numvars=n + m, order=orderQ)
x = TS.variables!("x"; numvars=n + m, order=orderQ)
xc = view(x, (n + 1):(n + m))
G = Z₀.generators
c = Z₀.center
Expand Down
60 changes: 30 additions & 30 deletions test/quality_assurance.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@ using ClosedLoopReachability, Test
import Aqua, ExplicitImports

@testset "ExplicitImports tests" begin
ignores = (:AbstractContinuousPost, :AbstractLazyReachSet,
:AbstractTaylorModelReachSet, :ForwardAlgorithm, :ReachSolution,
:TimeInterval, :_check_dim, :_default_cpost, :_get_tspan,
:numtype, :post, :solve, :symBox, :zeroBox)
@test isnothing(ExplicitImports.check_all_explicit_imports_are_public(ClosedLoopReachability;
ignore=ignores))
@test isnothing(ExplicitImports.check_all_explicit_imports_via_owners(ClosedLoopReachability))
ignores = (:inplace_field!, :outofplace_field)
@test isnothing(ExplicitImports.check_all_qualified_accesses_are_public(ClosedLoopReachability;
ignore=ignores))
@test isnothing(ExplicitImports.check_all_qualified_accesses_via_owners(ClosedLoopReachability))
ignores_all_explicit_imports_are_public = (:AbstractContinuousPost, :AbstractLazyReachSet,
:AbstractTaylorModelReachSet, :ForwardAlgorithm,
:ReachSolution, :TimeInterval, :_check_dim,
:_default_cpost, :_get_tspan, :numtype, :post,
:solve, :symBox, :zeroBox)
ignores_all_qualified_accesses_are_public = [:inplace_field!, :outofplace_field]
if v"1.10" <= VERSION < v"1.11" # v1.10 was more strict with this
push!(ignores_all_qualified_accesses_are_public, :get_extension)
end
ignores_all_qualified_accesses_are_public = Tuple(ignores_all_qualified_accesses_are_public)
# due to reexporting ControllerFormats.FileFormats, NeuralNetworkReachability.ForwardAlgorithms,
# and ReachabilityAnalysis
ignores = (:FileFormats, :ForwardAlgorithms, :ReachabilityAnalysis,
:forward, :(..), :AbstractContinuousPost,
:AbstractHyperrectangle, :Arrays, :BallInf,
:BlackBoxContinuousSystem, :Flowpipe, :IVP, :Interval,
:IntervalArithmetic, :IntervalBox, :LazySet, :LazySets,
:MathematicalSystems, :MixedFlowpipe, :ReachabilityBase,
:Taylor1, :TaylorModelReachSet, :TaylorN, :ZeroSet, :Zonotope,
:box_approximation, :cartesian_product, :center, :diam, :domain,
:evaluate, :get_order, :high, :initial_state, :interval,
:linear_map, :low, :mid, :ngens, :overapproximate, :polynomial,
:project, :radius_hyperrectangle, :rand, :remainder, :rsetrep,
:sample, :scale, :set, :set_variables, :size, :sup, :system,
:tend, :translate, :tstart, :(×), :shift, :vars)
@test isnothing(ExplicitImports.check_no_implicit_imports(ClosedLoopReachability;
ignore=ignores))
ignores = (:controller,)
@test isnothing(ExplicitImports.check_no_self_qualified_accesses(ClosedLoopReachability;
ignore=ignores))
@test isnothing(ExplicitImports.check_no_stale_explicit_imports(ClosedLoopReachability))
ignores_no_implicit_imports = (:FileFormats, :ForwardAlgorithms, :ReachabilityAnalysis,
:forward, :(..), :AbstractContinuousPost,
:AbstractHyperrectangle, :Arrays, :BallInf,
:BlackBoxContinuousSystem, :Flowpipe, :IVP, :Interval,
:IntervalArithmetic, :IntervalBox, :LazySet, :LazySets,
:MathematicalSystems, :MixedFlowpipe, :ReachabilityBase,
:Taylor1, :TaylorModelReachSet, :TaylorN, :TaylorSeries,
:ZeroSet, :Zonotope, :box_approximation, :cartesian_product,
:center, :diam, :domain, :evaluate, :order, :high,
:initial_state, :interval, :linear_map, :low, :mid, :ngens,
:overapproximate, :polynomial, :project, :radius_hyperrectangle,
:rand, :remainder, :rsetrep, :sample, :scale, :set, :variables!,
:size, :sup, :system, :tend, :translate, :tstart, :(×), :shift,
:vars)
ignores_no_self_qualified_accesses = (:controller,)
ExplicitImports.test_explicit_imports(ClosedLoopReachability;
all_explicit_imports_are_public=(ignore=ignores_all_explicit_imports_are_public,),
all_qualified_accesses_are_public=(ignore=ignores_all_qualified_accesses_are_public,),
no_implicit_imports=(ignore=ignores_no_implicit_imports,),
no_self_qualified_accesses=(ignore=ignores_no_self_qualified_accesses,))
end

@testset "Aqua tests" begin
Expand Down
Loading