Skip to content

Commit

Permalink
v0.7.1f
Browse files Browse the repository at this point in the history
  • Loading branch information
PharmCat committed Mar 21, 2021
1 parent 23a42e5 commit 12622a0
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CategoricalArrays = "0.8, 0.9"
Distributions = "0.20, 0.21, 0.22, 0.23, 0.24"
ForwardDiff = "0.10"
LineSearches = "7"
Optim = "0.19, 0.20, 0.21, 0.22, 1.0, 1.1, 1.2"
Optim = "1.0, 1.1, 1.2, 1.3"
StatsBase = "0.29, 0.30, 0.31, 0.32, 0.33"
StatsModels = "0.6"
Tables = "1"
Expand Down
2 changes: 2 additions & 0 deletions change.log
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ v0.7.1
* F value (test)
* C matrix - pinv to inv
* minor Show bugfix
* changes in tests - stable models used
* export StatsBase methods
* documentation

v0.7.0
Expand Down
5 changes: 5 additions & 0 deletions docs/src/bioequivalence.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@ fit!(lmm)
ci = confint(lmm)[end]
exp.(ci) .* 100.0
```

## Reference

* [Annex](https://www.ema.europa.eu/en/documents/other/31-annex-i-statistical-analysis-methods-compatible-ema-bioequivalence-guideline_en.pdf) I for EMA’s Guideline on the Investigation of Bioequivalence
* [FDA Guidance for Industry: Statistical Approaches to Establishing Bioequivalence](https://www.fda.gov/media/70958/download), APPENDIX F
4 changes: 2 additions & 2 deletions src/Metida.jl
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ fit!, LMM, VarEffect, theta, logreml, m2logreml, thetalength, dof_satter, dof_co
gmatrix, rmatrix, vmatrix!,
AbstractCovarianceType, AbstractCovmatMethod, MetidaModel

export coef, coefnames, confint, nobs, dof_residual, dof, loglikelihood, aic, bic, aicc, isfitted, vcov, stderror, modelmatrix, response

include("abstracttype.jl")
include("sweep.jl")
include("varstruct.jl")
Expand Down Expand Up @@ -71,8 +73,6 @@ function _precompile_()

precompile(Tuple{typeof(Metida.initvar), Array{Float64, 1}, Array{Float64, 2}})

#precompile(Tuple{typeof(Metida.intersectsubj), Array{VarEffect, 1}, VarEffect})

end
_precompile_()
#include(".jl")
Expand Down
7 changes: 4 additions & 3 deletions test/test.jl
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ end
@test Metida.m2logreml(lmm) 10.065239006121315 atol=1E-6
end
################################################################################
# ftdf
# ftdf / 1fptime.csv
################################################################################
@testset " Model: Categorical * Continuous predictor, CSH/SI " begin
# nowarn
Expand All @@ -209,10 +209,11 @@ end
@test Metida.m2logreml(lmm) 1300.1807598168923 atol=1E-6
end
################################################################################
# ftdf2
# ftdf2 / 1freparma.csv
################################################################################
@testset " Model: Categorical * Continuous predictor, 0/ARMA " begin
# nowarn
# SPSS 715.452856
io = IOBuffer();
lmm = Metida.LMM(@formula(response ~ 1 + factor*time), ftdf2;
repeated = Metida.VarEffect(Metida.@covstr(time|subject&factor), Metida.ARMA),
Expand All @@ -239,7 +240,7 @@ end
@test Metida.m2logreml(lmm) 731.7794071577566 atol=1E-6
end
################################################################################
# ftdf3
# ftdf3 / 2f2rand.csv
################################################################################
@testset " Model: CS, CS/SI " begin
lmm = Metida.LMM(@formula(response ~ 1 + factor), ftdf3; contrasts=Dict(:factor => DummyCoding(; base=1.0)),
Expand Down

2 comments on commit 12622a0

@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 register

Release notes:

v0.7.1

  • change error handling in REML
  • change rho initial
  • score / ai opt function
  • F value (test)
  • C matrix - pinv to inv
  • minor Show bugfix
  • changes in tests - stable models used
  • export StatsBase methods
  • documentation

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

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.7.1 -m "<description of version>" 12622a0d17861ab8b733e9f53feaaf851f86e4b3
git push origin v0.7.1

Please sign in to comment.