[Depmix-commits] r491 - in pkg/depmix: . R man

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

Author: ingmarvisser
Date: 2011-09-16 13:46:54 +0200 (Fri, 16 Sep 2011)
New Revision: 491

Removed:
   pkg/depmix/man/.Rd2dvi1150/
Modified:
   pkg/depmix/CHANGES
   pkg/depmix/DESCRIPTION
   pkg/depmix/R/mgdmm.R
Log:
Fixed a bug which led to an error when specifying multigroup models 
in which one or more groups had a 1-state model (fixed by adding a 
drop=FALSE in function mgdmm). 
Removed an invisible (and unnecessary) directory.

Modified: pkg/depmix/CHANGES
===================================================================
--- pkg/depmix/CHANGES	2011-09-16 11:28:50 UTC (rev 490)
+++ pkg/depmix/CHANGES	2011-09-16 11:46:54 UTC (rev 491)
@@ -50,3 +50,9 @@
 1) Minor changes in C++ code to conform to compiler standards (producing
 an error on SUN systems).
 
+Changes from 0.9.8 to 0.9.9
+
+1) Fixed a bug which led to an error when specifying multigroup models 
+in which one or more groups had a 1-state model (fixed by adding a 
+drop=FALSE in function mgdmm).
+

Modified: pkg/depmix/DESCRIPTION
===================================================================
--- pkg/depmix/DESCRIPTION	2011-09-16 11:28:50 UTC (rev 490)
+++ pkg/depmix/DESCRIPTION	2011-09-16 11:46:54 UTC (rev 491)
@@ -1,10 +1,10 @@
 Package: depmix
-Version: 0.9.8
-Date: 2010-01-20
+Version: 0.9.9
+Date: 2011-09-16
 Title: Dependent Mixture Models
 Author: Ingmar Visser <i.visser at uva.nl>
 Maintainer: Ingmar Visser <i.visser at uva.nl>
-Depends: R (>= 2.9.1), MASS
+Depends: R (>= 2.13.1), MASS
 Suggests: Rdonlp2
 Description: Fit (multigroup) mixtures of latent Markov models on mixed categorical and continuous (timeseries) data 
 License: GPL
\ No newline at end of file

Modified: pkg/depmix/R/mgdmm.R
===================================================================
--- pkg/depmix/R/mgdmm.R	2011-09-16 11:28:50 UTC (rev 490)
+++ pkg/depmix/R/mgdmm.R	2011-09-16 11:46:54 UTC (rev 491)
@@ -47,7 +47,7 @@
 			bl=c(bl,mixmod[[i]]$bl[1:mixmod[[i]]$npars])
 			bu=c(bu,mixmod[[i]]$bu[1:mixmod[[i]]$npars])
 			fixed=c(fixed,mixmod[[i]]$fixed[1:mixmod[[i]]$npars])
-			linmat[[i]]=mixmod[[i]]$A[,1:mixmod[[i]]$npars]
+			linmat[[i]]=mixmod[[i]]$A[,1:mixmod[[i]]$npars,drop=FALSE]
 			bllin=c(bllin,mixmod[[i]]$bllin)
 			bulin=c(bulin,mixmod[[i]]$bulin)
 		}