[Depmix-commits] r417 - in pkg/depmixS4: . R

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

Author: ingmarvisser
Date: 2010-06-03 14:27:14 +0200 (Thu, 03 Jun 2010)
New Revision: 417

Modified:
   pkg/depmixS4/DESCRIPTION
   pkg/depmixS4/NEWS
   pkg/depmixS4/R/responseGLM.R
Log:
fixed a bug in setting the lower and upper bounds for normal response parameters in GLMresponse

Modified: pkg/depmixS4/DESCRIPTION
===================================================================
--- pkg/depmixS4/DESCRIPTION	2010-06-03 12:16:46 UTC (rev 416)
+++ pkg/depmixS4/DESCRIPTION	2010-06-03 12:27:14 UTC (rev 417)
@@ -1,6 +1,6 @@
 Package: depmixS4
-Version: 0.9-0
-Date: 2010-05-11
+Version: 0.9-1
+Date: 2010-06-03
 Title: Dependent Mixture Models in S4
 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: pkg/depmixS4/NEWS
===================================================================
--- pkg/depmixS4/NEWS	2010-06-03 12:16:46 UTC (rev 416)
+++ pkg/depmixS4/NEWS	2010-06-03 12:27:14 UTC (rev 417)
@@ -1,4 +1,12 @@
 
+Changes in depmixS4 version 0.9-1
+
+  o fixed a bug in setting the lower and upper bounds for GLMresponse
+	models (the number of bounds was wrong for models with covariates/
+	predictors; these bounds are only used in constrained optimization in
+	which case they produced an error immediately; in EM optimization these
+	bounds are not used).
+
 Changes in depmixS4 version 0.9-0
 
   o added optimization using Rsolnp, which can be invoked by using 

Modified: pkg/depmixS4/R/responseGLM.R
===================================================================
--- pkg/depmixS4/R/responseGLM.R	2010-06-03 12:16:46 UTC (rev 416)
+++ pkg/depmixS4/R/responseGLM.R	2010-06-03 12:27:14 UTC (rev 417)
@@ -33,8 +33,8 @@
 		if(family$family=="gaussian") {
 			parameters$sd <- 1
 			constr <- list(
-				parup = rep(Inf,ncol(y)+1),
-				parlow = c(rep(-Inf,ncol(y)),0)
+				parup = rep(Inf,ncol(x)+1),
+				parlow = c(rep(-Inf,ncol(x)),0)
 			)
 		}
 		if(family$family=="binomial") {