[Yuima-commits] r575 - in pkg/yuima: . R

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

Author: iacus
Date: 2017-01-23 06:17:46 +0100 (Mon, 23 Jan 2017)
New Revision: 575

Modified:
   pkg/yuima/DESCRIPTION
   pkg/yuima/R/CPoint.R
Log:
fixed qmleR,qmleL

Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2017-01-23 00:35:30 UTC (rev 574)
+++ pkg/yuima/DESCRIPTION	2017-01-23 05:17:46 UTC (rev 575)
@@ -1,7 +1,7 @@
 Package: yuima
 Type: Package
 Title: The YUIMA Project Package for SDEs
-Version: 1.5.1
+Version: 1.5.2
 Depends: R(>= 2.10.0), methods, zoo, stats4, utils, expm, cubature, mvtnorm
 Imports: Rcpp (>= 0.12.1)
 Author: YUIMA Project Team

Modified: pkg/yuima/R/CPoint.R
===================================================================
--- pkg/yuima/R/CPoint.R	2017-01-23 00:35:30 UTC (rev 574)
+++ pkg/yuima/R/CPoint.R	2017-01-23 05:17:46 UTC (rev 575)
@@ -1,39 +1,37 @@
 qmleL <- function(yuima, t, ...){
-	
-
+    call <- match.call()
 	times <- time(yuima at data@zoo.data[[1]])
 	minT <- as.numeric(times[1])
 	maxT <- as.numeric(times[length(times)])
-	
 	if(missing(t) )
 	 t <- mean(c(minT,maxT))
-
 	if(t<minT || t>maxT)
 	  yuima.stop("time 't' out of bounds")
 	grid <- times[which(times<=t)]
-	qmle(subsampling(yuima, grid=grid), ...)
+    tmp <- subsampling(yuima, grid=grid)
+    mydots <- as.list(call)[-1]
+    mydots$t <- NULL
+    do.call(qmle, args=mydots)
 }
 
-qmleR <- function(yuima, t, ...){
-	
-	
-	times <- time(yuima at data@zoo.data[[1]])
-	minT <- as.numeric(times[1])
-	maxT <- as.numeric(times[length(times)])
-	
-	if(missing(t) )
-	t <- mean(c(minT,maxT))
-	
-	if(t<minT || t>maxT)
-	 yuima.stop("time 't' out of bounds")
-	grid <- times[which(times>=t)]
-	qmle(subsampling(yuima, grid=grid), ...)
+qmleR <- function (yuima, t, ...)
+{
+    call <- match.call()
+    times <- time(yuima at data@zoo.data[[1]])
+    minT <- as.numeric(times[1])
+    maxT <- as.numeric(times[length(times)])
+    if (missing(t))
+    t <- mean(c(minT, maxT))
+    if (t < minT || t > maxT)
+    yuima.stop("time 't' out of bounds")
+    grid <- times[which(times >= t)]
+    tmp <- subsampling(yuima, grid = grid)
+    mydots <- as.list(call)[-1]
+    mydots$t <- NULL
+    do.call(qmle, args=mydots)
 }
 
 
-
-
-
 CPointOld <- function(yuima, param1, param2, print=FALSE, plot=FALSE){
 	d.size <- yuima at model@equation.number
 	n <- length(yuima)[1]