Skip to content

non-mutating munge_data #68

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

Merged
merged 6 commits into from
Jul 8, 2020
Merged

non-mutating munge_data #68

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf38a53
non-mutating munge_data
d-netto Jul 6, 2020
f289f8b
no dataframes
d-netto Jul 8, 2020
7d068e2
typo
d-netto Jul 8, 2020
c96e137
typo
d-netto Jul 8, 2020
c789787
other typo
d-netto Jul 8, 2020
9182d37
new check for missing
d-netto Jul 8, 2020
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
29 changes: 7 additions & 22 deletions src/interpolation_utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,36 +35,21 @@ end
function munge_data(u::AbstractVector, t::AbstractVector)
Tu = Base.nonmissingtype(eltype(u))
Tt = Base.nonmissingtype(eltype(t))
newu = Tu[]
newt = Tt[]
@assert length(t) == length(u)
@inbounds for i in eachindex(t)
ui = u[i]
ti = t[i]
if !ismissing(ui) && !ismissing(ti)
push!(newu, ui)
push!(newt, ti)
end
end
non_missing_indices = collect(i for i in 1:length(t) if !ismissing(u[i]) && !ismissing(t[i]))
newu = Tu.([u[i] for i in non_missing_indices])
newt = Tt.([t[i] for i in non_missing_indices])

return newu, newt
end

function munge_data(U::StridedMatrix, t::AbstractVector)
TU = Base.nonmissingtype(eltype(U))
Tt = Base.nonmissingtype(eltype(t))
newUs = AbstractVector{TU}[]
newt = Tt[]
@assert length(t) == size(U,2)
@inbounds for (j, tj) in enumerate(t)

vUj = view(U, :, j)
if ismissing(tj) || any(ismissing, vUj)
continue
end

push!(newt, tj)
push!(newUs, vUj)
end
non_missing_indices = collect(i for i in 1:length(t) if !any(ismissing,U[:,i]) && !ismissing(t[i]))
newUs = [TU.(U[:,i]) for i in non_missing_indices]
newt= Tt.([t[i] for i in non_missing_indices])

return hcat(newUs...), newt
end