Skip to content

Commit

Permalink
Compat + Version bump (#53)
Browse files Browse the repository at this point in the history
* version + compat bumps

* maxlog for some things
  • Loading branch information
palday authored Jul 17, 2021
1 parent 68f8077 commit fbdb603
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.4'
# - '1.6'
- '1'
R:
- '4.0'
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "JellyMe4"
uuid = "19ac8677-9a15-4623-9afd-84acc6165ce7"
authors = ["Phillip Alday <[email protected]>"]
version = "0.2.4"
version = "0.2.5"

[deps]
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
Expand All @@ -25,7 +25,7 @@ RCall = "0.13"
StatsBase = "0.31, 0.32, 0.33"
StatsModels = "0.6.8"
Tables = "0.2, 1.0"
julia = "1.4"
julia = "1.6"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
6 changes: 3 additions & 3 deletions src/glmerMod.jl
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,9 @@ function sexp(::Type{RClass{:glmerMod}}, x::Tuple{GeneralizedLinearMixedModel{T}
@debug r
@warn """Some accuracy is lost in translation for GLMMs. This is fine with plotting, but proceed with caution for inferences.
You can try letting the model "reconverge" in lme4 with
update(model, control=glmerControl(optimizer="nloptwrap", calc.derivs=FALSE))."""
@info "lme4 handles deviance for GLMMs differently than MixedModels.jl"
@info "for the correct comparison, examine -2*logLik(RModel) and deviance(JuliaModel)"
update(model, control=glmerControl(optimizer="nloptwrap", calc.derivs=FALSE)).""" maxlog=1
@info "lme4 handles deviance for GLMMs differently than MixedModels.jl" maxlog=1
@info "for the correct comparison, examine -2*logLik(RModel) and deviance(JuliaModel)" maxlog=1
r = reval(r)
r = protect(sexp(r))
unprotect(1)
Expand Down
9 changes: 2 additions & 7 deletions src/utilities.jl
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ this of course has a side effect: it changes the R dataframe
function set_r_contrasts!(rdfname, formula)
fixefform = first(formula.rhs)

warned_on_contrasts = false

for tt in fixefform.terms
if typeof(tt) <: CategoricalTerm
R"""
Expand All @@ -73,11 +71,8 @@ function set_r_contrasts!(rdfname, formula)
# then this should be handled by the coding of the first-order terms
# if you are doing something that crazy, then you know enough linear algebra
# to copy and interpret the relevant matrices directly
if !warned_on_contrasts
@info "contrasts on interaction terms are assumed to decompose into products of contrasts on the first-order terms"
@info "(if you don't know what that means, you're probably fine)"
warned_on_contrasts = true
end
@info "contrasts on interaction terms are assumed to decompose into products of contrasts on the first-order terms" maxlog=1
@info "(if you don't know what that means, you're probably fine)" maxlog=1
end
end
rdfname
Expand Down

2 comments on commit fbdb603

@palday
Copy link
Owner Author

@palday palday commented on fbdb603 Jul 17, 2021

Choose a reason for hiding this comment

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

@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/41081

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.5 -m "<description of version>" fbdb603cb5359272ea9923a150a02e0a8df41eb6
git push origin v0.2.5

Please sign in to comment.