Skip to content

Commit 8f9f3c8

Browse files
authored
Merge pull request #164 from Nosferican/Allow-kwargs-through-fit
Allow kwargs through fit
2 parents d359762 + 0d0edd3 commit 8f9f3c8

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

src/PIRLS.jl

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,19 @@ GeneralizedLinearMixedModel(f::Formula, fr::AbstractDataFrame, d::Distribution;
4646
wt=[], offset=[], contrasts=Dict()) = GeneralizedLinearMixedModel(f, fr, d,
4747
GLM.canonicallink(d), wt=wt, offset=offset, contrasts=contrasts)
4848

49-
StatsBase.fit(::Type{GeneralizedLinearMixedModel}, f::Formula, fr::AbstractDataFrame,
50-
d::Distribution) = fit!(GeneralizedLinearMixedModel(f, fr, d, GLM.canonicallink(d)))
51-
52-
StatsBase.fit(::Type{GeneralizedLinearMixedModel}, f::Formula, fr::AbstractDataFrame,
53-
d::Distribution, l::Link) = fit!(GeneralizedLinearMixedModel(f, fr, d, l))
49+
StatsBase.fit(::Type{GeneralizedLinearMixedModel},
50+
f::Formula,
51+
fr::AbstractDataFrame,
52+
d::Distribution,
53+
l::Link = GLM.canonicallink(d);
54+
wt=[],
55+
offset=[],
56+
contrasts=Dict(),
57+
verbose=false,
58+
fast=false,
59+
nAGQ=1) =
60+
fit!(GeneralizedLinearMixedModel(f, fr, d, l, wt=wt, offset=offset, contrasts=contrasts),
61+
verbose=verbose, fast=fast, nAGQ=nAGQ)
5462

5563
"""
5664
deviance(m::GeneralizedLinearMixedModel{T}, nAGQ=1)::T where {T}

src/pls.jl

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,16 @@ function StatsBase.model_response(v::CategoricalVector, d::Bernoulli)
118118
nlevs < 2 ? zeros(v, partype(d)) : partype(d)[cv == levs[2] for cv in v]
119119
end
120120

121-
StatsBase.fit(::Type{LinearMixedModel}, f::Formula, fr::AbstractDataFrame) =
122-
fit!(LinearMixedModel(f, fr))
121+
StatsBase.fit(::Type{LinearMixedModel},
122+
f::Formula,
123+
fr::AbstractDataFrame;
124+
weights=[],
125+
contrasts=Dict(),
126+
verbose=false,
127+
REML=false) =
128+
fit!(LinearMixedModel(f, fr, weights=weights, contrasts=contrasts),
129+
verbose=verbose,
130+
REML=REML)
123131

124132
"""
125133
updateL!(m::LinearMixedModel)

0 commit comments

Comments
 (0)