[Distr-commits] r129 - in pkg: distr/chm distrMod/R

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

Author: ruckdeschel
Date: 2008-05-06 14:42:15 +0200 (Tue, 06 May 2008)
New Revision: 129

Modified:
   pkg/distr/chm/00Index.html
   pkg/distr/chm/Beta-class.html
   pkg/distr/chm/Distr.chm
   pkg/distr/chm/Distr.toc
   pkg/distr/chm/operators-methods.html
   pkg/distrMod/R/MLEstimator.R
Log:
----------------
pkg distrMod 
----------------
allow S3 class "Estimate" as starting estimator
(argument "par") for MLE ... 


Modified: pkg/distr/chm/00Index.html
===================================================================
--- pkg/distr/chm/00Index.html	2008-05-06 12:17:10 UTC (rev 128)
+++ pkg/distr/chm/00Index.html	2008-05-06 12:42:15 UTC (rev 129)
@@ -169,6 +169,8 @@
 <td>Methods for operators +,-,*,/ in Package distr</td></tr>
 <tr><td width="25%"><a href="operators-methods.html">-,Norm,missing-method</a></td>
 <td>Methods for operators +,-,*,/ in Package distr</td></tr>
+<tr><td width="25%"><a href="operators-methods.html">-,numeric,Beta-method</a></td>
+<td>Methods for operators +,-,*,/ in Package distr</td></tr>
 <tr><td width="25%"><a href="operators-methods.html">-,numeric,UnivariateDistribution-method</a></td>
 <td>Methods for operators +,-,*,/ in Package distr</td></tr>
 <tr><td width="25%"><a href="operators-methods.html">-,UnivariateDistribution,missing-method</a></td>

Modified: pkg/distr/chm/Beta-class.html
===================================================================
--- pkg/distr/chm/Beta-class.html	2008-05-06 12:17:10 UTC (rev 128)
+++ pkg/distr/chm/Beta-class.html	2008-05-06 12:42:15 UTC (rev 129)
@@ -82,6 +82,9 @@
 returns the slot shape2 of the parameter of the distribution</dd>
 <dt>shape2&lt;-</dt><dd><code>signature(object = "Beta")</code>:
 modifies the slot shape2 of the parameter of the distribution</dd>
+<dt><code>-</code></dt><dd><code>signature(e1 = "numeric", e2 = "Beta")</code> if <code>ncp(e2)==0</code> and <code>e1 == 1</code>,
+an exact (central) <code>Beta(shape1 = shape2(e2), shape2 = shape1(e2))</code> is returned, else
+the default method is used; exact</dd>
 </dl>
 
 <h3>Note</h3>

Modified: pkg/distr/chm/Distr.chm
===================================================================
(Binary files differ)

Modified: pkg/distr/chm/Distr.toc
===================================================================
--- pkg/distr/chm/Distr.toc	2008-05-06 12:17:10 UTC (rev 128)
+++ pkg/distr/chm/Distr.toc	2008-05-06 12:42:15 UTC (rev 129)
@@ -250,6 +250,10 @@
 <param name="Local" value="operators-methods.html">
 </OBJECT>
 <LI> <OBJECT type="text/sitemap">
+<param name="Name" value="-,numeric,Beta-method">
+<param name="Local" value="operators-methods.html">
+</OBJECT>
+<LI> <OBJECT type="text/sitemap">
 <param name="Name" value="-,numeric,UnivariateDistribution-method">
 <param name="Local" value="operators-methods.html">
 </OBJECT>

Modified: pkg/distr/chm/operators-methods.html
===================================================================
--- pkg/distr/chm/operators-methods.html	2008-05-06 12:17:10 UTC (rev 128)
+++ pkg/distr/chm/operators-methods.html	2008-05-06 12:42:15 UTC (rev 129)
@@ -66,6 +66,7 @@
 <param name="keyword" value="R:   +,Logis,numeric-method">
 <param name="keyword" value="R:   +,Dirac,UnivariateDistribution-method">
 <param name="keyword" value="R:   +,UnivariateDistribution,Dirac-method">
+<param name="keyword" value="R:   -,numeric,Beta-method">
 <param name="keyword" value="R:   -,Dirac,Dirac-method">
 <param name="keyword" value="R:   *,Dirac,Dirac-method">
 <param name="keyword" value="R:   *,Dirac,UnivariateDistribution-method">
@@ -144,6 +145,9 @@
 <dt><code>-</code></dt><dd><code>signature(e1 = "UnivariateDistribution", e2 = "numeric")</code> is translated to 
 <code>e1 + (-e2)</code>; exact</dd>
 <dt><code>-</code></dt><dd><code>signature(e1 = "numeric", e2 = "UnivariateDistribution")</code> is translated to <code>(-e1) + e2</code>; exact</dd>
+<dt><code>-</code></dt><dd><code>signature(e1 = "numeric", e2 = "Beta")</code> if <code>ncp(e2)==0</code> and <code>e1 == 1</code>,
+an exact (central) <code>Beta(shape1 = shape2(e2), shape2 = shape1(e2))</code> is returned, else
+the default method is used; exact</dd>
 <dt><code>*</code></dt><dd><code>signature(e1 = "UnivariateDistribution", e2 = "numeric")</code> result again of class <code>"UnivariateDistribution"</code>; exact</dd>
 <dt><code>*</code></dt><dd><code>signature(e1 = "AbscontDistribution", e2 = "numeric")</code> result of 
 class <code>"AffLinAbscontDistribution"</code>; exact</dd>

Modified: pkg/distrMod/R/MLEstimator.R
===================================================================
--- pkg/distrMod/R/MLEstimator.R	2008-05-06 12:17:10 UTC (rev 128)
+++ pkg/distrMod/R/MLEstimator.R	2008-05-06 12:42:15 UTC (rev 129)
@@ -28,6 +28,7 @@
         return(res)
     }
 
+    if(is(par,"Estimate")) par <- par$estimate
     res <- MCEstimator(x = x, ParamFamily = ParamFamily, criterion = negLoglikelihood,
                 interval = interval, par = par, ...)
     names(res$criterion) <- "negative log-likelihood"