Skip to content

Initial work on handling missing values #196

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 8 commits into from
Sep 25, 2019
Merged

Initial work on handling missing values #196

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c7af6d
initial work on na omit
palday Sep 24, 2019
fe5631a
simplify kludge for models witout fancy formulas
palday Sep 24, 2019
9af41ab
StatsModels.termvars for RandomEffectsTerm
palday Sep 24, 2019
794a9d4
use the schema'd form
palday Sep 24, 2019
7058399
initial testsuite for missing
palday Sep 25, 2019
2a202c9
missing_omit before apply_schema until StatsModels missing support lands
palday Sep 25, 2019
05bd39e
add in missing begin's
palday Sep 25, 2019
827c27a
test StatsModels.termvars(t::RandomEffectsTerm)
palday Sep 25, 2019
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
3 changes: 3 additions & 0 deletions src/linearmixedmodel.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ LinearMixedModel(f::FormulaTerm, tbl;
function LinearMixedModel(f::FormulaTerm, tbl::Tables.ColumnTable;
contrasts = Dict{Symbol,Any}(),
wts = [])

form = apply_schema(f, schema(f, tbl, contrasts), LinearMixedModel)
tbl, _ = StatsModels.missing_omit(tbl, form)

y, Xs = modelcols(form, tbl)

y = reshape(float(y), (:, 1)) # y as a floating-point matrix
Expand Down
4 changes: 4 additions & 0 deletions src/randomeffectsterm.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ end
Base.show(io::IO, t::RandomEffectsTerm) = print(io, "($(t.lhs) | $(t.rhs))")
StatsModels.is_matrix_term(::Type{RandomEffectsTerm}) = false

function StatsModels.termvars(t::RandomEffectsTerm)
vcat(StatsModels.termvars(t.lhs), StatsModels.termvars(t.rhs))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going to say you might want to use union (like StatsModels does) but there shouldn't be any duplication between the lhs and rhs so there's really no need.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, duplication on the lhs and rhs would be very bad.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

may be worth checking that in the constructor actually...

end

function StatsModels.apply_schema(t::FunctionTerm{typeof(|)}, schema::StatsModels.FullRank,
Mod::Type{<:MixedModel})
lhs, rhs = apply_schema.(t.args_parsed, Ref(schema), Mod)
Expand Down