Skip to content

Commit

Permalink
Fix some 0.7 depwarns
Browse files Browse the repository at this point in the history
  • Loading branch information
mkborregaard committed Aug 9, 2018
1 parent 7b947d8 commit 8bb36e4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/Sparse_matrixfunctions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function nzrows(b::SubArray{T,2,P,Tuple{Vector{Int64}, U}} where {T,P<:SparseMat
@inbounds for c in b.indexes[2]
active[findin2(inds,brows,b.parent.rowval[nzrange(b.parent,c)])] = true
end
return find(active)
return findall(active)
end

function nzrows(b::SubArray{T,2,P,Tuple{UnitRange{Int64}, U}} where {T,P<:SparseMatrixCSC, U<:Union{UnitRange{Int64}, Vector{Int}}}
Expand All @@ -104,5 +104,5 @@ function nzrows(b::SubArray{T,2,P,Tuple{UnitRange{Int64}, U}} where {T,P<:Sparse
end
end
end
return find(active)
return findall(active)
end
2 changes: 1 addition & 1 deletion src/Subsetting.jl
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ end
# TODO not sure this is necessary anymore - perhaps remove, or update with a string (for names)

asindices(x::AbstractArray{T}) where T <: Integer = x
asindices(x::AbstractArray{T}) where T <: Bool = find(x)
asindices(x::AbstractArray{T}) where T <: Bool = findall(x)
asindices(x, y) = asindices(x)
asindices(x::AbstractArray{T}, y::AbstractArray{T}) where T <: AbstractString = indexin(x, y)
# creating views
Expand Down

0 comments on commit 8bb36e4

Please sign in to comment.