v0.6.0

PharmCat · Mar 1, 2021 · b70acf3 · b70acf3 · PharmCat · Mar 1, 2021
1 parent 714bd6c
commit b70acf3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Metida"
 uuid = "a1dec852-9fe5-11e9-361f-8d9fde67cfa2"
 authors = ["Vladimir Arnautov <[email protected]>"]
-version = "0.5.1"
+version = "0.6.0"
 
 [deps]
 CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"

diff --git a/change.log b/change.log
@@ -2,7 +2,7 @@ v0.6.0
   * rho link change
   * TOEPH
   * TOEPHP
-  * Custom covariance type - rename
+  * Rename methods for custom covariance type
   * validation & documentation
 
 

diff --git a/docs/src/instanduse.md b/docs/src/instanduse.md
@@ -97,14 +97,14 @@ Metida.fit!
 Metida.CovmatMethod
 ```
 
-See: [`Metida.CovmatMethod`](@ref)
-
 #### Step 2: make custom CovarianceType
 
 ```
   CovarianceType(cm::AbstractCovmatMethod)
 ```
 
+See: [`Metida.CovarianceType`](@ref)
+
 #### Step 3 Fit your model
 
 ```@example lmmexample

diff --git a/test/validation_s3.jl b/test/validation_s3.jl
@@ -28,10 +28,13 @@ remlsrc= [530.14451859,-30.67456491,425.44656047,314.22176883,-74.87997833,
 commentsc1 = [1,3,6,13,15,16,24,25]
 commentsc2 = [2,5,7,10,22,30]
 
-c1 = "The final Hessian matrix is not positive definite although all convergence criteria are satisfied.
-The MIXED procedure continues despite this warning. Validity of subsequent results cannot be ascertained."
-c2 = "Iteration was terminated but convergence has not been achieved.
-The MIXED procedure continues despite this warning. Subsequent results produced are based on the last iteration.
+c1 =
+"The final Hessian matrix is not positive definite although all convergence criteria
+are satisfied. The MIXED procedure continues despite this warning. Validity of subsequent
+results cannot be ascertained."
+c2 =
+"Iteration was terminated but convergence has not been achieved. The MIXED procedure
+continues despite this warning. Subsequent results produced are based on the last iteration.
 Validity of the model fit is uncertain."
 #8, 9, 12
 #15?
@@ -104,12 +107,13 @@ fm2 = @formula(lnpk~sequence+period+treatment+(1|subject))
 mm  = fit(MixedModel, fm2, dfrds, REML=true)
 
 println("")
-pretty_table(dftable, ["RDS" "REML B" "REML B" "DIFF B" "REML C" "REML C" "DIFF C" "Comment C";
-                       " N " "Metida" " SPSS " "      " "Metida" " SPSS " "      " "         "])
+pretty_table(dftable, ["RDS" "REML B" "REML B" "DIFF B" "REML C" "REML C" "DIFF C" "Comm.";
+                       " N " "Metida" " SPSS " "      " "Metida" " SPSS " "      " "     "])
 println("")
 println("*  - ", c1)
 println("")
 println("** - ", c2)
 println("")
 println("DataSet 27 - MixedModels.jl result:")
+println("")
 println(mm)