Merge pull request #7 from yufongpeng/release-0.2.1

Release 0.2.1
yufongpeng · Mar 17, 2023 · f44e7cb · f44e7cb · yufongpeng · Mar 17, 2023
2 parents 63c2161 + ad2404f
commit f44e7cb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "AnovaFixedEffectModels"
 uuid = "e4965305-65d6-464d-9c03-ae3e5cffadab"
 authors = ["yufongpeng <54415349+yufongpeng@users.noreply.github.com> and contributors"]
-version = "0.2.0"
+version = "0.2.1"
 
 [deps]
 AnovaBase = "946dddda-6a23-4b48-8e70-8e60d9b8d680"

diff --git a/src/anova.jl b/src/anova.jl
@@ -2,16 +2,19 @@
 # Main API
 """
     anova(<lfemodels>...; test::Type{<: GoodnessOfFit})
+    anova(<anovamodel>; test::Type{<: GoodnessOfFit})
     anova(test::Type{<: GoodnessOfFit}, <lfemodels>...;  <keyword arguments>)
+    anova(test::Type{<: GoodnessOfFit}, <anovamodel>;  <keyword arguments>)
 
 Analysis of variance.
 
 Return `AnovaResult{M, test, N}`. See [`AnovaResult`](@ref) for details.
 
 # Arguments
 * `lfemodels`: model objects
-    1. `FixedEffectModel` fitted by `AnovaFixedEffectModels.lfe` or `FixedEffectModels.reg`.
+    * `FixedEffectModel` fitted by `AnovaFixedEffectModels.lfe` or `FixedEffectModels.reg`.
     If mutiple models are provided, they should be nested and the last one is the most complex.
+* `anovamodel`: wrapped model objects; `FullModel` and `NestedModels`.
 * `test`: test statistics for goodness of fit. Only `FTest` is available now.
 
 # Other keyword arguments
@@ -30,6 +33,15 @@ anova(models::Vararg{M};
         kwargs...) where {M <: FixedEffectModel} = 
     anova(test, models...; kwargs...)
 
+anova(aovm::NestedModels{M}; 
+        test::Type{<: GoodnessOfFit} = FTest,
+        kwargs...) where {M <: FixedEffectModel} = 
+    anova(test, aovm; kwargs...)
+
+anova(aovm::FullModel{M}; 
+        test::Type{<: GoodnessOfFit} = FTest,
+        kwargs...) where {M <: FixedEffectModel} = 
+    anova(test, aovm; kwargs...)    
 # ================================================================================================
 # ANOVA by F test
 anova(::Type{FTest}, 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -48,11 +48,11 @@ isapprox(x::NTuple{N, Float64}, y::NTuple{N, Float64}, atol::NTuple{N, Float64}
             lm1 = lm(@formula(gpa ~ student & occasion + job), gpa)
             fem2 = lfe(@formula(gpa ~ fe(student) & occasion + 0 + job), gpa)
             lm2 = lm(@formula(gpa ~ student & occasion + 0 + job), gpa)
-            global aovf1 = AFE.anova(fem1)
+            global aovf1 = AFE.anova(FullModel(fem1, 1, true, true))
             global aovl1 = AnovaGLM.anova(lm1)
             global aovf2 = AFE.anova(fem2, type = 3)
             global aovl2 = AnovaGLM.anova(lm2, type = 3)
-            global aovfs = AFE.anova(fem0, fem1)
+            global aovfs = AFE.anova(NestedModels{FixedEffectModel}(fem0, fem1))
             global aovls = AnovaGLM.anova(lm0, lm1)
             @test !(@test_error test_show(aovf1))
             @test !(@test_error test_show(aovf2))