[Depmix-commits] r215 - pkg/man trunk/R

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

Author: ingmarvisser
Date: 2008-07-29 16:35:28 +0200 (Tue, 29 Jul 2008)
New Revision: 215

Modified:
   pkg/man/depmixS4-package.Rd
   trunk/R/depmixfit.R
Log:
Fixed minor bug in depmix.fit (included drop=FALSE somewhere to deal with models with a single linear constraint)

Modified: pkg/man/depmixS4-package.Rd
===================================================================
--- pkg/man/depmixS4-package.Rd	2008-07-02 11:53:50 UTC (rev 214)
+++ pkg/man/depmixS4-package.Rd	2008-07-29 14:35:28 UTC (rev 215)
@@ -34,7 +34,7 @@
 		Package: \tab depmixS4\cr
 		Type: \tab Package\cr
 		Version: \tab 0.2-0\cr
-		Date: \tab 2008-06-10\cr
+		Date: \tab 2008-07-02\cr
 		License: \tab GPL\cr
 	}
 

Modified: trunk/R/depmixfit.R
===================================================================
--- trunk/R/depmixfit.R	2008-07-02 11:53:50 UTC (rev 214)
+++ trunk/R/depmixfit.R	2008-07-29 14:35:28 UTC (rev 215)
@@ -85,10 +85,14 @@
 				}
 			}
 			
+			print(lincon)
+			
 			# select only those columns of the constraint matrix that correspond to non-fixed parameters
 			linconFull <- lincon
-			lincon <- lincon[,!fixed]
+			lincon <- lincon[,!fixed,drop=FALSE]
 			
+			print(lincon)
+			
 			# set donlp2 control parameters
 			cntrl <- donlp2.control(hessian=FALSE,difftype=2,report=TRUE)