minor

Author: snoweye

R/00_pmclust_reduceK.r

@@ -29,10 +29,15 @@ pmclust.reduceK <- function(X = NULL, K = 2, MU = NULL,
       K <- K - length(i.k)
 
       ### Initial global storage.
-      PARAM.org <- set.global(K = K)
+      if(algorithm[1] %in% .PMC.CT$algorithm.gbd){
+        PARAM.org <- set.global(K = K)
+      } else if(algorithm[1] %in% .PMC.CT$algorithm.dmat){
+        PARAM.org <- set.global.dmat(K = K)
+      } else{
+        comm.stop("The algorithm is not found.")
+      }
 
       ### Replacing PARAM.org by previous PARAM.new.
-      PARAM.org$K <- K
       PARAM.org$ETA <- PARAM.new$ETA[-i.k] / sum(PARAM.org$ETA[-i.k])
       PARAM.org$log.ETA <- log(PARAM.org$ETA)
       PARAM.org$MU <- matrix(PARAM.new$MU[, -i.k], ncol = K)

R/dmat_em_base.r

@@ -284,7 +284,7 @@ em.step.dmat <- function(PARAM.org){
     PARAM.new <- try(em.onestep.dmat(PARAM.org))
     ### WCC: temp
     # PARAM.new <- em.onestep.dmat(PARAM.org)
-    if(any(class(PARAM.new) == "try-error") || is.nan(PARAM.new$logL)){
+    if(class(PARAM.new) == "try-error" || is.nan(PARAM.new$logL)){
       comm.cat("Results of previous iterations are returned.\n", quiet = TRUE)
       .pmclustEnv$CHECK$convergence <- 99
       PARAM.new <- PARAM.org

R/pm_aecm_base.r

@@ -102,7 +102,7 @@ aecm.step.spmd <- function(PARAM.org){
 
     ### Start AECM here.
     PARAM.new <- try(aecm.onestep.spmd(PARAM.org))
-    if(any(class(PARAM.new) == "try-error") || is.nan(PARAM.new$logL)){
+    if(class(PARAM.new) == "try-error" || is.nan(PARAM.new$logL)){
       comm.cat("Results of previous iterations are returned.\n", quiet = TRUE)
       .pmclustEnv$CHECK$convergence <- 99
       PARAM.new <- PARAM.org

R/pm_apecm_base.r

@@ -138,7 +138,7 @@ apecm.step.spmd <- function(PARAM.org){
 
     ### Start APECM here.
     PARAM.new <- try(apecm.onestep.spmd(PARAM.org))
-    if(any(class(PARAM.new) == "try-error") || is.nan(PARAM.new$logL)){
+    if(class(PARAM.new) == "try-error" || is.nan(PARAM.new$logL)){
       comm.cat("Results of previous iterations are returned.\n", quiet = TRUE)
       .pmclustEnv$CHECK$convergence <- 99
       PARAM.new <- PARAM.org

R/pm_apecma_base.r

@@ -97,7 +97,7 @@ apecma.step.spmd <- function(PARAM.org){
 
     ### Start APECMA here.
     PARAM.new <- try(apecma.onestep.spmd(PARAM.org))
-    if(any(class(PARAM.new) == "try-error") || is.nan(PARAM.new$logL)){
+    if(class(PARAM.new) == "try-error" || is.nan(PARAM.new$logL)){
       comm.cat("Results of previous iterations are returned.\n", quiet =TRUE)
       .pmclustEnv$CHECK$convergence <- 99
       PARAM.new <- PARAM.org

R/pm_em_base.r

@@ -185,7 +185,7 @@ em.step.spmd <- function(PARAM.org){
 
     ### Start EM here.
     PARAM.new <- try(em.onestep.spmd(PARAM.org))
-    if(any(class(PARAM.new) == "try-error") || is.nan(PARAM.new$logL)){
+    if(class(PARAM.new) == "try-error" || is.nan(PARAM.new$logL)){
       comm.cat("Results of previous iterations are returned.\n", quiet = TRUE)
       .pmclustEnv$CHECK$convergence <- 99
       PARAM.new <- PARAM.org