[Depmix-commits] r40 - / trunk trunk/man

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

Author: ingmarvisser
Date: 2008-03-05 00:02:33 +0100 (Wed, 05 Mar 2008)
New Revision: 40

Modified:
   todo
   trunk/depmix-test3EM.R
   trunk/man/depmix.Rd
Log:
Minor changes

Modified: todo
===================================================================
--- todo	2008-03-04 23:01:47 UTC (rev 39)
+++ todo	2008-03-04 23:02:33 UTC (rev 40)
@@ -8,15 +8,17 @@
 	2) depmix-class.Rd: detailed description of depmix class: Ingmar, done!!!!!
 	3) depmix.fit.Rd: help on fitting models: Ingmar
 		Other methods for depmix.fitted objects include:
-		a) posterior: get posterior state sequence
-		b) logLik
-		c) AIC, BIC
+		a) posterior: get posterior state sequence: we still need the code for this!
+		
+		b) logLik: done!!!
+		c) AIC, BIC: done!!!
 		d) getpars, setpars
-	Maybe there should be a help file with depmix methods ...
 		
+		e) llratio: done!!!!!
+		
 	4) responses.Rd: detailed description on constructing response models
 	5) transInit.Rd: detailed description on constructing transition models
-	6) others: llratio, logLik, AIC, BIC, lystig, fb
+	6) others: lystig, fb
 
 - rework em function and add a working example for it: Maarten
 

Modified: trunk/depmix-test3EM.R
===================================================================
--- trunk/depmix-test3EM.R	2008-03-04 23:01:47 UTC (rev 39)
+++ trunk/depmix-test3EM.R	2008-03-04 23:02:33 UTC (rev 40)
@@ -1,4 +1,4 @@
-setwd("/Users/ivisser/Documents/projects/depmixProject/depmixNew/code/depmix/trunk/")
+setwd("/Users/ivisser/Documents/projects/depmixProject/depmixNew/rforge/depmix/trunk/")
 
 source("depmixS4.R")
 source("classes.R")

Modified: trunk/man/depmix.Rd
===================================================================
--- trunk/man/depmix.Rd	2008-03-04 23:01:47 UTC (rev 39)
+++ trunk/man/depmix.Rd	2008-03-04 23:02:33 UTC (rev 40)
@@ -70,25 +70,26 @@
 \details{ 
 
 	The function \code{depmix} creates an S4 object of class \code{depmix},
-	which needs to be \code{fit}'ted using \code{fit} to optimize the
-	parameters.
+	which needs to be fitted using \code{\link[depmix]{depmix.fit}} to
+	optimize the parameters.
 	
-	The response model(s) are created by call(s) to \code{GLMresponse}
-	providing the family and optional predictors.  If response is a list of
-	formulae, the response's are assumed to be independent conditional on
-	the latent state.
+	The response model(s) are created by call(s) to
+	\code{\link[depmix]{response}} providing the family and optional
+	predictors.  If response is a list of formulae, the response's are
+	assumed to be independent conditional on the latent state.
 	
 	The transitions are modeled as a multinomial logistic model for each
 	state.  Hence, the transition matrix can be modeled as time-dependent,
 	depending on predictors.  The prior density is also modeled as a
-	multinomial logistic.  Both are created by calls to \code{transInit}.
+	multinomial logistic.  Both are created by calls to
+	\code{\link[depmix]{transInit}}.
 	
 	Starting values may be provided by the respective arguments.  The order
 	in which parameters must be provided can be easily studied by using the
 	\code{setpars} function.
 	
 	Linear constraints on parameters can be provided as argument to the
-	\code{fit} function.
+	\code{\link[depmix]{depmix.fit}} function.
 	
 }
 \value{