[Distr-commits] r235 - in branches/distr-2.0/pkg/distrMod: . R man

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

Author: stamats
Date: 2008-08-04 12:56:32 +0200 (Mon, 04 Aug 2008)
New Revision: 235

Modified:
   branches/distr-2.0/pkg/distrMod/NAMESPACE
   branches/distr-2.0/pkg/distrMod/R/AllClass.R
   branches/distr-2.0/pkg/distrMod/man/Estimate-class.Rd
   branches/distr-2.0/pkg/distrMod/man/internalClassUnions-class.Rd
Log:
OptionalMatrix already defined in package distr, renamed OptionalMatrix to OptionalNumericOrMatrix in package distrMod.

Modified: branches/distr-2.0/pkg/distrMod/NAMESPACE
===================================================================
--- branches/distr-2.0/pkg/distrMod/NAMESPACE	2008-08-04 08:01:56 UTC (rev 234)
+++ branches/distr-2.0/pkg/distrMod/NAMESPACE	2008-08-04 10:56:32 UTC (rev 235)
@@ -5,7 +5,7 @@
 import("RandVar")
 
 exportClasses("OptionalNumeric","MatrixorFunction",
-              "OptionalMatrix", "ShowDetails",
+              "OptionalNumericOrMatrix", "ShowDetails",
               "PosSemDefSymmMatrix",
               "PosDefSymmMatrix",
               "Symmetry", "DistributionSymmetry",

Modified: branches/distr-2.0/pkg/distrMod/R/AllClass.R
===================================================================
--- branches/distr-2.0/pkg/distrMod/R/AllClass.R	2008-08-04 08:01:56 UTC (rev 234)
+++ branches/distr-2.0/pkg/distrMod/R/AllClass.R	2008-08-04 10:56:32 UTC (rev 235)
@@ -46,7 +46,7 @@
 ## matrix or function or NULL -- a class for trafo's
 setClassUnion("MatrixorFunction", c("matrix", "OptionalFunction"))
 ## matrix, numeric or NULL -- a class for covariance slots
-setClassUnion("OptionalMatrix", c("OptionalNumeric", "NULL"))
+setClassUnion("OptionalNumericOrMatrix", c("OptionalNumeric", "matrix"))
 
 ################################
 ##
@@ -412,13 +412,13 @@
          representation(name = "character",
                         estimate = "ANY",
                         samplesize = "numeric",
-                        asvar = "OptionalMatrix",
+                        asvar = "OptionalNumericOrMatrix",
                         Infos = "matrix",
                         estimate.call = "call",
                         nuis.idx = "OptionalNumeric",
                         trafo = "list",
                         untransformed.estimate = "ANY",
-                        untransformed.asvar = "OptionalMatrix"),
+                        untransformed.asvar = "OptionalNumericOrMatrix"),
          prototype(name = "Estimate",
                    estimate = numeric(0),
                    samplesize = numeric(0),

Modified: branches/distr-2.0/pkg/distrMod/man/Estimate-class.Rd
===================================================================
--- branches/distr-2.0/pkg/distrMod/man/Estimate-class.Rd	2008-08-04 08:01:56 UTC (rev 234)
+++ branches/distr-2.0/pkg/distrMod/man/Estimate-class.Rd	2008-08-04 10:56:32 UTC (rev 235)
@@ -46,7 +46,7 @@
     \item{\code{Infos}:}{ object of class \code{"matrix"}
       with two columns named \code{method} and \code{message}:
       additional informations. }
-    \item{\code{asvar}:}{ object of class \code{"OptionalMatrix"}
+    \item{\code{asvar}:}{ object of class \code{"OptionalNumericOrMatrix"}
       which may contain the asymptotic (co)variance of the estimator. }
     \item{\code{samplesize}:}{ object of class \code{"numeric"} ---
       the samplesize at which the estimate was evaluated. }
@@ -54,7 +54,7 @@
      indices of \code{estimate} belonging to the nuisance part}
     \item{\code{untransformed.estimate}:}{Object of class \code{"ANY"}:
       untransformed estimate.}
-    \item{\code{untransformed.asvar}:}{ object of class \code{"OptionalMatrix"}
+    \item{\code{untransformed.asvar}:}{ object of class \code{"OptionalNumericOrMatrix"}
       which may contain the asymptotic (co)variance of the untransformed 
       estimator. }
   }

Modified: branches/distr-2.0/pkg/distrMod/man/internalClassUnions-class.Rd
===================================================================
--- branches/distr-2.0/pkg/distrMod/man/internalClassUnions-class.Rd	2008-08-04 08:01:56 UTC (rev 234)
+++ branches/distr-2.0/pkg/distrMod/man/internalClassUnions-class.Rd	2008-08-04 10:56:32 UTC (rev 235)
@@ -2,7 +2,7 @@
 \docType{class}
 \alias{InternalClassUnions}
 \alias{OptionalNumeric-class}
-\alias{OptionalMatrix-class}
+\alias{OptionalNumericOrMatrix-class}
 \alias{MatrixorFunction-class}
 \alias{ShowDetails-class}
 
@@ -21,7 +21,7 @@
       or \code{"NULL"}; it is used e.g. for slot \code{nuisance} of class
       \code{"ParamFamParameter"}, as it may or may not be present but if so
       it has to be numeric.}
-\item{\code{"OptionalMatrix"}}{may contain objects of class  
+\item{\code{"OptionalNumericOrMatrix"}}{may contain objects of class  
       \code{"OptionalNumeric"} or \code{"matrix"}; it is used e.g. for 
        slot \code{asvar} of class \code{"Estimate"}, as it may or may not be 
        present but if so it has to be a number (numeric) or a matrix.}