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

#121 Fix Julia 0.7 support #404

Merged
merged 2 commits into from
Jul 25, 2018
Merged

#121 Fix Julia 0.7 support #404

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
c706ce3
fix depwarning: Void -> Nothing
schillic Jul 24, 2018
a65a090
fix depwarnings: Base functions -> LinearAlgebra functions
schillic Jul 24, 2018
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
4 changes: 2 additions & 2 deletions src/Approximations/decompositions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ end
[ε]::Real=Inf,
[blocks]::AbstractVector{Int}=default_block_structure(S, set_type),
[block_types]::Dict{Type{<:LazySet}, AbstractVector{<:AbstractVector{Int}}}(),
[directions]::Union{Type{<:AbstractDirections}, Void}=nothing
[directions]::Union{Type{<:AbstractDirections}, Nothing}=nothing
)::CartesianProductArray where {N<:Real}

Decompose a high-dimensional set into a Cartesian product of overapproximations
Expand Down Expand Up @@ -221,7 +221,7 @@ function decompose(S::LazySet{N};
ε::Real=Inf,
blocks::AbstractVector{Int}=default_block_structure(S, set_type),
block_types=Dict{Type{<:LazySet}, AbstractVector{<:AbstractVector{Int}}}(),
directions::Union{Type{<:AbstractDirections}, Void}=nothing
directions::Union{Type{<:AbstractDirections}, Nothing}=nothing
)::CartesianProductArray where {N<:Real}
n = dim(S)
result = Vector{LazySet{N}}()
Expand Down
2 changes: 1 addition & 1 deletion src/CartesianProduct.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Base:*, ×, ∈
import Base:*, ∈

export CartesianProduct,
CartesianProductArray,
Expand Down
2 changes: 1 addition & 1 deletion src/ExponentialMap.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ end
SparseMatrixExp(M::Matrix) =
error("only sparse matrices can be used to create a `SparseMatrixExp`")

Base.eye(spmexp::SparseMatrixExp) = SparseMatrixExp(spzeros(size(spmexp.M)...))
eye(spmexp::SparseMatrixExp) = SparseMatrixExp(spzeros(size(spmexp.M)...))

Base.IndexStyle(::Type{<:SparseMatrixExp}) = IndexCartesian()
Base.getindex(spmexp::SparseMatrixExp, I::Vararg{Int, 2}) = get_column(spmexp, I[2])[I[1]]
Expand Down
3 changes: 2 additions & 1 deletion src/compat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import Compat.String

if VERSION < v"0.7-"
import Base.LinAlg:norm, checksquare
import Base: eye, ×
else
using SparseArrays, LinearAlgebra
import LinearAlgebra:norm, checksquare
import LinearAlgebra:norm, checksquare, eye, ×
end

export _At_mul_B
Expand Down