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

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

Author: ruckdeschel
Date: 2014-04-16 17:29:40 +0200 (Wed, 16 Apr 2014)
New Revision: 74

Modified:
   branches/robKalman_2012/pkg/robKalman/R/allClass.R
   branches/robKalman_2012/pkg/robKalman/R/recFilter4.R
Log:
Sitzung 16.4. committed

Modified: branches/robKalman_2012/pkg/robKalman/R/allClass.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/allClass.R	2014-04-16 12:56:02 UTC (rev 73)
+++ branches/robKalman_2012/pkg/robKalman/R/allClass.R	2014-04-16 15:29:40 UTC (rev 74)
@@ -185,11 +185,15 @@
          )
 
 setClass("SSStateSimulated",
-         contains = "SSPredOrFilt"
+         contains = "SSPredOrFiltRet"
          )
 setClass("SSObsSimulated",
-         contains = "SSPredOrFilt"
+         contains = "SSPredOrFiltRet"
          )
+setClass("SSSimulated",
+         representation = representation(stateSimulated = "SSStateSimulated",
+                                         obsSimulated = "SSObsSimulated")
+         )
 
 setClass("SSInitialized",
          contains = "SSPredOrFilt"

Modified: branches/robKalman_2012/pkg/robKalman/R/recFilter4.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/recFilter4.R	2014-04-16 12:56:02 UTC (rev 73)
+++ branches/robKalman_2012/pkg/robKalman/R/recFilter4.R	2014-04-16 15:29:40 UTC (rev 74)
@@ -7,7 +7,8 @@
 #######################################################
 
 
-     initPsRet <- function(SSM,tt, exos){
+     initPsRet <- function(SSM,tt, exosDim ){
+        ###exosDim ist die Dimensionierung der Rueckgabewerte der exoFct
 
         if modell has uexo uexos = matrix(...) else uexos = NULL
         psret0 <- new("SSPredictedRet",