Skip to content
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

fix degree for ConstantTerm/InterceptTerm #287

Merged
merged 5 commits into from
Apr 4, 2023
Merged

fix degree for ConstantTerm/InterceptTerm #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a71b64
add tests for currently expected behavior
kleinschmidt Apr 4, 2023
61178bb
the fix
kleinschmidt Apr 4, 2023
780f5d3
also test intercept terms too
kleinschmidt Apr 4, 2023
f5bfe7b
bump patch
kleinschmidt Apr 4, 2023
532272a
Merge remote-tracking branch 'origin/master' into dfk/sort-fix
kleinschmidt Apr 4, 2023
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "StatsModels"
uuid = "3eaba693-59b7-5ba5-a881-562e759f1c8d"
version = "0.7.0"
version = "0.7.1"

[deps]
DataAPI = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
Expand Down
2 changes: 2 additions & 0 deletions src/terms.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,8 @@ Base.:*(a::TermOrTerms, b::TermOrTerms) = a + b + a&b
cleanup(terms::TupleTerm) = Tuple(sort!(unique!(collect(terms)), by=degree))
cleanup(x) = x

degree(::ConstantTerm) = 0
degree(::InterceptTerm) = 0
degree(::AbstractTerm) = 1
degree(t::InteractionTerm) = mapreduce(degree, +, t.terms)
# dirty hack, move to MixedModels.jl
Expand Down
11 changes: 11 additions & 0 deletions test/terms.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,4 +274,15 @@ StatsModels.apply_schema(mt::MultiTerm, sch::StatsModels.Schema, Mod::Type) =
@test_throws ArgumentError concrete_term(term(:not_there), t )
end

@testset "sort by degree in ~" begin
one, a, b = term.([1, :a, :b])
for zero_deg in [one, InterceptTerm{true}(), InterceptTerm{false}()]
@test a + zero_deg == (a, zero_deg)
@test (a ~ a + zero_deg) == (a ~ zero_deg + a)

@test a & b + zero_deg + a == (a & b, zero_deg, a)
@test (a ~ a & b + zero_deg + a) == (a ~ zero_deg + a + a & b)
end
end

end