[Pomp-commits] r785 - branches/mif2/R

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

Author: nxdao2000
Date: 2012-09-25 23:31:34 +0200 (Tue, 25 Sep 2012)
New Revision: 785

Modified:
   branches/mif2/R/mif.R
Log:


Modified: branches/mif2/R/mif.R
===================================================================
--- branches/mif2/R/mif.R	2012-09-25 20:23:42 UTC (rev 784)
+++ branches/mif2/R/mif.R	2012-09-25 21:31:34 UTC (rev 785)
@@ -312,7 +312,9 @@
 		paramMatrix[[1]]<-pfp$paramMatrix[[1]]
 		
 	}	
-	
+	if(option!='mif2' && missing(paramMatrix))
+	{	paramMatrix <-list()
+	}
 	new(
 			"mif",
 			pfp,
@@ -329,7 +331,7 @@
 			tol=tol,
 			conv.rec=conv.rec,
 			option=option,
-			#paramMatrix=paramMatrix,
+			paramMatrix=paramMatrix,
 			cooling.fraction = cooling.fraction
 	)
 }
@@ -351,8 +353,7 @@
 				transform = FALSE, ...) {
 			
 			transform <- as.logical(transform)
-			
-						
+									
 			if (missing(start)) start <- coef(object)
 			if (missing(rw.sd))
 				stop("mif error: ",sQuote("rw.sd")," must be specified",call.=FALSE)