[Robkalman-commits] r47 - branches/robKalman_2012/pkg/robKalman/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Oct 29 13:36:17 CET 2012
Author: dashunka
Date: 2012-10-29 13:36:16 +0100 (Mon, 29 Oct 2012)
New Revision: 47
Modified:
branches/robKalman_2012/pkg/robKalman/R/Exomethods.R
branches/robKalman_2012/pkg/robKalman/R/Fmethods.R
branches/robKalman_2012/pkg/robKalman/R/Qmethods.R
branches/robKalman_2012/pkg/robKalman/R/SSM-classes.R
branches/robKalman_2012/pkg/robKalman/R/Vmethods.R
branches/robKalman_2012/pkg/robKalman/R/Zmethods.R
branches/robKalman_2012/pkg/robKalman/R/allClass.R
Log:
Tippfehlern in files korrigiert
Modified: branches/robKalman_2012/pkg/robKalman/R/Exomethods.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/Exomethods.R 2012-09-18 11:03:11 UTC (rev 46)
+++ branches/robKalman_2012/pkg/robKalman/R/Exomethods.R 2012-10-29 12:36:16 UTC (rev 47)
@@ -14,7 +14,7 @@
}
return(new("FunctionWithControl",funcExo))
-}
+})
setMethod("createExo", "matrix", function (object) # time-invariant case, linear
{
@@ -32,7 +32,7 @@
}
return(new("FunctionWithControl",funcExo))
-}
+})
setMethod("createExo", "function", function (object) # function case
{
@@ -52,4 +52,4 @@
}
return(new("FunctionWithControl",funcExo))
-}
+})
Modified: branches/robKalman_2012/pkg/robKalman/R/Fmethods.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/Fmethods.R 2012-09-18 11:03:11 UTC (rev 46)
+++ branches/robKalman_2012/pkg/robKalman/R/Fmethods.R 2012-10-29 12:36:16 UTC (rev 47)
@@ -29,7 +29,7 @@
return(retF)
}
return(new("FunctionWithControl",funcF))
-}
+})
setMethod("createF", "matrix", function (object, R = NULL) # time-variant case, linear
{
@@ -59,7 +59,7 @@
return(retF)
}
return(new("FunctionWithControl",funcF))
-}
+})
setMethod("createF", "function", function (object) # function case
{
@@ -90,4 +90,4 @@
# }
return(new("FunctionWithControl",F))
# return(new("FunctionWithControl",funcF))
-}
+})
Modified: branches/robKalman_2012/pkg/robKalman/R/Qmethods.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/Qmethods.R 2012-09-18 11:03:11 UTC (rev 46)
+++ branches/robKalman_2012/pkg/robKalman/R/Qmethods.R 2012-10-29 12:36:16 UTC (rev 47)
@@ -25,7 +25,7 @@
return(new("FunctionWithControl",funcQ))
-}
+})
setMethod("createQ", "matrix", function (object) # time-variant case, linear
{
@@ -53,7 +53,7 @@
return(new("FunctionWithControl",funcQ))
-}
+})
setMethod("createQ", "function", function (object) # time-variant case, linear
@@ -82,4 +82,4 @@
}
return(new("FunctionWithControl",funcQ))
-}
+})
Modified: branches/robKalman_2012/pkg/robKalman/R/SSM-classes.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/SSM-classes.R 2012-09-18 11:03:11 UTC (rev 46)
+++ branches/robKalman_2012/pkg/robKalman/R/SSM-classes.R 2012-10-29 12:36:16 UTC (rev 47)
@@ -1,13 +1,16 @@
SSM <- function(F, Q, Exo.state = NULL, R = NULL, distr.state = NULL,
Z, V, Exo.obs = NULL, T = NULL, distr.obs = NULL,
a0, Sigma0, Exo.ini =NULL, distr.ini = NULL,
- p, q){
+ p, q) {
Exo.state.ret <- if(!is.null(Exo.state)) createExo(Exo.state) else NULL
Exo.obs.ret <- if(!is.null(Exo.obs)) createExo(Exo.obs) else NULL
Exo.ini.ret <- if(!is.null(Exo.ini)) createExo(Exo.ini) else NULL
- Fret <- createF(F,R, Exo.state.ret)
- Zret <- createZ(Z,T, Exo.state.obs)
+ Fret <- createF(F,R)
+ Zret <- createZ(Z,T)
+
+# Fret <- createF(F,R, Exo.state.ret)
+# Zret <- createZ(Z,T, Exo.state.obs)
Qret <- createQ(Q)
Vret <- createV(V)
@@ -15,7 +18,7 @@
obsEq <- new("SSobsEq", Zfct=Zret, Vfct=Vret, Exofct = Exo.obs.ret, distrfct = distr.obs)
initEq <- new("SSinitEq", a0=a0, Sigma0=Sigma0, Exofct = Exo.ini.ret, distrfct = distr.ini)
- return(new("SSM",initEq = initEq, statesEq = stateEq, obsEq = obsEq, p = p, q = q)
+ return(new("SSM",initEq = initEq, statesEq = stateEq, obsEq = obsEq, p = p, q = q))
}
setMethod("statesEq", "SSM", function(object) object at statesEq)
Modified: branches/robKalman_2012/pkg/robKalman/R/Vmethods.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/Vmethods.R 2012-09-18 11:03:11 UTC (rev 46)
+++ branches/robKalman_2012/pkg/robKalman/R/Vmethods.R 2012-10-29 12:36:16 UTC (rev 47)
@@ -25,7 +25,7 @@
return(new("FunctionWithControl",funcV))
-}
+})
setMethod("createV", "matrix", function (object) # time-variant case, linear
{
@@ -53,7 +53,7 @@
return(new("FunctionWithControl",funcV))
-}
+})
setMethod("createV", "function", function (object) # time-variant case, linear
@@ -83,4 +83,4 @@
return(new("FunctionWithControl",funcV))
-}
+})
Modified: branches/robKalman_2012/pkg/robKalman/R/Zmethods.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/Zmethods.R 2012-09-18 11:03:11 UTC (rev 46)
+++ branches/robKalman_2012/pkg/robKalman/R/Zmethods.R 2012-10-29 12:36:16 UTC (rev 47)
@@ -30,7 +30,7 @@
}
return(new("FunctionWithControl",funcZ))
-}
+})
setMethod("createZ", "matrix", function (object, T = NULL) # time-variant case, linear
{
@@ -62,7 +62,7 @@
}
return(new("FunctionWithControl",funcZ))
-}
+})
setMethod("createZ", "function", function (object) # function case
{
@@ -92,4 +92,4 @@
}
return(new("FunctionWithControl",funcZ))
-}
+})
Modified: branches/robKalman_2012/pkg/robKalman/R/allClass.R
===================================================================
--- branches/robKalman_2012/pkg/robKalman/R/allClass.R 2012-09-18 11:03:11 UTC (rev 46)
+++ branches/robKalman_2012/pkg/robKalman/R/allClass.R 2012-10-29 12:36:16 UTC (rev 47)
@@ -47,27 +47,27 @@
Qfct = "FunctionWithControl",
muqfct = "OptionalFunction",
Exofct = "OptionalFunctionWithControl",
- distrfct = "OptionalFunctionWithControl"))
+ distrfct = "OptionalFunctionWithControl")
)
setClass("SSobsEq",
representation = representation(Zfct = "FunctionWithControl",
Vfct = "FunctionWithControl",
muvfct = "OptionalFunction",
Exofct = "OptionalFunctionWithControl",
- distrfct = "OptionalFunctionWithControl"))
+ distrfct = "OptionalFunctionWithControl")
)
setClass("SSinitEq",
representation = representation(a0 = "numeric",
Sigma0 = "matrix",
Exofct = "OptionalFunctionWithControl",
- distrfct = "OptionalDistribution"))
+ distrfct = "OptionalDistribution")
)
setClass("SSM",
representation = representation(initEq = "SSinitEq",
statesEq = "SSstateEq",
obsEq = "SSobsEq",
- pdim = "numeric", qdim = "numeric"))
+ pdim = "numeric", qdim = "numeric")
)
setClass("SStimes", representation = representation(times = "numeric",
inX = "logical"))
@@ -144,14 +144,14 @@
c("SSSmoothed","NULL")
)
-setClass("SSInput", representation = representation(steps = "SSClassOrRobFilter"
+setClass("SSInput", representation = representation(steps = "SSClassOrRobFilter",
model = "SSM",
obs = "SSObs",
times = "SStimes"))
setClass("SSOutput", representation = representation(pred.cl = "SSPredicted",
filt.cl = "SSFiltered",
- prep.cl = "OptionalSSPrepared"
+ prep.cl = "OptionalSSPrepared",
smooth.cl = "OptionalSSSmoothed",
pred.rob = "OptionalSSPredicted",
filt.rob = "OptionalSSFiltered",
@@ -172,7 +172,7 @@
## vorgesehen; Erzeugung in Generating Function, sodass alle Anforderungen
## "passen"
-setClass("SSContSimulation", representation = representation(SimList = "SSSimList")
+setClass("SSContSimulation", representation = representation(SimList = "SSSimList"),
contains = "SSSimulation")
setClass("SSretValueF", representation = representation(x1 = "numeric",
More information about the Robkalman-commits
mailing list