[Pomp-commits] r618 - in pkg: R inst

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

Author: kingaa
Date: 2012-02-16 00:11:14 +0100 (Thu, 16 Feb 2012)
New Revision: 618

Modified:
   pkg/R/probe-match.R
   pkg/inst/NEWS
Log:
- same error as before, fixed now in 'probe.match'


Modified: pkg/R/probe-match.R
===================================================================
--- pkg/R/probe-match.R	2012-02-15 22:58:17 UTC (rev 617)
+++ pkg/R/probe-match.R	2012-02-15 23:11:14 UTC (rev 618)
@@ -48,6 +48,9 @@
     stop("each probe must be a function of a single argument")            
 
   datval <- .Call(apply_probe_data,object,probes) # apply probes to data
+  nprobes <- length(datval)
+  if (nprobes > nsim)
+    stop(sQuote("nsim"),"(=",nsim,") should be (much) larger than the number of probes (=",nprobes,")")
     
   obj.fun <- function (par) {
     params[par.est.idx] <- par

Modified: pkg/inst/NEWS
===================================================================
--- pkg/inst/NEWS	2012-02-15 22:58:17 UTC (rev 617)
+++ pkg/inst/NEWS	2012-02-15 23:11:14 UTC (rev 618)
@@ -6,7 +6,7 @@
      o	The 'gillespie.sir' example has been changed to make the reporting rate equal to 'rho'.
      	Before, it was fixed at 10%.
 
-     o	A new error-trap has been put into 'probe' for the case nsim < nprobes.
+     o	A new error-trap has been put into 'probe' and 'probe.match' for the case nsim < nprobes.
      	Thanks to Dani Jonas for finding this error.
 
 0.40-5