[Depmix-commits] r92 - in trunk: . R man

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

Author: ingmarvisser
Date: 2008-03-20 12:05:16 +0100 (Thu, 20 Mar 2008)
New Revision: 92

Modified:
   trunk/NAMESPACE
   trunk/R/EM.R
   trunk/R/depmix.fitted.R
   trunk/man/depmix.fit.Rd
Log:
More minor changes

Modified: trunk/NAMESPACE
===================================================================
--- trunk/NAMESPACE	2008-03-19 21:45:52 UTC (rev 91)
+++ trunk/NAMESPACE	2008-03-20 11:05:16 UTC (rev 92)
@@ -9,6 +9,7 @@
 	fb,
 	llratio,
 	multinomial,
+	em,
 	mlogit
 )
 

Modified: trunk/R/EM.R
===================================================================
--- trunk/R/EM.R	2008-03-19 21:45:52 UTC (rev 91)
+++ trunk/R/EM.R	2008-03-20 11:05:16 UTC (rev 92)
@@ -33,7 +33,7 @@
 		# maximization
 				
 		# should become object at prior <- fit(object at prior)
-		object at prior@y <- fbo$gamma[bt,]
+		object at prior@y <- fbo$gamma[bt,,drop=FALSE]
 		object at prior <- fit(object at prior, w=NULL,ntimes=NULL)
 		object at init <- dens(object at prior)
 				

Modified: trunk/R/depmix.fitted.R
===================================================================
--- trunk/R/depmix.fitted.R	2008-03-19 21:45:52 UTC (rev 91)
+++ trunk/R/depmix.fitted.R	2008-03-20 11:05:16 UTC (rev 92)
@@ -46,7 +46,7 @@
 		object <- setpars(object,fixed,which="fixed")
 		
 		if(method=="EM") {
-			object <- em(object,verbose=TRUE)
+			object <- em(object,verbose=TRUE,...)
 		}
 		
 		if(method=="donlp") {
@@ -119,7 +119,8 @@
 				lin.upper=lin.u,
 				lin.lower=lin.l,
 				control=cntrl,
-				control.fun=mycontrol
+				control.fun=mycontrol,
+				...
 			)
 			
 			class(object) <- "depmix.fitted"
Modified: trunk/man/depmix.fit.Rd
===================================================================
--- trunk/man/depmix.fit.Rd	2008-03-19 21:45:52 UTC (rev 91)
+++ trunk/man/depmix.fit.Rd	2008-03-20 11:05:16 UTC (rev 92)
@@ -42,7 +42,7 @@
 	\item{method}{The optimization method; mostly determined by
 		constraints.}
 
-	\item{...}{Not used currently.}
+	\item{...}{Further arguments passed on to the optimization methods.}
 
 }