[Distr-commits] r813 - in branches/distr-2.4/pkg/distrMod: R man

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

Author: ruckdeschel
Date: 2012-05-20 21:18:58 +0200 (Sun, 20 May 2012)
New Revision: 813

Modified:
   branches/distr-2.4/pkg/distrMod/R/AllReturnClasses.R
   branches/distr-2.4/pkg/distrMod/R/internalMleCalc.R
   branches/distr-2.4/pkg/distrMod/man/0distrMod-package.Rd
   branches/distr-2.4/pkg/distrMod/man/InternalReturnClasses-class.Rd
   branches/distr-2.4/pkg/distrMod/man/internalClassUnions-class.Rd
Log:
distrMod: removed relics of ancient L2Fam-slot withPos (was introduced in a try)

Modified: branches/distr-2.4/pkg/distrMod/R/AllReturnClasses.R
===================================================================
--- branches/distr-2.4/pkg/distrMod/R/AllReturnClasses.R	2012-05-20 18:48:36 UTC (rev 812)
+++ branches/distr-2.4/pkg/distrMod/R/AllReturnClasses.R	2012-05-20 19:18:58 UTC (rev 813)
@@ -28,8 +28,7 @@
           contains = "L2ParamFamily")
 
 ## Gamma family
-setClass("GammaFamily", prototype=prototype(withPos=TRUE),
-          contains = "L2ScaleShapeUnion")
+setClass("GammaFamily", contains = "L2ScaleShapeUnion")
 
 ## Beta family
 setClass("BetaFamily",

Modified: branches/distr-2.4/pkg/distrMod/R/internalMleCalc.R
===================================================================
--- branches/distr-2.4/pkg/distrMod/R/internalMleCalc.R	2012-05-20 18:48:36 UTC (rev 812)
+++ branches/distr-2.4/pkg/distrMod/R/internalMleCalc.R	2012-05-20 19:18:58 UTC (rev 813)
@@ -153,4 +153,4 @@
 
     param0 <- do.call(ParamFamParameter, args = paramCallArgs)
     return(param0)
-}
\ No newline at end of file
+}

Modified: branches/distr-2.4/pkg/distrMod/man/0distrMod-package.Rd
===================================================================
--- branches/distr-2.4/pkg/distrMod/man/0distrMod-package.Rd	2012-05-20 18:48:36 UTC (rev 812)
+++ branches/distr-2.4/pkg/distrMod/man/0distrMod-package.Rd	2012-05-20 19:18:58 UTC (rev 813)
@@ -54,8 +54,6 @@
 additional slots:
 LogDeriv(function)
 |>|>|>|>"L2ScaleShapeUnion"  /VIRTUAL/
-additional slots:
-withPos(logical)
 |>|>|>|>|>"GammaFamily" [*]
 |>|>|>|>"L2LocationScaleUnion"  /VIRTUAL/
 additional slots:

Modified: branches/distr-2.4/pkg/distrMod/man/InternalReturnClasses-class.Rd
===================================================================
--- branches/distr-2.4/pkg/distrMod/man/InternalReturnClasses-class.Rd	2012-05-20 18:48:36 UTC (rev 812)
+++ branches/distr-2.4/pkg/distrMod/man/InternalReturnClasses-class.Rd	2012-05-20 19:18:58 UTC (rev 813)
@@ -21,9 +21,8 @@
 \section{Described classes}{
 In this file we describe classes 
 \code{BinomFamily}, \code{PoisFamily}, \code{GammaFamily},
-\code{BetaFamily} ``extending'' (no new slots!) class \code{L2ParamFamily},
-class \code{GParetoFamily} extending class \code{L2ParamFamily} with
-extra slot \code{withPos},
+\code{BetaFamily}, and class \code{GParetoFamily} ``extending'' (no new slots!)
+class \code{L2ParamFamily} (the latter via \code{L2ScaleShapeUnion}),
 class \code{NormLocationFamily},
 ``extending'' (no new slots!) class \code{"L2LocationFamily"}, classes
 \code{NormScaleFamily}, \code{ExpScaleFamily}, and \code{LnormScaleFamily} 
@@ -105,8 +104,6 @@
       the "standard" parameter value. }
     \item{\code{locscalename}:}{(only loc/scale classes)[inherited from class \code{"L2LocationScaleUnion"}]
       object of class \code{"character"}: names of location and scale parameter. }
-    \item{\code{withPos}:}{(only shape/scale classes)       object of class \code{"logical"}:
-      Is shape restricted to positive values?}
 }}
 
 

Modified: branches/distr-2.4/pkg/distrMod/man/internalClassUnions-class.Rd
===================================================================
--- branches/distr-2.4/pkg/distrMod/man/internalClassUnions-class.Rd	2012-05-20 18:48:36 UTC (rev 812)
+++ branches/distr-2.4/pkg/distrMod/man/internalClassUnions-class.Rd	2012-05-20 19:18:58 UTC (rev 813)
@@ -54,11 +54,7 @@
 \item{\code{"L2ScaleShapeUnion"}}{is a proper, but virtual in-between class
       between class \code{"L2GroupParamFamily"} and, e.g., \code{"GammaFamily"},
       \code{"GParetoFamily"}, and \code{"EVDFamily"} (the latter from
-      extension package \pkg{RobExtremes};
-      in addition to class \code{"L2GroupParamFamily"} it has a slot
-      \code{withPos} (with corresponding accessor and replacement method)
-      to capture the fact that there may or may not be a restriction to
-      positive values for the shape parameter. }
+      extension package \pkg{RobExtremes}. }
 \item{\code{"L2ScaleUnion"}}{is a class union between \code{"L2ScaleShapeUnion"}
       and \code{"L2LocationScaleUnion"} to allow for specific general
       scaling methods. }