version 2.1.6

cran · May 24, 2021 · f2d2ca2 · f2d2ca2
1 parent 981a8e2
commit f2d2ca2
Show file tree

Hide file tree

Showing 25 changed files with 465 additions and 515 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,9 +1,9 @@
 Package: IMIFA
 Type: Package
-Date: 2020-12-29
+Date: 2021-05-24
 Title: Infinite Mixtures of Infinite Factor Analysers and Related
         Models
-Version: 2.1.5
+Version: 2.1.6
 Authors@R: c(person("Keefe", "Murphy", email = "keefe.murphy@mu.ie", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7709-3159")),
              person("Cinzia", "Viroli", email = "cinzia.viroli@unibo.it", role = "ctb", comment = c(ORCID = "0000-0002-3278-5266")),
              person("Isobel Claire", "Gormley", email = "claire.gormley@ucd.ie", role = "ctb", comment = c(ORCID = "0000-0001-7713-681X")))
@@ -24,10 +24,10 @@ Collate: 'MainFunction.R' 'Diagnostics.R' 'FullConditionals.R'
         'Gibbs_MFA.R' 'Gibbs_MIFA.R' 'Gibbs_OMFA.R' 'Gibbs_OMIFA.R'
         'IMIFA.R' 'PlottingFunctions.R' 'SimulateData.R' 'data.R'
 NeedsCompilation: no
-Packaged: 2021-01-04 16:34:53 UTC; Keefe
+Packaged: 2021-05-24 16:27:36 UTC; Keefe
 Author: Keefe Murphy [aut, cre] (<https://orcid.org/0000-0002-7709-3159>),
   Cinzia Viroli [ctb] (<https://orcid.org/0000-0002-3278-5266>),
   Isobel Claire Gormley [ctb] (<https://orcid.org/0000-0001-7713-681X>)
 Maintainer: Keefe Murphy <keefe.murphy@mu.ie>
 Repository: CRAN
-Date/Publication: 2021-01-04 23:10:02 UTC
+Date/Publication: 2021-05-24 16:50:05 UTC
diff --git a/MD5 b/MD5
@@ -1,37 +1,37 @@
-9a5812da9986777b43e7a2990a60cbf2 *DESCRIPTION
-303d26fe1420b0bc92a86d10f5873ebb *NAMESPACE
-8c869f101195043802dbe5bbc8e762e1 *R/Diagnostics.R
-745322c62928d8b1ffd7b166a1ac70c7 *R/FullConditionals.R
+175a52f5685bd1a4e6d61e2e6b0df9bf *DESCRIPTION
+7984ab11221544306180a9cf9cc69cdc *NAMESPACE
+fd033604f82d5e5a76411f6327e1a5ec *R/Diagnostics.R
+535912213a5bb4b54108fac14ea05822 *R/FullConditionals.R
 c9758e6bd78a6b4b5b04e62febc695d2 *R/Gibbs_FA.R
-8ff6d505de8cef394d5c8cffe51a928a *R/Gibbs_IFA.R
-5c4bfb560caa15104e3b49628ed325e4 *R/Gibbs_IMFA.R
-8cc8203496d0d6b9e33b73019fc918ab *R/Gibbs_IMIFA.R
+490d89b0b8370a9355165f5ee9fc4845 *R/Gibbs_IFA.R
+a15ec15281402392818c8f6cef25f1fa *R/Gibbs_IMFA.R
+c84cd82ba9e91895d706e7612425e793 *R/Gibbs_IMIFA.R
 90dfc671e7bd008b197dbe77776058db *R/Gibbs_MFA.R
-d3c58eb1e0e9267ea8db3aa6023b5766 *R/Gibbs_MIFA.R
+0f50c6609d639962cc7eac464a30ac33 *R/Gibbs_MIFA.R
 acb1bae1593331bd008e6bbc1f4d406a *R/Gibbs_OMFA.R
-596d2a9b83a2d773b0d87902da2ebbe4 *R/Gibbs_OMIFA.R
-919407ebb7c1dce6ca35b647858a806c *R/IMIFA.R
+1cc95dcb089b1eacab7cb4c1ce77977e *R/Gibbs_OMIFA.R
+1e2e4a842a99cf8575385ca5198d1945 *R/IMIFA.R
 8f7db5405333c779739b13f0ae6c0794 *R/MainFunction.R
-8009536d700d277b77cf118c47e9a427 *R/PlottingFunctions.R
+677f5cef1a658bb60fadbe84c1af7672 *R/PlottingFunctions.R
 7f328389820bec778e76dd0603c15684 *R/SimulateData.R
 c18d7934dea4c410e2e4414027ddf896 *R/data.R
 34ef4cd91594ba06f529ed22ca7a16b7 *README.md
-d3c3a60ac6534efbc60cda80dbd1cec8 *build/partial.rdb
-a4b73126d0829432fcef4cb841377a3d *build/vignette.rds
+8c4fb9a940faa4bb485df9ed8e3859f5 *build/partial.rdb
+007e14e7b7ed5c87e2e76035fd4b1fb3 *build/vignette.rds
 8a1546836eba4e124ab4a8258d56c3e9 *data/USPSdigits.rda
 0561ac6b39266e6e9b645b7b2ee31c64 *data/coffee.rda
 c0bcb7c2dd21f9748941a039b377be74 *data/olive.rda
-80c7eecaaef566f6ba2c6564cc01a854 *inst/CITATION
-157441f66bda216e78cf3c5c300659ca *inst/NEWS.md
+8042066b01805c990a476e5c559f0c6a *inst/CITATION
+740ed748bc363a314916a4f04820236c *inst/NEWS.md
 9f5d49c968942cdb9aff3510283e9dff *inst/doc/IMIFA.R
-003db89d1a6213be64725fe743cac335 *inst/doc/IMIFA.Rmd
-9a1161dc99bad1fd81ad664d94cb3679 *inst/doc/IMIFA.html
-3d116b4c9605882f4afc4ad5ea23c084 *man/G_moments.Rd
-0f89fba76ec90edaca2fc5906a30cf19 *man/G_priorDensity.Rd
-27ac883abf82daff093a905a2b47c859 *man/IMIFA-package.Rd
+bc04a50703d34e3c1ef5d8fb1fc260de *inst/doc/IMIFA.Rmd
+9017a867e8a91cd9fc7825328a96ddce *inst/doc/IMIFA.html
+31925b942368610fc313af56989d9adf *man/G_moments.Rd
+88422a650bc07f1d06b1b6c5d170875d *man/G_priorDensity.Rd
+7742790e84f7b8702f936cd5bd4b0907 *man/IMIFA-package.Rd
 56cdda484c2370de672298800c81d3d8 *man/IMIFA_news.Rd
 a8d99db1eeb0254fb5b0594ed33d3a04 *man/Ledermann.Rd
-c2a5f612041ed06e81f8299bc20b0a88 *man/MGP_check.Rd
+44c596807368d568d74730ffccf99efc *man/MGP_check.Rd
 c7e4978690d2642ef4a6f018379911ae *man/PGMM_dfree.Rd
 024cc3af21cd2866f430946d44c50574 *man/Procrustes.Rd
 72446a862e5a5eac13ca5bd7f2047975 *man/USPSdigits.Rd
@@ -46,19 +46,19 @@ f4ad348f54042a3406a1dab3c6ac5676 *man/is.cols.Rd
 e7d36a4ca1d9f67fa9a66120ca4cb58e *man/mat2cols.Rd
 155df1622ff6dbab2d202a9fdcd85b8b *man/mcmc_IMIFA.Rd
 83a4d8085d465ab22d98700ed0f3013e *man/mgpControl.Rd
-a215eb1803d5394b8391ca1aba90cf85 *man/mixfaControl.Rd
+f0cba41295ed186614847d637cf2a9ed *man/mixfaControl.Rd
 376d35460fbfb90198d8f42b84cdd454 *man/olive.Rd
 6374921bc6bf3b5d2e45b9b8739e2300 *man/pareto_scale.Rd
 6230b4d8bf19a308769fd4edfa41d38e *man/plot.Results_IMIFA.Rd
 8e13feda5e28254d4efe8d4687eec58a *man/plot_cols.Rd
 bb46f39e23c8c03c85677c2332058b4e *man/post_conf_mat.Rd
-884661aab697de134c78d211ca10db0c *man/psi_hyper.Rd
+66168bf2be3ab5240ee81b482df50c3a *man/psi_hyper.Rd
 e5ab57edc415abf586409f2369b1bf95 *man/rDirichlet.Rd
 c0226719b4b87c95c8401f6f6db86c56 *man/scores_MAP.Rd
 a49403d852d540f0139ad2783db53357 *man/shift_GA.Rd
 5770b25cad612fc65643312ed69636bd *man/show_IMIFA_digit.Rd
 0ad7c9d4066d6deba11f08b32d9a68cf *man/show_digit.Rd
 b305d00003cc68b16f53e3b9b580898f *man/sim_IMIFA.Rd
 f7c823779a6472870cc8cd89184ee27c *man/storeControl.Rd
-003db89d1a6213be64725fe743cac335 *vignettes/IMIFA.Rmd
+bc04a50703d34e3c1ef5d8fb1fc260de *vignettes/IMIFA.Rmd
 39268a288f379004b29ce4e77ee340b1 *vignettes/res_olive_IMIFA__Edited-Vignette-only-Version.rda
diff --git a/NAMESPACE b/NAMESPACE
@@ -11,6 +11,7 @@ S3method(show_IMIFA_digit,Results_IMIFA)
 S3method(sim_IMIFA_model,Results_IMIFA)
 S3method(summary,IMIFA)
 S3method(summary,Results_IMIFA)
+export(G_calibrate)
 export(G_expected)
 export(G_priorDensity)
 export(G_variance)

diff --git a/R/Diagnostics.R b/R/Diagnostics.R
@@ -357,8 +357,8 @@ get_IMIFA_results.IMIFA        <- function(sims = NULL, burnin = 0L, thinning =
     GQ.temp2     <- list(AICMs = aicm, BICMs = bicm, DICs = dic)
     clust.ind    <- !any(is.element(method,   c("FA", "IFA")),
                      all(is.element(method, c("MFA", "MIFA")), G == 1))
-    sw.mx        <- ifelse(clust.ind, sw["mu.sw"],  TRUE)
-    sw.px        <- ifelse(clust.ind, sw["psi.sw"], TRUE)
+    sw.mx        <- !clust.ind || sw["mu.sw"]
+    sw.px        <- !clust.ind || sw["psi.sw"]
 
     if(!inf.Q)   {
       Q          <- if(length(n.fac)   > 1)  Q                   else n.fac