[Distr-commits] r845 - in branches/distr-2.4/pkg/distrRmetrics: . R

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

Author: stamats
Date: 2013-01-10 07:33:14 +0100 (Thu, 10 Jan 2013)
New Revision: 845

Modified:
   branches/distr-2.4/pkg/distrRmetrics/DESCRIPTION
   branches/distr-2.4/pkg/distrRmetrics/NAMESPACE
   branches/distr-2.4/pkg/distrRmetrics/R/AllClasses.R
   branches/distr-2.4/pkg/distrRmetrics/R/fGarchDistr.R
Log:
some corrections but still error in R CMD check

Modified: branches/distr-2.4/pkg/distrRmetrics/DESCRIPTION
===================================================================
--- branches/distr-2.4/pkg/distrRmetrics/DESCRIPTION	2013-01-10 06:19:39 UTC (rev 844)
+++ branches/distr-2.4/pkg/distrRmetrics/DESCRIPTION	2013-01-10 06:33:14 UTC (rev 845)
@@ -2,7 +2,7 @@
 Version: 2.4
 Date: 2012-09-13
 Title: Package distr classes for distributions from Rmetrics
-Depends: R(>= 2.6.0), methods, distr(>= 2.4), fBasics(>=270.73), fGarch(>=270.73)
+Depends: R(>= 2.6.0), methods, startupmsg, distr(>= 2.4), fBasics(>= 270.73), fGarch(>= 270.73)
 Suggests: distrEx(>= 2.4), distrMod(>= 2.4)
 Author: Nataliya Horbenko, Matthias Kohl, Daria Pupashenko, Myhailo Pupashenko, Peter Ruckdeschel
 Description: (S4-)distribution classes based on package distr for distributions from packages fBasics and fGarch

Modified: branches/distr-2.4/pkg/distrRmetrics/NAMESPACE
===================================================================
--- branches/distr-2.4/pkg/distrRmetrics/NAMESPACE	2013-01-10 06:19:39 UTC (rev 844)
+++ branches/distr-2.4/pkg/distrRmetrics/NAMESPACE	2013-01-10 06:33:14 UTC (rev 845)
@@ -4,7 +4,7 @@
 import("fBasics")
 import("fGarch")
 
-exportClasses("SNormParameter", "SStdParameter", "SNorm", "SSTd")
+exportClasses("SNormParameter", "SSTdParameter", "SNorm", "SSTd")
 export("SNorm", "SSTd")
 exportMethods("xi","mean","sd","nu")
 exportMethods("xi<-","mean<-","sd<-","nu<-")

Modified: branches/distr-2.4/pkg/distrRmetrics/R/AllClasses.R
===================================================================
--- branches/distr-2.4/pkg/distrRmetrics/R/AllClasses.R	2013-01-10 06:19:39 UTC (rev 844)
+++ branches/distr-2.4/pkg/distrRmetrics/R/AllClasses.R	2013-01-10 06:33:14 UTC (rev 845)
@@ -23,7 +23,7 @@
           )
 
 ## Class: STParameter
-setClass("SSTParameter",
+setClass("SSTdParameter",
           representation = representation(mean = "numeric", sd = "vector", nu="numeric", xi="numeric"),
           prototype = prototype(mean = 0, sd = 1, nu=5, xi=1.5, name =
                       gettext("Parameter of a Skewed-T-distribution")

Modified: branches/distr-2.4/pkg/distrRmetrics/R/fGarchDistr.R
===================================================================
--- branches/distr-2.4/pkg/distrRmetrics/R/fGarchDistr.R	2013-01-10 06:19:39 UTC (rev 844)
+++ branches/distr-2.4/pkg/distrRmetrics/R/fGarchDistr.R	2013-01-10 06:33:14 UTC (rev 845)
@@ -46,9 +46,9 @@
 setMethod("xi", signature(x = "SSTdParameter"), function(x, ...) x at xi)
 setMethod("nu", signature(x = "SSTdParameter"), function(x, ...) x at nu)
 ## wrapped access methods
-setMethod("mean", "SNorm", function(x, ...) mean(param(x)))
-setMethod("mean", "SSTd", function(x, ...) mean(param(x)))
-setMethod("sd", signature(x = "Norm"), function(x) sd(param(x)))
+setMethod("mean", signature(x = "SNorm"), function(x, ...) mean(param(x)))
+setMethod("mean", signature(x = "SSTd"), function(x, ...) mean(param(x)))
+setMethod("sd", signature(x = "SNorm"), function(x) sd(param(x)))
 setMethod("sd", signature(x = "SSTd"), function(x) sd(param(x)))
 setMethod("xi", signature(x = "SNorm"), function(x, ...) x at param@xi)
 setMethod("xi", signature(x = "SSTd"), function(x, ...) x at param@xi)