[Depmix-commits] r528 - in pkg/depmixS4: R man

[noreply at r-forge.r-project.org]

Author: maarten
Date: 2012-06-20 16:29:05 +0200 (Wed, 20 Jun 2012)
New Revision: 528

Modified:
   pkg/depmixS4/R/em.control.R
   pkg/depmixS4/man/em.control.Rd
Log:
- deleted classification likelihood from em.control

Modified: pkg/depmixS4/R/em.control.R
===================================================================
--- pkg/depmixS4/R/em.control.R	2012-06-20 09:36:24 UTC (rev 527)
+++ pkg/depmixS4/R/em.control.R	2012-06-20 14:29:05 UTC (rev 528)
@@ -1,4 +1,4 @@
 em.control <- 
-function(maxit=500,tol=1e-8,crit="relative",random.start=TRUE,classification=c("soft","hard")) {
-    classification <- match.arg(classification)
-	return(list(maxit=maxit,tol=tol,crit=crit,random.start=random.start,classification=classification))}
+function(maxit=500,tol=1e-8,crit="relative",random.start=TRUE) {
+	return(list(maxit=maxit,tol=tol,crit=crit,random.start=random.start))
+}

Modified: pkg/depmixS4/man/em.control.Rd
===================================================================
--- pkg/depmixS4/man/em.control.Rd	2012-06-20 09:36:24 UTC (rev 527)
+++ pkg/depmixS4/man/em.control.Rd	2012-06-20 14:29:05 UTC (rev 528)
@@ -8,7 +8,7 @@
 
 \usage{
 	
-	em.control(maxit = 500, tol = 1e-08, crit = "relative", random.start = TRUE, classification = c("soft","hard"))
+	em.control(maxit = 500, tol = 1e-08, crit = "relative", random.start = TRUE)
 	
 }
 
@@ -24,9 +24,6 @@
 	\item{random.start}{This is used for a (limited) random
 	initialization of the parameters. See Details.}
 	
-	\item{classification}{Type of classification to states
-	used. See Details.}
-	
 }
 
 \details{
@@ -55,14 +52,6 @@
 given to distinguish between the states.  It is also useful for repeated
 estimation from different starting values.
 
-Argument \code{classification} is used to choose either soft (default) or
-hard classification to states. When using soft classification, observations
-are assigned to states with a weight equal to the posterior probability of
-the state. When using hard classification, observations are assigned to states
-according to the maximum a posteriori (MAP) states (i.e., each observation
-is assigned to one state, which is determined by the Viterbi algorithm in the
-case of \code{depmix} models).
-
 }
 
 \references{