[Robkalman-commits] r65 - branches/robKalman_2012/pkg/robKalman/R

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

Author: ruckdeschel
Date: 2013-04-23 12:16:41 +0200 (Tue, 23 Apr 2013)
New Revision: 65

Modified:
   branches/robKalman_2012/pkg/robKalman/R/Fmethods.R
   branches/robKalman_2012/pkg/robKalman/R/Vmethods.R
Log:
Vmethods gain y argument
Fmethods: comment on delayed evaluation instead of list(...)


Modified: branches/robKalman_2012/pkg/robKalman/R/Fmethods.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/Fmethods.R	2013-04-23 08:05:48 UTC (rev 64)
+++ branches/robKalman_2012/pkg/robKalman/R/Fmethods.R	2013-04-23 10:16:41 UTC (rev 65)
@@ -10,7 +10,15 @@
     if (is.null(R)) {
         R <- diag(nrow(F))
     }
-
+    #
+    #############################################
+    ## delayed evaluation? zB
+    ## funcF(.....,Hallo=rnorm(10))
+    ### evtl. andere Mglkeit:
+    ## mc <- match.call(expand.dots=FALSE)
+    ## dots.p <- as.list(mc)$"..."
+    #############################################
+    #
     dots.propagated <- list(...)
     
     funcF <- function (i, t, x0, v=rep(0, ncol(R)),

Modified: branches/robKalman_2012/pkg/robKalman/R/Vmethods.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/Vmethods.R	2013-04-23 08:05:48 UTC (rev 64)
+++ branches/robKalman_2012/pkg/robKalman/R/Vmethods.R	2013-04-23 10:16:41 UTC (rev 65)
@@ -8,7 +8,7 @@
 
     dots.propagated <- list(...)
 
-    funcV <- function(i, t, x1,
+    funcV <- function(i, t, x1, y,
                       control=controlV,
                       dots=dots.propagated)
     {
@@ -21,7 +21,7 @@
 
         retV <- new("SSretValueV",
                     V = V, t = t,
-                    x1 = x1, 
+                    x1 = x1, y = y,
                     control = control,
                     dots.propagated = dots, call = call,
                     diagnostics = new("SSDiagnosticRetValue"))
@@ -41,7 +41,7 @@
 
     dots.propagated <- list(...)
 
-    funcV <- function(i, t, x1,
+    funcV <- function(i, t, x1, y,
                       control=controlV,
                       dots=dots.propagated)
     {
@@ -54,7 +54,7 @@
 
         retV <- new("SSretValueV",
                     V = V[, , i, drop=TRUE], t = t,
-                    x1 = x1, 
+                    x1 = x1, y = y,
                     control = control, 
                     dots.propagated = dots, call = call,
                     diagnostics = new("SSDiagnosticRetValue"))
@@ -70,7 +70,7 @@
 ##  V ... function, V(t, ...)
     V <- object
 
-    funcV <- function(i=NULL, t, x1=0, control=NULL, dots=NULL)
+    funcV <- function(i=NULL, t, x1=0, y = 0, control=NULL, dots=NULL)
     {
     ##  i ... loop index
     ##  t ... time, t[i]
@@ -79,13 +79,13 @@
     ##  dots ... additional parameters, list
         call <- match.call()
 
-        ret0 <- V(i=i, t=t, x1=x1,
+        ret0 <- V(i=i, t=t, x1=x1, y = y,
                   control=control, dots=dots)
         if (is(ret0, "SSretValueV")) return(ret0)
 
         retV <- new("SSretValueV",
                     V = ret0$V, t = t,
-                    x1 = x1, 
+                    x1 = x1, y = y,
                     control=control,
                     dots.propagated = dots, call = call,
                     diagnostics = new("SSDiagnosticRetValue"))