[Depmix-commits] r321 - in trunk: . R

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

Author: ingmarvisser
Date: 2010-01-20 13:31:56 +0100 (Wed, 20 Jan 2010)
New Revision: 321

Modified:
   trunk/DESCRIPTION
   trunk/NAMESPACE
   trunk/NEWS
   trunk/R/responseMVN.R
Log:
Description et cetera updated to reflect recent changes.

Modified: trunk/DESCRIPTION
===================================================================
--- trunk/DESCRIPTION	2010-01-20 11:58:14 UTC (rev 320)
+++ trunk/DESCRIPTION	2010-01-20 12:31:56 UTC (rev 321)
@@ -1,6 +1,6 @@
 Package: depmixS4
-Version: 1.0
-Date: 2009-07-13
+Version: 0.3
+Date: 2010-01-19
 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>

Modified: trunk/NAMESPACE
===================================================================
--- trunk/NAMESPACE	2010-01-20 11:58:14 UTC (rev 320)
+++ trunk/NAMESPACE	2010-01-20 12:31:56 UTC (rev 321)
@@ -8,11 +8,12 @@
 	lystig,
 	fb,
 	forwardbackward,
-	MVNresponse,
+	MVNresponse,
+	dm_dmvnorm,
 	llratio,
 	multinomial,
 	em,
-	viterbi,
+	viterbi,
 	mlogit
 )
 
@@ -50,7 +51,7 @@
 	getpars,
 	logLik,
 	predict,
-	dens,
+	dens,
 	show,
 	simulate,
 	summary

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2010-01-20 11:58:14 UTC (rev 320)
+++ trunk/NEWS	2010-01-20 12:31:56 UTC (rev 321)
@@ -1,4 +1,14 @@
 
+Changes in depmixS4 version 0.3-0
+  
+  o added multinomial response function with identity link (no covariates
+    allowed in such a model); useful when (many) boundary values occur; 
+    currently no constraints are used for such models, and hence only EM
+    can be used for optimization, or alternatively, if and when Rdonlp2
+    is used, sum constraints need to be added when fitting the model.
+
+  o 
+
 Changes in depmixS4 version 0.2-2
 
   o fixed a warning produced when specifying conrows.upper and .lower in the
@@ -64,5 +74,4 @@
 
   o adjusted for R 2.7.0
 
-
-First version released on CRAN: 0.1-0
\ No newline at end of file
+First version released on CRAN: 0.1-0

Modified: trunk/R/responseMVN.R
===================================================================
--- trunk/R/responseMVN.R	2010-01-20 11:58:14 UTC (rev 320)
+++ trunk/R/responseMVN.R	2010-01-20 12:31:56 UTC (rev 321)
@@ -111,11 +111,11 @@
 		parameters$coefficients[1,] <- pstart[1:ncol(parameters$coefficients)]
 		pstart <- matrix(pstart,ncol(x),byrow=TRUE)
 		if(ncol(x)>1) parameters$coefficients[2:ncol(x),] <- pstart[2:ncol(x),]
-	   if(length(unlist(parameters))>length(parameters$coefficients)) {
-        tmp <- as.numeric(pstart[(length(parameters$coefficients)+1):length(pstart)])
-        if(length(tmp) == ncol(parameters$Sigma)) parameters$Sigma <- diag(tmp) else parameters$Sigma <- matrix(tmp,ncol=ncol(y),nrow=ncol(y))
-	   }
-  }
+		if(length(unlist(parameters))>length(parameters$coefficients)) {
+			tmp <- as.numeric(pstart[(length(parameters$coefficients)+1):length(pstart)])
+			if(length(tmp) == ncol(parameters$Sigma)) parameters$Sigma <- diag(tmp) else parameters$Sigma <- matrix(tmp,ncol=ncol(y),nrow=ncol(y))
+		}
+	}
 	mod <- new("MVNresponse",formula=formula,parameters=parameters,fixed=fixed,x=x,y=y,npar=npar)
 	mod
 }