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

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

Author: ruckdeschel
Date: 2013-02-28 15:26:43 +0100 (Thu, 28 Feb 2013)
New Revision: 57

Modified:
   branches/robKalman_2012/pkg/robKalman/R/StepFunct.R
Log:
Besprechung mit Bernhard ... -> offene Fragen bearbeitet

Modified: branches/robKalman_2012/pkg/robKalman/R/StepFunct.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/StepFunct.R	2013-02-12 17:08:32 UTC (rev 56)
+++ branches/robKalman_2012/pkg/robKalman/R/StepFunct.R	2013-02-28 14:26:43 UTC (rev 57)
@@ -54,7 +54,8 @@
     ##            returns:    x1, S1, controlPred
     ##  control ... control argument of step function
 
-    predS <- function (i, PredOrFilt, statesEq, controlPred=control, ...)
+    predS.fct <- function (i, PredOrFilt, statesEq, controlPred=control,
+                           whenEvalExo =c("pre"=TRUE,post="TRUE"), ...)
     {
         ##  i ... time index
         ##  PredOrFilt ... object of S4 class 'SSPredOrFilt'
@@ -73,11 +74,15 @@
         exQ <-     # ???
         controlQ <-     # ???
         
+        if(whenEvalExo["pre"]) u <- exofun(...)
+        
         retPredS <- predS(x0=x0, S0=S0, F=F, Q=Q, i=i,
                           v=v, u=u, controlF=controlF,
                           exQ=exQ, controlQ=controlQ,
                           controlPred=controlPred, ...)
 
+        if(whenEvalExo["post"]) u <- exofun(...)
+
         SSPredicted <- new("SSPredicted",
                            values = retPredS$x1,
                            call = call,
@@ -87,7 +92,7 @@
                            diagnostics = list())
         return(SSPredicted)
     }
-    return(new("FunctionWithControl", predS))
+    return(new("FunctionWithControl", predS.fct))
 }
 
 CreateCorr <- function (corrS, control=list())