Skip to content

Commit

Permalink
Merge pull request #9 from yufongpeng/release-0.2.3
Browse files Browse the repository at this point in the history 
Release 0.2.3
  • Loading branch information
@yufongpeng
yufongpeng committed Dec 8, 2023
2 parents 7efec0a + 4354eee commit 476f9a2
Show file tree
Hide file tree
Showing 4 changed files with 172 additions and 136 deletions.
10 changes: 5 additions & 5 deletions Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "AnovaMixedModels"
uuid = "6832ca0c-c2dd-4d0c-851a-521ca5db42f5"
authors = ["Yu-Fong Peng <sciphypar@gmail.com>"]
version = "0.2.2"
version = "0.2.3"

[deps]
AnovaBase = "946dddda-6a23-4b48-8e70-8e60d9b8d680"
Expand All @@ -18,9 +18,9 @@ StatsModels = "3eaba693-59b7-5ba5-a881-562e759f1c8d"
[compat]
AnovaBase = "0.7"
Distributions = "0.23, 0.24, 0.25"
GLM = "1.8"
GLM = "1.9"
MixedModels = "4"
Reexport = "0.2, 1"
StatsBase = "0.33"
StatsModels = "0.6"
julia = "1.6, 1.7, 1.8"
StatsBase = "0.33, 0.34"
StatsModels = "0.7"
julia = "1.8, 1.9"
4 changes: 2 additions & 2 deletions src/AnovaMixedModels.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import StatsBase: fit!, fit
import MixedModels: FeMat, createAL, reweight!, getθ,
_iscomparable, _criterion,
deviance, dof, dof_residual, nobs
import StatsModels: RegressionModel, TableRegressionModel, vectorize, asgn
import StatsModels: RegressionModel, TableRegressionModel, vectorize, asgn, hasintercept
import AnovaBase: anova, nestedmodels, predictors, lrt_nested, _diff, subformula, dof_asgn,
dof, dof_residual, deviance, nobs, prednames, has_intercept, select_super_interaction,
dof, dof_residual, deviance, nobs, prednames, select_super_interaction,
AnovaTable, anovatable

export anova_lme, lme, glme
Expand Down
2 changes: 1 addition & 1 deletion src/fit.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function dof_residual_pred(model::LinearMixedModel)
isempty(randoms) && (return repeat([nobs(model) - length(fixs.terms)], length(fixs.terms)))
reterms = reverse(model.reterms) # Vector of ReMat
fixname = collect(model.feterm.cnames) # fixef name
n0 = has_intercept(fixs) ? (popfirst!(fixname); 1) : 0
n0 = hasintercept(fixs) ? (popfirst!(fixname); 1) : 0

# Determine affected fix effects for each random effects
affectfixname = Dict{String, Set{String}}()
Expand Down
Loading

2 comments on commit 476f9a2

@yufongpeng
Copy link
Owner Author

Choose a reason for hiding this comment

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

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Registration pull request created: JuliaRegistries/General/96767

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.2.3 -m "<description of version>" 476f9a259e5dfbd8964c7b2af184e7ba04464b9b
git push origin v0.2.3

Please sign in to comment.