[Depmix-commits] r526 - pkg/depmixS4/R

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

Author: ingmarvisser
Date: 2012-06-18 19:48:10 +0200 (Mon, 18 Jun 2012)
New Revision: 526

Modified:
   pkg/depmixS4/R/transInit.R
Log:
bug fix met data check

Modified: pkg/depmixS4/R/transInit.R
===================================================================
--- pkg/depmixS4/R/transInit.R	2012-06-17 21:58:22 UTC (rev 525)
+++ pkg/depmixS4/R/transInit.R	2012-06-18 17:48:10 UTC (rev 526)
@@ -10,7 +10,7 @@
 	signature(formula="formula"),
 	function(formula,nstates,data=NULL,family=multinomial(),pstart=NULL,fixed=NULL,prob=TRUE, ...) {
 		call <- match.call()
-		if(formula==formula(~1)) { # &is.null(data) removed this in the condition as it 
+		if(formula==formula(~1) &is.null(data)) { # &is.null(data) removed this in the condition as it 
 			# creates the wrong dimension for the dens function when data is used (but not needed)
 			x <- matrix(1,ncol=1)
 		} else {