Skip to content

Commit

Permalink
Merge pull request #785 from JuliaReach/schillic/aqua
Browse files Browse the repository at this point in the history
Run Aqua in tests and fix problems
  • Loading branch information
schillic authored Feb 27, 2024
2 parents 3b7abce + 3f8a1e0 commit 6fcdd49
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 9 deletions.
3 changes: 3 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,16 @@ HybridSystems = "0.4"
IntervalArithmetic = "0.16 - 0.20, =0.20.9" # new versions require updates and are incompatible with dependencies
IntervalMatrices = "0.6 - 0.10"
LazySets = "2.11"
LinearAlgebra = "<0.0.1, 1.6"
MathematicalSystems = "0.11 - 0.13"
Parameters = "0.10 - 0.12"
Random = "<0.0.1, 1.6"
ReachabilityBase = "0.1, 0.2"
RecipesBase = "0.6 - 0.8, 1"
RecursiveArrayTools = "2 - 3"
Reexport = "0.2, 1"
Requires = "0.5, 1"
SparseArrays = "<0.0.1, 1.6"
StaticArrays = "0.12, 1"
TaylorIntegration = "0.9 - 0.10, =0.10.0" # new versions require updates
TaylorModels = "0.6"
Expand Down
4 changes: 0 additions & 4 deletions src/Flowpipes/Flowpipe.jl
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,6 @@ Return the time-shifted flowpipe by the given number.
A new flowpipe such that the time-span of each constituent reach-set has been
shifted by `t0`.
### Notes
See also `Shift` for the lazy counterpart.
"""
function shift(fp::Flowpipe{N,<:AbstractReachSet}, t0::Number) where {N}
return Flowpipe([shift(X, t0) for X in array(fp)], fp.ext)
Expand Down
2 changes: 0 additions & 2 deletions src/Flowpipes/ShiftedFlowpipe.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ Type that lazily represents a flowpipe that has been shifted in time.
This type can wrap any concrete subtype of `AbstractFlowpipe`, and the extra
field `t0` is such that the time spans of each reach-set in `F` are shifted
by the amount `t0` (which should be a subtype of `Number`).
A convenience constructor alias `Shift` is given.
"""
struct ShiftedFlowpipe{FT<:AbstractFlowpipe,NT<:Number} <: AbstractFlowpipe
F::FT
Expand Down
3 changes: 0 additions & 3 deletions src/Initialization/exports.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export
MappedFlowpipe,
HybridFlowpipe,
MixedFlowpipe,
MixedHybridFlowpipe,

# Reach-sets
ReachSet,
Expand All @@ -45,7 +44,6 @@ export
tend,
tspan,
vars,
sup_func, # TODO keep?
setrep,
rsetrep,
reset_map,
Expand All @@ -66,7 +64,6 @@ export

# Lazy operations on flowpipes
Projection,
Shift,

# Hybrid types
HACLD1,
Expand Down
15 changes: 15 additions & 0 deletions test/Aqua.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using ReachabilityAnalysis, Test
import Aqua

@testset "Aqua tests" begin
# note that the check `persistent_tasks` may take several minutes
Aqua.test_all(ReachabilityAnalysis; ambiguities=false,
# the unbound args should be resolved in the future
unbound_args=(broken=true,),
# the piracies should be resolved in the future
piracies=(broken=true,))

# do not warn about ambiguities in dependencies
# the ambiguities should be resolved in the future
Aqua.test_ambiguities(ReachabilityAnalysis; broken=true)
end
2 changes: 2 additions & 0 deletions test/Project.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[deps]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
CDDLib = "3391f64e-dcde-5f30-b752-e11513730f60"
DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
DynamicPolynomials = "7c1d4256-1411-5781-91ec-d7bc3513ac07"
Expand All @@ -20,6 +21,7 @@ TaylorModels = "314ce334-5f6e-57ae-acf6-00b6e903104a"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
Aqua = "0.8"
CDDLib = "0.5 - 0.9"
DifferentialEquations = "6.17, 7"
DynamicPolynomials = "0.3 - 0.5"
Expand Down
2 changes: 2 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ TEST_ALGORITHMS = ["algorithms/INT.jl",
foreach(include, TEST_MODELS)
foreach(include, TEST_FILES)
foreach(include, TEST_ALGORITHMS)

include("Aqua.jl")

0 comments on commit 6fcdd49

Please sign in to comment.