Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
PharmCat committed Nov 4, 2021
1 parent af6a12b commit 1d32ba5
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ftdf3 = CSV.File(joinpath(dirname(pathof(Metida)),"..","test","csv","2f2r
)
Metida.fit!(lmm; solver = :nlopt, f_tol=1e-16, x_tol=1e-16,
)
@test Metida.m2logreml(lmm) 8.740095378772942 atol=1E-8
@test Metida.m2logreml(lmm) 8.740095378772942 atol=1E-6


lmm = Metida.LMM(@formula(response ~1 + factor*time), ftdf;
Expand All @@ -62,32 +62,32 @@ ftdf3 = CSV.File(joinpath(dirname(pathof(Metida)),"..","test","csv","2f2r
random = [Metida.VarEffect(Metida.@covstr(r1|subject), Metida.CS), Metida.VarEffect(Metida.@covstr(r2|subject), Metida.CS)],
)
Metida.fit!(lmm; solver = :nlopt, f_tol=1e-16, x_tol=1e-16)
@test Metida.m2logreml(lmm) 710.4250214813896 atol=1E-8
@test Metida.m2logreml(lmm) 710.4250214813896 atol=1E-6

lmm = Metida.LMM(@formula(response ~ 1 + factor), ftdf3; contrasts=Dict(:factor => DummyCoding(; base=1.0)),
random = Metida.VarEffect(Metida.@covstr(r1|subject), Metida.AR),
repeated = Metida.VarEffect(Metida.@covstr(p|subject), Metida.DIAG),
)
Metida.fit!(lmm; solver = :nlopt, f_tol=1e-10, x_tol=1e-10)
@test Metida.m2logreml(lmm) 698.8792511057682 atol=1E-8
@test Metida.m2logreml(lmm) 698.8792511057682 atol=1E-6

lmm = Metida.LMM(@formula(response ~ 1 + factor), ftdf3; contrasts=Dict(:factor => DummyCoding(; base=1.0)),
random = Metida.VarEffect(Metida.@covstr(p|r1&r2), Metida.ARMA),
)
Metida.fit!(lmm, solver = :nlopt)
@test Metida.m2logreml(lmm) 913.9176298311813 atol=1E-8
@test Metida.m2logreml(lmm) 913.9176298311813 atol=1E-6

lmm = Metida.LMM(@formula(response ~ 1 + factor), ftdf3;
random = Metida.VarEffect(Metida.@covstr(1 + r1 + r2|subject), Metida.TOEPHP(3); coding = Dict(:r1 => DummyCoding(), :r2 => DummyCoding())),
)
Metida.fit!(lmm, solver = :nlopt, f_tol=1e-16, x_tol=1e-16)
@test Metida.m2logreml(lmm) 705.9946274598822 atol=1E-8
@test Metida.m2logreml(lmm) 705.9946274598822 atol=1E-6


lmm = Metida.LMM(@formula(response ~ 1 + factor), ftdf3;
random = Metida.VarEffect(Metida.@covstr(r2|subject), Metida.DIAG),
repeated = Metida.VarEffect(Metida.@covstr(p|subject), Metida.TOEPP(3)),
)
Metida.fit!(lmm, solver = :nlopt, f_tol=1e-16, x_tol=1e-16)
@test Metida.m2logreml(lmm) 773.9575538254085 atol=1E-8
@test Metida.m2logreml(lmm) 773.9575538254085 atol=1E-6
end

2 comments on commit 1d32ba5

@PharmCat
Copy link
Owner

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/48138

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.4.0 -m "<description of version>" 1d32ba5b93fd88ff38f48cafda57cb9ac0f6a78e
git push origin v0.4.0

Please sign in to comment.