[Distr-commits] r335 - in pkg: distr/R distrEx/chm
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Nov 18 11:22:35 CET 2008
Author: ruckdeschel
Date: 2008-11-18 11:22:35 +0100 (Tue, 18 Nov 2008)
New Revision: 335
Modified:
pkg/distr/R/ExpOrdGammaOrChisq.R
pkg/distr/R/LognormalDistribution.R
pkg/distrEx/chm/00Index.html
pkg/distrEx/chm/0distrEx-package.html
pkg/distrEx/chm/Var.html
pkg/distrEx/chm/distrEx.chm
Log:
Patch to bug with AffLinAbscontDistribution
Modified: pkg/distr/R/ExpOrdGammaOrChisq.R
===================================================================
--- pkg/distr/R/ExpOrdGammaOrChisq.R 2008-11-18 09:28:12 UTC (rev 334)
+++ pkg/distr/R/ExpOrdGammaOrChisq.R 2008-11-18 10:22:35 UTC (rev 335)
@@ -2,16 +2,19 @@
setMethod("*", c("ExpOrGammaOrChisq","numeric"),
function(e1, e2){
- if(is(e1,"Gammad"))
- {if(isTRUE(all.equal(e2,0)))
- return(new("Dirac", location = 0, .withArith = TRUE))
- if(e2 > 0)
- return(new("Gammad", shape = shape(e1),
- scale = scale(e1) * e2, .withArith = TRUE))
- return(-1 * as(Gammad(shape = shape(e1),
- scale = scale(e1) * (-e2)),
- "AbscontDistribution"))}
- else return(as(e1,"AbscontDistribution") * e2)
+ if(is(e1,"Gammad")){
+ if(isTRUE(all.equal(e2,0)))
+ return(new("Dirac", location = 0, .withArith = TRUE))
+ if(e2 > 0)
+ return(new("Gammad", shape = shape(e1),
+ scale = scale(e1) * e2, .withArith = TRUE))
+ return(getMethod("*",c("AbscontDistribution","numeric"))(
+ e1 = Gammad(shape = shape(e1),
+ scale = scale(e1) * (-e2)),
+ e2 = -1))
+ }
+ else return(getMethod("*",
+ c("AbscontDistribution","numeric"))(e1, e2) )
})
setMethod("+", c("ExpOrGammaOrChisq","ExpOrGammaOrChisq"),
Modified: pkg/distr/R/LognormalDistribution.R
===================================================================
--- pkg/distr/R/LognormalDistribution.R 2008-11-18 09:28:12 UTC (rev 334)
+++ pkg/distr/R/LognormalDistribution.R 2008-11-18 10:22:35 UTC (rev 335)
@@ -54,5 +54,6 @@
if(e2 > 0)
return(nL)
else
- return(-1 * as(nL, "AbscontDistribution"))
+ return(getMethod("*", c("AbscontDistribution","numeric"))(e1,e2))
+ #return(-1 * as(nL, "AbscontDistribution"))
})
Modified: pkg/distrEx/chm/00Index.html
===================================================================
--- pkg/distrEx/chm/00Index.html 2008-11-18 09:28:12 UTC (rev 334)
+++ pkg/distrEx/chm/00Index.html 2008-11-18 10:22:35 UTC (rev 335)
@@ -10,7 +10,7 @@
<param name="keyword" value=".. contents">
</object>
-<h2>Help pages for package ‘distrEx’ version 2.0.2</h2>
+<h2>Help pages for package ‘distrEx’ version 2.0.3</h2>
<p align="center">
<a href="#"></a>
Modified: pkg/distrEx/chm/0distrEx-package.html
===================================================================
--- pkg/distrEx/chm/0distrEx-package.html 2008-11-18 09:28:12 UTC (rev 334)
+++ pkg/distrEx/chm/0distrEx-package.html 2008-11-18 10:22:35 UTC (rev 335)
@@ -45,7 +45,7 @@
<td align="left"> Version: </td> <td align="left"> 2.0.2 </td>
</tr>
<tr>
- <td align="left"> Date: </td> <td align="left"> 2008-10-30 </td>
+ <td align="left"> Date: </td> <td align="left"> 2008-11-05 </td>
</tr>
<tr>
<td align="left"> Depends: </td> <td align="left"> R(>= 2.6.0), methods, distr(>= 2.0), evd, startupmsg</td>
@@ -307,6 +307,6 @@
</script>
-<hr><div align="center">[Package <em>distrEx</em> version 2.0.2 <a href="00Index.html">Index]</a></div>
+<hr><div align="center">[Package <em>distrEx</em> version 2.0.3 <a href="00Index.html">Index]</a></div>
</body></html>
Modified: pkg/distrEx/chm/Var.html
===================================================================
--- pkg/distrEx/chm/Var.html 2008-11-18 09:28:12 UTC (rev 334)
+++ pkg/distrEx/chm/Var.html 2008-11-18 10:22:35 UTC (rev 335)
@@ -460,13 +460,15 @@
<dt><code>mad</code>, <code>signature(x = "AffLinDistribution")</code>:</dt><dd><code>abs(x at a) * mad(x at X0)</code></dd>
-<dt><code>skewness</code>, <code>signature(x = "Any")</code>:</dt><dd>interface to the <span class="pkg">e1071</span>-function <code>skewness</code> — see <code><a onclick="findlink('e1071', 'skewness.html')" style="text-decoration: underline; color: blue; cursor: hand">skewness</a></code>.</dd>
+<dt><code>skewness</code>, <code>signature(x = "Any")</code>:</dt><dd>bias free estimation of skewness under normal distribution (default) as
+well as sample version (by argument <code>sample.version = TRUE</code>).</dd>
<dt><code>skewness</code>, <code>signature(x = "UnivariateDistribution")</code>:</dt><dd>skewness of univariate distributions using corresponding <code>E()</code>-method.</dd>
<dt><code>skewness</code>, <code>signature(x = "AffLinDistribution")</code>:</dt><dd>if arguments <code>fun</code>, <code>cond</code> are missing: <code>skewness(x at X0)</code>
else uses method for <code>signature(x = "UnivariateDistribution")</code></dd>
-<dt><code>kurtosis</code>, <code>signature(x = "Any")</code>:</dt><dd>interface to the <span class="pkg">e1071</span>-function <code>kurtosis</code> — see <code><a onclick="findlink('e1071', 'kurtosis.html')" style="text-decoration: underline; color: blue; cursor: hand">kurtosis</a></code>.</dd>
+<dt><code>kurtosis</code>, <code>signature(x = "Any")</code>:</dt><dd>bias free estimation of kurtosis under normal distribution (default) as
+well as sample version (by argument <code>sample.version = TRUE</code>).</dd>
<dt><code>kurtosis</code>, <code>signature(x = "UnivariateDistribution")</code>:</dt><dd>kurtosis of univariate distributions using corresponding <code>E()</code>-method.</dd>
<dt><code>kurtosis</code>, <code>signature(x = "AffLinDistribution")</code>:</dt><dd>if arguments <code>fun</code>, <code>cond</code> are missing: <code>kurtosis(x at X0)</code>
else uses method for <code>signature(x = "UnivariateDistribution")</code></dd>
@@ -607,8 +609,7 @@
<code><a href="distrExIntegrate.html">distrExIntegrate</a></code>, <code><a href="m1df.html">m1df</a></code>, <code><a href="m2df.html">m2df</a></code>,
<code><a onclick="findlink('distr', 'Distribution-class.html')" style="text-decoration: underline; color: blue; cursor: hand">Distribution-class</a></code>,<br>
<code><a onclick="findlink('stats', 'sd.html')" style="text-decoration: underline; color: blue; cursor: hand">sd</a></code>, <code><a onclick="findlink('stats', 'var.html')" style="text-decoration: underline; color: blue; cursor: hand">var</a></code>, <code><a onclick="findlink('stats', 'IQR.html')" style="text-decoration: underline; color: blue; cursor: hand">IQR</a></code>,<br>
-<code><a onclick="findlink('stats', 'median.html')" style="text-decoration: underline; color: blue; cursor: hand">median</a></code>, <code><a onclick="findlink('stats', 'mad.html')" style="text-decoration: underline; color: blue; cursor: hand">mad</a></code>, <code><a onclick="findlink('distr', 'sd.html')" style="text-decoration: underline; color: blue; cursor: hand">sd</a></code>,<br>
-<code><a onclick="findlink('e1071', 'skewness.html')" style="text-decoration: underline; color: blue; cursor: hand">skewness</a></code>, <code><a onclick="findlink('e1071', 'kurtosis.html')" style="text-decoration: underline; color: blue; cursor: hand">kurtosis</a></code>
+<code><a onclick="findlink('stats', 'median.html')" style="text-decoration: underline; color: blue; cursor: hand">median</a></code>, <code><a onclick="findlink('stats', 'mad.html')" style="text-decoration: underline; color: blue; cursor: hand">mad</a></code>, <code><a onclick="findlink('distr', 'sd.html')" style="text-decoration: underline; color: blue; cursor: hand">sd</a></code>
</p>
@@ -646,6 +647,6 @@
</script>
-<hr><div align="center">[Package <em>distrEx</em> version 2.0 <a href="00Index.html">Index]</a></div>
+<hr><div align="center">[Package <em>distrEx</em> version 2.0.3 <a href="00Index.html">Index]</a></div>
</body></html>
Modified: pkg/distrEx/chm/distrEx.chm
===================================================================
(Binary files differ)
More information about the Distr-commits
mailing list