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

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

Author: ingmarvisser
Date: 2009-02-17 11:27:43 +0100 (Tue, 17 Feb 2009)
New Revision: 248

Modified:
   todo
   trunk/DESCRIPTION
   trunk/NEWS
   trunk/man/simulate.Rd
Log:
Updated help files for mix classes and updated to do list

Modified: todo
===================================================================
--- todo	2008-12-08 10:18:12 UTC (rev 247)
+++ todo	2009-02-17 10:27:43 UTC (rev 248)
@@ -21,9 +21,12 @@
 
 8) check bug in posterior versus viterbi bij de modellen van Maartje
 
-9) 
+9) AIC/BIC help files: refs toevoegen
 
+10) balance data set refs toevoegen en toestemming vragen aan Brenda, data set 
+reduceren dmv random subset
 
+
 
 TODO Medium term
 

Modified: trunk/DESCRIPTION
===================================================================
--- trunk/DESCRIPTION	2008-12-08 10:18:12 UTC (rev 247)
+++ trunk/DESCRIPTION	2009-02-17 10:27:43 UTC (rev 248)
@@ -1,10 +1,10 @@
 Package: depmixS4
 Version: 0.2-1
-Date: 2008-06-09
+Date: 2009-02-17
 Title: Dependent Mixture Models
 Author: Ingmar Visser <i.visser at uva.nl>, Maarten Speekenbrink <m.speekenbrink at ucl.ac.uk>
 Maintainer: Ingmar Visser <i.visser at uva.nl>
-Depends: R (>= 2.6.0), nnet, methods, MASS
+Depends: R (>= 2.8.1), nnet, methods, MASS
 Suggests: Rdonlp2
 Description: Fit latent (hidden) Markov models on mixed categorical and continuous (timeseries)
    data, otherwise known as dependent mixture models

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2008-12-08 10:18:12 UTC (rev 247)
+++ trunk/NEWS	2009-02-17 10:27:43 UTC (rev 248)
@@ -5,6 +5,11 @@
   
   o Restructured test files somewhat
 
+  o Fixed a bug in the use of the conrows argument in the fit function (a missing
+    drop=FALSE statement)
+
+  o Updated help files for mix classes
+
   o 
 
 

Modified: trunk/man/simulate.Rd
===================================================================
--- trunk/man/simulate.Rd	2008-12-08 10:18:12 UTC (rev 247)
+++ trunk/man/simulate.Rd	2009-02-17 10:27:43 UTC (rev 248)
@@ -5,6 +5,7 @@
 \alias{simulate}
 
 \alias{simulate,response-method}
+\alias{simulate,mix-method}
 \alias{simulate,depmix-method}
 \alias{simulate,GLMresponse-method}
 \alias{simulate,transInit-method}
@@ -16,29 +17,31 @@
 \alias{simulate,NORMresponse-method}
 \alias{simulate,POISSONresponse-method}
 
-\title{Methods to simulate from depmix models}
+\title{Methods to simulate from (dep-)mix models}
 
 \description{
 
-	Random draws from \code{depmix} objects.
+	Random draws from \code{(dep-)mix} objects.
 
 }
 
 \usage{
 
   \S4method{simulate}{depmix}(object, nsim=1, seed=NULL, ...)
-    
-	\S4method{simulate}{response}(object, nsim=1, seed=NULL, times, ...)
-	
-	\S4method{simulate}{GLMresponse}(object, nsim=1, seed=NULL, times, ...)
-	
-	\S4method{simulate}{transInit}(object, nsim=1, seed=NULL, times, is.prior=FALSE, ...)
+  
+  \S4method{simulate}{mix}(object, nsim=1, seed=NULL, ...)
+
+  \S4method{simulate}{response}(object, nsim=1, seed=NULL, times, ...)
+  
+  \S4method{simulate}{GLMresponse}(object, nsim=1, seed=NULL, times, ...)
+  
+  \S4method{simulate}{transInit}(object, nsim=1, seed=NULL, times, is.prior=FALSE, ...)
 }
 
 \arguments{
 	
 	\item{object}{Object to generate random draws.  An object of class
-	\code{depmix}, \code{response}, \code{transInit}}
+	\code{mix}, \code{depmix}, \code{response} or \code{transInit}}
 
 	\item{nsim}{The number of draws (one draw simulates a data set of the
 	size that is defined by ntimes); defaults to 1.}
@@ -49,7 +52,7 @@
 	complete series to generate the data.  For internal use.}
 	
 	\item{is.prior}{For \code{transInit} objects, indicates whether it is a prior 
-  (init) model, or not (i.e., it is a transition model)}
+	(init) model, or not (i.e., it is a transition model)}
 	
 	\item{...}{Not used currently.}
 }
@@ -62,6 +65,10 @@
 	sequences are then used to generate \code{nsim} observation sequences
 	of thee same length.
 
+	For a \code{mix} model, simulate generates \code{nsim} random class 
+	assignments for each case. Those assigments are then used to generate
+	observation/response values from the appropriate distributions. 
+
 	Setting the \code{times} option selects the time points in the total
 	state/observation sequence (i.e., counting is continued over ntimes).
 	Direct calls of simulate with the \code{times} option are not recommended.