[Distr-commits] r486 - branches/distr-2.2/pkg branches/distr-2.2/pkg/SweaveListingUtils/R branches/distr-2.2/pkg/distr/chm branches/distr-2.2/pkg/distr/inst/doc branches/distr-2.2/pkg/distrEllipse branches/distr-2.2/pkg/distrEllipse/R branches/distr-2.2/pkg/distrEllipse/chm branches/distr-2.2/pkg/distrEllipse/inst branches/distr-2.2/pkg/distrEllipse/man branches/distr-2.2/pkg/distrEx/chm branches/distr-2.2/pkg/distrMod/R branches/distr-2.2/pkg/distrMod/chm branches/distr-2.2/pkg/distrSim/chm branches/distr-2.2/pkg/distrTEst/chm pkg/distr pkg/distr/chm pkg/distr/inst/doc pkg/distrEx/chm pkg/distrEx/src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Jun 29 18:17:16 CEST 2009
Author: ruckdeschel
Date: 2009-06-29 18:17:12 +0200 (Mon, 29 Jun 2009)
New Revision: 486
Added:
branches/distr-2.2/pkg/distrEllipse/
branches/distr-2.2/pkg/distrEllipse/DESCRIPTION
branches/distr-2.2/pkg/distrEllipse/NAMESPACE
branches/distr-2.2/pkg/distrEllipse/R/
branches/distr-2.2/pkg/distrEllipse/R/01.R
branches/distr-2.2/pkg/distrEllipse/R/AllClasses.R
branches/distr-2.2/pkg/distrEllipse/R/AllGenerics.R
branches/distr-2.2/pkg/distrEllipse/R/AllShow.R
branches/distr-2.2/pkg/distrEllipse/R/EllipticalDistribution.R
branches/distr-2.2/pkg/distrEllipse/R/MVMixingDistribution.R
branches/distr-2.2/pkg/distrEllipse/R/MVNorm.R
branches/distr-2.2/pkg/distrEllipse/R/MVt.R
branches/distr-2.2/pkg/distrEllipse/R/MultivariateDistrList.R
branches/distr-2.2/pkg/distrEllipse/R/SphericalDistribution.R
branches/distr-2.2/pkg/distrEllipse/R/distrEllipseOptions.R
branches/distr-2.2/pkg/distrEllipse/chm/
branches/distr-2.2/pkg/distrEllipse/chm/00Index.html
branches/distr-2.2/pkg/distrEllipse/chm/0distrEllipse-package.html
branches/distr-2.2/pkg/distrEllipse/chm/EllipticalDistribution-class.html
branches/distr-2.2/pkg/distrEllipse/chm/EllipticalDistribution.html
branches/distr-2.2/pkg/distrEllipse/chm/EllipticalParameter-class.html
branches/distr-2.2/pkg/distrEllipse/chm/MultivarDistrList-class.html
branches/distr-2.2/pkg/distrEllipse/chm/MultivarDistrList.html
branches/distr-2.2/pkg/distrEllipse/chm/MultivarMixingDistribution-class.html
branches/distr-2.2/pkg/distrEllipse/chm/MultivarMixingDistribution.html
branches/distr-2.2/pkg/distrEllipse/chm/MvnormDistribution-class.html
branches/distr-2.2/pkg/distrEllipse/chm/MvnormDistribution.html
branches/distr-2.2/pkg/distrEllipse/chm/MvnormParameter-class.html
branches/distr-2.2/pkg/distrEllipse/chm/MvtDistribution-class.html
branches/distr-2.2/pkg/distrEllipse/chm/MvtDistribution.html
branches/distr-2.2/pkg/distrEllipse/chm/MvtParameter-class.html
branches/distr-2.2/pkg/distrEllipse/chm/SphericalDistribution-class.html
branches/distr-2.2/pkg/distrEllipse/chm/SphericalDistribution.html
branches/distr-2.2/pkg/distrEllipse/chm/distrEllipse.chm
branches/distr-2.2/pkg/distrEllipse/chm/distrEllipse.hhp
branches/distr-2.2/pkg/distrEllipse/chm/distrEllipse.toc
branches/distr-2.2/pkg/distrEllipse/chm/distrEllipseMASK.html
branches/distr-2.2/pkg/distrEllipse/chm/distrEllipseoptions.html
branches/distr-2.2/pkg/distrEllipse/chm/logo.jpg
branches/distr-2.2/pkg/distrEllipse/chm/plot-methods.html
branches/distr-2.2/pkg/distrEllipse/inst/
branches/distr-2.2/pkg/distrEllipse/inst/CITATION
branches/distr-2.2/pkg/distrEllipse/inst/MASKING
branches/distr-2.2/pkg/distrEllipse/inst/NEWS
branches/distr-2.2/pkg/distrEllipse/man/
branches/distr-2.2/pkg/distrEllipse/man/0distrEllipse-package.Rd
branches/distr-2.2/pkg/distrEllipse/man/EllipticalDistribution-class.Rd
branches/distr-2.2/pkg/distrEllipse/man/EllipticalDistribution.Rd
branches/distr-2.2/pkg/distrEllipse/man/EllipticalParameter-class.Rd
branches/distr-2.2/pkg/distrEllipse/man/MultivarDistrList-class.Rd
branches/distr-2.2/pkg/distrEllipse/man/MultivarDistrList.Rd
branches/distr-2.2/pkg/distrEllipse/man/MultivarMixingDistribution-class.Rd
branches/distr-2.2/pkg/distrEllipse/man/MultivarMixingDistribution.Rd
branches/distr-2.2/pkg/distrEllipse/man/MvnormDistribution-class.Rd
branches/distr-2.2/pkg/distrEllipse/man/MvnormDistribution.Rd
branches/distr-2.2/pkg/distrEllipse/man/MvnormParameter-class.Rd
branches/distr-2.2/pkg/distrEllipse/man/MvtDistribution-class.Rd
branches/distr-2.2/pkg/distrEllipse/man/MvtDistribution.Rd
branches/distr-2.2/pkg/distrEllipse/man/MvtParameter-class.Rd
branches/distr-2.2/pkg/distrEllipse/man/SphericalDistribution-class.Rd
branches/distr-2.2/pkg/distrEllipse/man/SphericalDistribution.Rd
branches/distr-2.2/pkg/distrEllipse/man/distrEllipseMASK.Rd
branches/distr-2.2/pkg/distrEllipse/man/distrEllipseoptions.Rd
branches/distr-2.2/pkg/distrEllipse/man/plot-methods.Rd
Modified:
branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingOptions.R
branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R
branches/distr-2.2/pkg/distr/chm/Distr.chm
branches/distr-2.2/pkg/distr/chm/Unif-class.html
branches/distr-2.2/pkg/distr/chm/plot-methods.html
branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf
branches/distr-2.2/pkg/distr/inst/doc/newDistributions.pdf
branches/distr-2.2/pkg/distrEx/chm/distrEx.chm
branches/distr-2.2/pkg/distrMod/R/mleCalc-methods.R
branches/distr-2.2/pkg/distrMod/chm/0distrMod-package.html
branches/distr-2.2/pkg/distrMod/chm/Estimate-class.html
branches/distr-2.2/pkg/distrMod/chm/asSemivar-class.html
branches/distr-2.2/pkg/distrMod/chm/distrMod.chm
branches/distr-2.2/pkg/distrMod/chm/distrMod.hhp
branches/distr-2.2/pkg/distrSim/chm/00Index.html
branches/distr-2.2/pkg/distrSim/chm/0distrSim-package.html
branches/distr-2.2/pkg/distrSim/chm/Contsimulation-class.html
branches/distr-2.2/pkg/distrSim/chm/Data-methods.html
branches/distr-2.2/pkg/distrSim/chm/Data.c-methods.html
branches/distr-2.2/pkg/distrSim/chm/Data.id-methods.html
branches/distr-2.2/pkg/distrSim/chm/Dataclass-class.html
branches/distr-2.2/pkg/distrSim/chm/Dataclass.html
branches/distr-2.2/pkg/distrSim/chm/SeqDataFrame-class.html
branches/distr-2.2/pkg/distrSim/chm/Simulation-class.html
branches/distr-2.2/pkg/distrSim/chm/cload.html
branches/distr-2.2/pkg/distrSim/chm/distrSim.chm
branches/distr-2.2/pkg/distrSim/chm/distrSimMASK.html
branches/distr-2.2/pkg/distrSim/chm/distrSimOptions.html
branches/distr-2.2/pkg/distrSim/chm/distribution-methods.html
branches/distr-2.2/pkg/distrSim/chm/distribution.c-methods.html
branches/distr-2.2/pkg/distrSim/chm/distribution.id-methods.html
branches/distr-2.2/pkg/distrSim/chm/filename-methods.html
branches/distr-2.2/pkg/distrSim/chm/ind-methods.html
branches/distr-2.2/pkg/distrSim/chm/name-methods.html
branches/distr-2.2/pkg/distrSim/chm/obsDim-methods.html
branches/distr-2.2/pkg/distrSim/chm/plot-methods.html
branches/distr-2.2/pkg/distrSim/chm/print-methods.html
branches/distr-2.2/pkg/distrSim/chm/rate-methods.html
branches/distr-2.2/pkg/distrSim/chm/runs-methods.html
branches/distr-2.2/pkg/distrSim/chm/samplesize-methods.html
branches/distr-2.2/pkg/distrSim/chm/savedata-methods.html
branches/distr-2.2/pkg/distrSim/chm/seed-methods.html
branches/distr-2.2/pkg/distrSim/chm/simulate-methods.html
branches/distr-2.2/pkg/distrSim/chm/subsetting-methods.html
branches/distr-2.2/pkg/distrSim/chm/summary-methods.html
branches/distr-2.2/pkg/distrSim/chm/vectororNULL-class.html
branches/distr-2.2/pkg/distrSim/chm/versionmanagement.html
branches/distr-2.2/pkg/distrTEst/chm/00Index.html
branches/distr-2.2/pkg/distrTEst/chm/0distrTEst-package.html
branches/distr-2.2/pkg/distrTEst/chm/Data-methods.html
branches/distr-2.2/pkg/distrTEst/chm/Evaluation-class.html
branches/distr-2.2/pkg/distrTEst/chm/EvaluationList-class.html
branches/distr-2.2/pkg/distrTEst/chm/call.ev-methods.html
branches/distr-2.2/pkg/distrTEst/chm/distrTEst-internals.html
branches/distr-2.2/pkg/distrTEst/chm/distrTEst.chm
branches/distr-2.2/pkg/distrTEst/chm/distrTEstOptions.html
branches/distr-2.2/pkg/distrTEst/chm/estimator-methods.html
branches/distr-2.2/pkg/distrTEst/chm/evaluate-methods.html
branches/distr-2.2/pkg/distrTEst/chm/filename-methods.html
branches/distr-2.2/pkg/distrTEst/chm/name-methods.html
branches/distr-2.2/pkg/distrTEst/chm/numericorNULL-class.html
branches/distr-2.2/pkg/distrTEst/chm/plot-methods.html
branches/distr-2.2/pkg/distrTEst/chm/print-methods.html
branches/distr-2.2/pkg/distrTEst/chm/result-methods.html
branches/distr-2.2/pkg/distrTEst/chm/savedata-methods.html
branches/distr-2.2/pkg/distrTEst/chm/summary-methods.html
pkg/distr/DESCRIPTION
pkg/distr/chm/00Index.html
pkg/distr/chm/Distr.chm
pkg/distr/chm/Unif-class.html
pkg/distr/inst/doc/Rplots.pdf
pkg/distr/inst/doc/newDistributions.pdf
pkg/distrEx/chm/distrEx.chm
pkg/distrEx/chm/distrExConstants.html
pkg/distrEx/src/distrEx.dll
Log:
+new chm files for distrSim, distrMod, distr...
+first version of package distrEllipse (does not yet check error-free!)
Modified: branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingOptions.R
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingOptions.R 2009-06-29 07:55:32 UTC (rev 485)
+++ branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingOptions.R 2009-06-29 16:17:12 UTC (rev 486)
@@ -12,7 +12,7 @@
"literate" = paste("{<-}{{$\\leftarrow$}}2",
"{<<-}{{$\\twoheadleftarrow$}}2",#"%\n",
"{~}{{$\\sim$}}1", "{<=}{{$\\leq$}}2",#"%\n",
- "{>=}{{$\\geq$}}2", "{^}{{$\\wedge$}}1", sep=""),
+ "{>=}{{$\\geq$}}2", "{^}{{$\\scriptstyle\\wedge$}}1", sep=""),
## ~,^,<=, >= as suggested by Frank Harrell
"alsoother" = "{$}", "alsoletter" = "{.<-}",
"otherkeywords" = "{!,!=,~,$,*,\\&,\\%/\\%,\\%*\\%,\\%\\%,<-,<<-,/}"
Modified: branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R 2009-06-29 07:55:32 UTC (rev 485)
+++ branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R 2009-06-29 16:17:12 UTC (rev 486)
@@ -193,6 +193,7 @@
cat(line)
lstsetLanguage()
cat(line,"%\n%\n",sep="")
+cat("\n")
return(invisible())
}
Modified: branches/distr-2.2/pkg/distr/chm/Distr.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/distr/chm/Unif-class.html
===================================================================
--- branches/distr-2.2/pkg/distr/chm/Unif-class.html 2009-06-29 07:55:32 UTC (rev 485)
+++ branches/distr-2.2/pkg/distr/chm/Unif-class.html 2009-06-29 16:17:12 UTC (rev 486)
@@ -36,10 +36,6 @@
<h3>Slots</h3>
<dl>
-<dt>*</dt><dd><code>signature(e1 = "Unif", e2 = "numeric")</code>: multiplication of this uniform distribution by an object of
-class `numeric'</dd>
-<dt>+</dt><dd><code>signature(e1 = "Unif", e2 = "numeric")</code>: addition of this uniform distribution to an object of class
-`numeric'</dd>
<dt><code>img</code>:</dt><dd>Object of class <code>"Reals"</code>: The space of the image of this distribution has got dimension 1
and the name "Real Space". </dd>
<dt><code>param</code>:</dt><dd>Object of class <code>"UnifParameter"</code>: the parameter of this distribution (Min and Max),
@@ -87,8 +83,10 @@
<dt>Min<-</dt><dd><code>signature(object = "Unif")</code>: modifies the slot <code>Min</code> of the parameter of the distribution </dd>
<dt>Max</dt><dd><code>signature(object = "Unif")</code>: returns the slot <code>Max</code> of the parameter of the distribution </dd>
<dt>Max<-</dt><dd><code>signature(object = "Unif")</code>: modifies the slot <code>Max</code> of the parameter of the distribution </dd>
-<dt>*</dt><dd><code>signature(e1 = "Unif", e2 = "numeric")</code>:
-For the uniform distribution we use its closedness under scaling transformations.</dd>
+<dt>*</dt><dd><code>signature(e1 = "Unif", e2 = "numeric")</code>: multiplication of this uniform distribution
+by an object of class `numeric'</dd>
+<dt>+</dt><dd><code>signature(e1 = "Unif", e2 = "numeric")</code>: addition of this uniform distribution
+to an object of class `numeric'</dd>
</dl>
<h3>Author(s)</h3>
Modified: branches/distr-2.2/pkg/distr/chm/plot-methods.html
===================================================================
--- branches/distr-2.2/pkg/distr/chm/plot-methods.html 2009-06-29 07:55:32 UTC (rev 485)
+++ branches/distr-2.2/pkg/distr/chm/plot-methods.html 2009-06-29 16:17:12 UTC (rev 486)
@@ -145,43 +145,43 @@
<tr valign="top"><td><code>verticals</code></td>
<td>
logical: if <code>TRUE</code>, draw vertical lines at steps;
-as in <code><a onclick="findlink('stats', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
+as in <code><a onclick="findlink('graphics', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
<tr valign="top"><td><code>do.points</code></td>
<td>
logical: if <code>TRUE</code>, draw also draw points at the
(<code>xlim</code> restricted) knot locations; as
-in <code><a onclick="findlink('stats', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
+in <code><a onclick="findlink('graphics', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
<tr valign="top"><td><code>cex.points</code></td>
<td>
numeric; character expansion factor; as in
-<code><a onclick="findlink('stats', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
+<code><a onclick="findlink('graphics', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
<tr valign="top"><td><code>col.points</code></td>
<td>
character or integer code; color of points; as in
-<code><a onclick="findlink('stats', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
+<code><a onclick="findlink('graphics', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
<tr valign="top"><td><code>col.hor</code></td>
<td>
character or integer code; color of horizontal lines; as in
-<code><a onclick="findlink('stats', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
+<code><a onclick="findlink('graphics', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
<tr valign="top"><td><code>col.vert</code></td>
<td>
character or integer code; color of vertical lines; as in
-<code><a onclick="findlink('stats', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
+<code><a onclick="findlink('graphics', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code></td></tr>
<tr valign="top"><td><code>cex.main</code></td>
<td>
magnification to be used for main titles relative
to the current setting of <code>cex</code>; as in
-<code><a onclick="findlink('stats', 'par.html')" style="text-decoration: underline; color: blue; cursor: hand">par</a></code></td></tr>
+<code><a onclick="findlink('graphics', 'par.html')" style="text-decoration: underline; color: blue; cursor: hand">par</a></code></td></tr>
<tr valign="top"><td><code>cex.inner</code></td>
<td>
magnification to be used for inner titles relative
to the current setting of <code>cex</code>; as in
-<code><a onclick="findlink('stats', 'par.html')" style="text-decoration: underline; color: blue; cursor: hand">par</a></code></td></tr>
+<code><a onclick="findlink('graphics', 'par.html')" style="text-decoration: underline; color: blue; cursor: hand">par</a></code></td></tr>
<tr valign="top"><td><code>cex.sub</code></td>
<td>
magnification to be used for sub titles relative
to the current setting of <code>cex</code>; as in
-<code><a onclick="findlink('stats', 'par.html')" style="text-decoration: underline; color: blue; cursor: hand">par</a></code></td></tr>
+<code><a onclick="findlink('graphics', 'par.html')" style="text-decoration: underline; color: blue; cursor: hand">par</a></code></td></tr>
<tr valign="top"><td><code>col.main</code></td>
<td>
character or integer code; color for the main title</td></tr>
@@ -194,11 +194,11 @@
<tr valign="top"><td><code>pch.u</code></td>
<td>
character or integer code; plotting characters or symbols for
-unattained value; see <code><a onclick="findlink('stats', 'points.html')" style="text-decoration: underline; color: blue; cursor: hand">points</a></code></td></tr>
+unattained value; see <code><a onclick="findlink('graphics', 'points.html')" style="text-decoration: underline; color: blue; cursor: hand">points</a></code></td></tr>
<tr valign="top"><td><code>pch.a</code></td>
<td>
character or integer code; plotting characters or symbols for
-attained value; see <code><a onclick="findlink('stats', 'points.html')" style="text-decoration: underline; color: blue; cursor: hand">points</a></code></td></tr>
+attained value; see <code><a onclick="findlink('graphics', 'points.html')" style="text-decoration: underline; color: blue; cursor: hand">points</a></code></td></tr>
<tr valign="top"><td><code>mfColRow</code></td>
<td>
shall default partition in panels be used — defaults to <code>TRUE</code></td></tr>
@@ -219,9 +219,9 @@
<tr valign="top"><td><code>...</code></td>
<td>
addtional arguments for <code>plot</code> — see
-<code><a onclick="findlink('stats', 'plot.html')" style="text-decoration: underline; color: blue; cursor: hand">plot</a></code>,
-<code><a onclick="findlink('stats', 'plot.default.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.default</a></code>,
-<code><a onclick="findlink('stats', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code> </td></tr>
+<code><a onclick="findlink('graphics', 'plot.html')" style="text-decoration: underline; color: blue; cursor: hand">plot</a></code>,
+<code><a onclick="findlink('graphics', 'plot.default.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.default</a></code>,
+<code><a onclick="findlink('graphics', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code> </td></tr>
</table>
<h3>Details</h3>
@@ -294,8 +294,8 @@
<h3>See Also</h3>
<p>
-<code><a onclick="findlink('stats', 'plot.html')" style="text-decoration: underline; color: blue; cursor: hand">plot</a></code>,<code><a onclick="findlink('stats', 'plot.default.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.default</a></code>,
-<code><a onclick="findlink('stats', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code>, <code><a onclick="findlink('stats', 'par.html')" style="text-decoration: underline; color: blue; cursor: hand">par</a></code>
+<code><a onclick="findlink('graphics', 'plot.html')" style="text-decoration: underline; color: blue; cursor: hand">plot</a></code>,<code><a onclick="findlink('graphics', 'plot.default.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.default</a></code>,
+<code><a onclick="findlink('graphics', 'plot.stepfun.html')" style="text-decoration: underline; color: blue; cursor: hand">plot.stepfun</a></code>, <code><a onclick="findlink('graphics', 'par.html')" style="text-decoration: underline; color: blue; cursor: hand">par</a></code>
</p>
Modified: branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf
===================================================================
--- branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf 2009-06-29 07:55:32 UTC (rev 485)
+++ branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf 2009-06-29 16:17:12 UTC (rev 486)
@@ -2,8 +2,8 @@
%âãÏÓ\r
1 0 obj
<<
-/CreationDate (D:20090515175123)
-/ModDate (D:20090515175123)
+/CreationDate (D:20090617063417)
+/ModDate (D:20090617063417)
/Title (R Graphics Output)
/Producer (R 2.10.0)
/Creator (R)
@@ -47,7 +47,7 @@
38.97 172.78 m 148.04 172.78 l S
38.97 227.22 m 148.04 227.22 l S
38.97 281.66 m 148.04 281.66 l S
-38.97 336.09 m 148.04 336.09 l S
+38.97 336.10 m 148.04 336.10 l S
38.97 390.53 m 148.04 390.53 l S
38.97 444.97 m 148.04 444.97 l S
0.000 0.000 0.000 RG
@@ -275,7 +275,7 @@
65.15 74.45 l
65.25 74.75 l
65.35 75.05 l
-65.45 75.37 l
+65.45 75.36 l
65.55 75.68 l
65.65 76.01 l
65.75 76.34 l
@@ -315,7 +315,7 @@
69.19 93.26 l
69.29 93.95 l
69.39 94.66 l
-69.49 95.37 l
+69.49 95.38 l
69.59 96.11 l
69.70 96.85 l
69.80 97.61 l
@@ -359,7 +359,7 @@
73.64 137.89 l
73.74 139.28 l
73.84 140.68 l
-73.94 142.10 l
+73.94 142.11 l
74.04 143.55 l
74.14 145.01 l
74.25 146.48 l
@@ -382,14 +382,14 @@
75.96 174.31 l
76.06 176.11 l
76.17 177.92 l
-76.27 179.75 l
+76.27 179.74 l
76.37 181.59 l
76.47 183.45 l
76.57 185.33 l
76.67 187.23 l
76.77 189.14 l
76.87 191.06 l
-76.97 193.01 l
+76.97 193.00 l
77.08 194.96 l
77.18 196.94 l
77.28 198.93 l
@@ -407,7 +407,7 @@
78.49 223.93 l
78.59 226.10 l
78.69 228.28 l
-78.79 230.48 l
+78.79 230.47 l
78.90 232.68 l
79.00 234.90 l
79.10 237.12 l
@@ -416,7 +416,7 @@
79.40 243.87 l
79.50 246.13 l
79.60 248.41 l
-79.70 250.69 l
+79.70 250.70 l
79.81 252.99 l
79.91 255.29 l
80.01 257.60 l
@@ -424,7 +424,7 @@
80.21 262.24 l
80.31 264.57 l
80.41 266.90 l
-80.51 269.24 l
+80.51 269.25 l
80.61 271.59 l
80.72 273.94 l
80.82 276.30 l
@@ -453,7 +453,7 @@
83.14 330.60 l
83.24 332.92 l
83.34 335.23 l
-83.44 337.52 l
+83.44 337.53 l
83.55 339.82 l
83.65 342.10 l
83.75 344.37 l
@@ -483,7 +483,7 @@
86.17 394.40 l
86.28 396.24 l
86.38 398.05 l
-86.48 399.85 l
+86.48 399.84 l
86.58 401.61 l
86.68 403.36 l
86.78 405.07 l
@@ -556,7 +556,7 @@
93.55 443.69 l
93.66 443.01 l
93.76 442.29 l
-93.86 441.53 l
+93.86 441.54 l
93.96 440.74 l
94.06 439.92 l
94.16 439.06 l
@@ -579,7 +579,7 @@
95.88 419.32 l
95.98 417.88 l
96.08 416.41 l
-96.18 414.92 l
+96.18 414.91 l
96.28 413.39 l
96.39 411.84 l
96.49 410.26 l
@@ -603,7 +603,7 @@
98.31 377.79 l
98.41 375.79 l
98.51 373.78 l
-98.61 371.75 l
+98.61 371.74 l
98.71 369.70 l
98.81 367.63 l
98.91 365.56 l
@@ -657,19 +657,19 @@
103.77 257.93 l
103.87 255.72 l
103.97 253.51 l
-104.07 251.31 l
+104.07 251.30 l
104.17 249.11 l
104.27 246.93 l
104.37 244.75 l
104.47 242.58 l
104.57 240.43 l
104.68 238.28 l
-104.78 236.15 l
+104.78 236.14 l
104.88 234.02 l
104.98 231.90 l
105.08 229.80 l
105.18 227.71 l
-105.28 225.63 l
+105.28 225.62 l
105.38 223.56 l
105.48 221.50 l
105.59 219.45 l
@@ -682,12 +682,12 @@
106.29 205.49 l
106.39 203.55 l
106.49 201.63 l
-106.60 199.72 l
+106.60 199.71 l
106.70 197.82 l
-106.80 195.93 l
+106.80 195.94 l
106.90 194.07 l
107.00 192.21 l
-107.10 190.37 l
+107.10 190.38 l
107.20 188.55 l
107.30 186.74 l
107.40 184.95 l
@@ -734,7 +734,7 @@
111.55 125.21 l
111.65 124.09 l
111.75 122.99 l
-111.85 121.90 l
+111.85 121.89 l
111.95 120.82 l
112.06 119.76 l
112.16 118.71 l
@@ -1093,7 +1093,7 @@
38.97 172.78 m 34.21 172.78 l S
38.97 227.22 m 34.21 227.22 l S
38.97 281.66 m 34.21 281.66 l S
-38.97 336.09 m 34.21 336.09 l S
+38.97 336.10 m 34.21 336.10 l S
38.97 390.53 m 34.21 390.53 l S
38.97 444.97 m 34.21 444.97 l S
BT
Modified: branches/distr-2.2/pkg/distr/inst/doc/newDistributions.pdf
===================================================================
(Binary files differ)
Added: branches/distr-2.2/pkg/distrEllipse/DESCRIPTION
===================================================================
--- branches/distr-2.2/pkg/distrEllipse/DESCRIPTION (rev 0)
+++ branches/distr-2.2/pkg/distrEllipse/DESCRIPTION 2009-06-29 16:17:12 UTC (rev 486)
@@ -0,0 +1,14 @@
+Package: distrEllipse
+Version: 0.1
+Date: 2009-03-26
+Title: S4 classes for elliptically contoured distributions
+Depends: R(>= 2.8.0), methods, graphics, mvtnorm, setRNG(>= 2006.2-1), distr(>= 2.2), distrEx(>= 2.2), distrSim(>= 2.2), startupmsg
+Suggests: distrMod(>= 2.2), distrTEst(>= 2.2)
+Author: Peter Ruckdeschel
+Description: Distribution (S4-)classes for elliptically contoured distributions (based on package distr)
+Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
+LazyLoad: yes
+License: LGPL-3
+URL: http://distr.r-forge.r-project.org/
+LastChangedDate: {$LastChangedDate: 2009-03-31 15:31:30 +0200 (Di, 31 Mrz 2009) $}
+LastChangedRevision: {$LastChangedRevision: 447 $}
Added: branches/distr-2.2/pkg/distrEllipse/NAMESPACE
===================================================================
--- branches/distr-2.2/pkg/distrEllipse/NAMESPACE (rev 0)
+++ branches/distr-2.2/pkg/distrEllipse/NAMESPACE 2009-06-29 16:17:12 UTC (rev 486)
@@ -0,0 +1,25 @@
+import("methods")
+importFrom("stats", "simulate")
+importFrom("setRNG", "setRNG")
+import("mvtnorm")
+import("distr")
+import("distrEx")
+import("distrSim")
+import("startupmsg")
+
+export("SphericalDistribution", "EllipticalDistribution",
+ "MVNorm", "MVt", "MultivarDistrList",
+ "MultivarMixingDistribution",
+ "distrEllipseoptions", "getdistrEllipseOption",
+ "distrEllipseMASK")
+exportClasses("EllipticalParameter",
+ "MVNormParameter", "MVtParameter",
+ "SphericalDistribution", "EllipticalDistribution",
+ "MVNormDistribution", "MVtDistribution",
+ "MultivarDistrList","MultivarMixingDistribution")
+exportMethods("dimension", "radDistr", "scale", "location",
+ "radDistr<-", "scale<-", "location<-",
+ "plot.rd", "r.rd", "d.rd", "p.rd", "q.rd",
+ "E", "var", "mean", "sigma","mixCoeff", "mixDistr")
+exportMethods("plot", "show", "showobj", "Symmetry")
+exportMethods("+", "*", "%*%")
Added: branches/distr-2.2/pkg/distrEllipse/R/01.R
===================================================================
--- branches/distr-2.2/pkg/distrEllipse/R/01.R (rev 0)
+++ branches/distr-2.2/pkg/distrEllipse/R/01.R 2009-06-29 16:17:12 UTC (rev 486)
@@ -0,0 +1,30 @@
+.onLoad <- function(lib, pkg){
+ require("methods", character = TRUE, quietly = TRUE)
+ require("distrEx")
+ require("distrSim")
+ require(setRNG)
+}
+
+
+.distrEllipseoptions <- list(
+ ## nothing up to now...
+ )
+
+
+.onAttach <- function(library, pkg)
+{
+ unlockBinding(".distrEllipseoptions", asNamespace("distrEllipse"))
+ msga <- gettext(
+ "Some functions from package 'stats' are intentionally masked ---see distrEllipseMASK().\n"
+ )
+ buildStartupMessage(pkg="distrEllipse", msga, packageHelp=TRUE, library=library,
+ # MANUAL="http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf",
+ VIGNETTE = gettext("Package \"distrDoc\" provides a vignette to this package as well as to several related packages; try vignette(\"distr\")."))
+###
+ invisible()
+}
+
+distrEllipseMASK <- function(library = NULL)
+{
+ infoShow(pkg = "distrEllipse", filename="MASKING", library = library)
+}
Added: branches/distr-2.2/pkg/distrEllipse/R/AllClasses.R
===================================================================
--- branches/distr-2.2/pkg/distrEllipse/R/AllClasses.R (rev 0)
+++ branches/distr-2.2/pkg/distrEllipse/R/AllClasses.R 2009-06-29 16:17:12 UTC (rev 486)
@@ -0,0 +1,161 @@
+################################################################################
+#
+# Parameter Classes
+#
+################################################################################
+
+
+################################################################################
+# parameter of Elliptical distribution
+################################################################################
+
+setClass("EllipticalParameter", representation(loc = "numeric",
+ scale = "matrix"),
+ prototype(name =
+ gettext("parameter of an elliptically symmetric distribution"),
+ loc=c(0,0), scale = diag(2)),
+ contains = "Parameter",
+ validity = function(object){
+ dim0 <- length(object at loc)
+ if(!nrow(object at scale)==dim0) stop("wrong dimensions")
+ else return(TRUE)
+ })
+
+################################################################################
+# parameter of MV norm distribution
+################################################################################
+setClass("MVNormParameter",
+ contains = "EllipticalParameter")
+
+################################################################################
+# parameter of MV norm distribution
+################################################################################
+setClass("MVtParameter",
+ representation(df = "numeric", ncp = "numeric"),
+ prototype(name = gettext("parameter of multivariate t distribution"),
+ ncp = 0, df = 1),
+ contains = "EllipticalParameter",
+ validity = function(object){
+ dim0 <- length(object at loc)
+ if(!distr:::.isNatural(object at df)) stop("'df' must be an integer")
+ if(!length(object at ncp)==1) stop("wrong dimension for ncp")
+ if(!nrow(object at scale)==dim0) stop("wrong dimensions")
+ else return(TRUE)
+ })
+
+################################################################################
+#
+# Distribution Classes
+#
+################################################################################
+
+
+################################################################################
+# spherically symmetric distributions
+################################################################################
+setClass("SphericalDistribution",
+ representation = representation(radDistr="UnivariateDistribution",
+ Symmetry = "EllipticalSymmetry"),
+ prototype = prototype(r = function(n) matrix(rnorm(2*n),ncol=2),
+ d = function(x, log = FALSE){
+ r2 <- sum(x^2)
+ lg <- -p/2*log(2*pi)-r2/2;
+ return(if(log) lg else exp(lg))},
+ radDistr = sqrt(Chisq(df=2)),
+ Symmetry = SphericalSymmetry(0)),
+ contains = "MultivariateDistribution")
+
+################################################################################
+# elliptically symmetric distributions
+################################################################################
+
+setClass("EllipticalDistribution",
+ prototype = prototype(param = new("EllipticalParameter")),
+ contains = "SphericalDistribution")
+
+################################################################################
+# Multivariate Normal
+################################################################################
+setClass("MVNormDistribution",
+ prototype = prototype(
+ r = function(n){rmvnorm(n, mean = c(0,0), sigma = diag(2))},
+ d = function(x, log = FALSE){dmvnorm(x, mean = c(0,0), sigma = diag(2), log = log)},
+ p = function(lower=-Inf, upper=Inf){
+ pmvnorm(lower=lower, upper=upper, mean = c(0,0), sigma = diag(2))},
+ q = function(p, interval = c(-10, 10), tail = c("lower.tail",
+ "upper.tail", "both.tails")){
+ qmvnorm(p = p, interval = interval, tail = tail,
+ mean = c(0,0), sigma = diag(2))},
+ param = new("MVNormParameter",
+ name = gettext("parameter of multivariate normal distribution"))),
+ contains = "EllipticalDistribution")
+
+################################################################################
+# Multivariate T
+################################################################################
+
+setClass("MVtDistribution",
+ prototype = prototype(
+ r = function(n){rmvt(n)},
+ d = function(x, log = FALSE){dmvt(x, delta=0, sigma = diag(2), log = log)},
+ p = function(lower=-Inf, upper=Inf){
+ pmvt(lower=lower, upper=upper, delta=0, df=1, sigma = diag(2))},
+ q = function(p, interval = c(-10, 10), tail = c("lower.tail",
+ "upper.tail", "both.tails")){
+ qmvt(p = p, interval = interval, tail = tail, df = 1, delta = 0,
+ sigma = diag(2))},
+ param = new("MVtParameter")),
+ contains = "EllipticalDistribution")
+
+################################
+##
+## Distribution List classes
+##
+################################
+
+setClass("MultivarDistrList",
+ prototype = prototype(list(new("MVNormDistribution"))),
+ contains = "DistrList",
+ validity = function(object){
+ nrvalues <- length(object)
+ dim0 <- object[[1]]@img at dimension
+ for(i in 1:nrvalues){
+ if(!is(object[[i]], "MultivariateDistribution"))
+ stop("Element ", i, " is no 'MultivariateDistribution'")
+ if(!object[[i]]@img at dimension==dim0)
+ stop("Dimension mismatch in element ", i, ".")
+ }
+ return(TRUE)
+ })
+
+
+################################
+##
+## Mixing Distribution classes
+##
+################################
+
+setClass("MultivarMixingDistribution",
+ representation = representation(mixCoeff = "numeric",
+ mixDistr = "MultivarDistrList",
+ Symmetry = "DistributionSymmetry",
+ .withArith = "logical",
+ .withSim = "logical",
+ .logExact = "logical",
+ .lowerExact = "logical"
+ ),
+ prototype = prototype(mixCoeff = 1,
+ mixDistr = new("MultivarDistrList"),
+ Symmetry = new("NoSymmetry"),
+ .withArith = FALSE,
+ .withSim = FALSE,
+ .logExact = TRUE,
+ .lowerExact = TRUE
+ ),
+ contains = "MultivariateDistribution",
+ validity = function(object){
+ if(any(object at mixCoeff< -.Machine$double.eps) ||
+ sum(object at mixCoeff)>1+.Machine$double.eps)
+ stop("mixing coefficients are no probabilities")
+ return(TRUE)
+ })
Added: branches/distr-2.2/pkg/distrEllipse/R/AllGenerics.R
===================================================================
--- branches/distr-2.2/pkg/distrEllipse/R/AllGenerics.R (rev 0)
+++ branches/distr-2.2/pkg/distrEllipse/R/AllGenerics.R 2009-06-29 16:17:12 UTC (rev 486)
@@ -0,0 +1,26 @@
+
+## Access methods
+if(!isGeneric("radDistr"))
+setGeneric("radDistr", function(object) standardGeneric("radDistr"))
+
+if(!isGeneric("sigma"))
+ setGeneric("sigma", function(object) standardGeneric("sigma"))
+
+
+# Replacement methods
+if(!isGeneric("radDistr<-"))
+ setGeneric("radDistr<-", function(object,value) standardGeneric("radDistr<-"))
+
+## wrappers
+if(!isGeneric("r.rd"))
+ setGeneric("r.rd", function(object) standardGeneric("r.rd"))
+if(!isGeneric("d.rd"))
+ setGeneric("d.rd", function(object) standardGeneric("d.rd"))
+if(!isGeneric("p.rd"))
+ setGeneric("p.rd", function(object) standardGeneric("p.rd"))
+if(!isGeneric("q.rd"))
+ setGeneric("q.rd", function(object) standardGeneric("q.rd"))
+if(!isGeneric("plot.rd"))
+ setGeneric("plot.rd", function(x, ...) standardGeneric("plot.rd"))
+
+
Added: branches/distr-2.2/pkg/distrEllipse/R/AllShow.R
===================================================================
--- branches/distr-2.2/pkg/distrEllipse/R/AllShow.R (rev 0)
+++ branches/distr-2.2/pkg/distrEllipse/R/AllShow.R 2009-06-29 16:17:12 UTC (rev 486)
@@ -0,0 +1,42 @@
+setMethod("showobj", "SphericalDistribution",
+ function(object, className = class(object)[1]){
+ txt <- gettextf("Distribution Object of Class: %s\n", className)
+ parameter = param(object)
+ Names = slotNames(parameter)
+ if(length(Names) > 1){
+ for(i in Names[Names != "name"]){
+ if(is.matrix(slot(parameter, i))){
+ txt <- c(txt, gettextf("%s:\n", i))
+ txt <- c(txt, " ")
+ for(k in 1:ncol(slot(parameter, i)))
+ txt <- c(txt, gettextf("[,%0d] ", k))
+ txt <- c(txt,"\n")
+ for(j in 1:nrow(slot(parameter, i))){
+ txt <- c(txt, gettextf("[%0d,] ", j))
+ for(k in 1:ncol(slot(parameter, i)))
+ txt <- c(txt, gettextf("% 2.2f, ",
+ slot(parameter, i)[j,k]))
+ txt <- c(txt, "\n")
+ }
+ }else{ txt0 <- if(length(slot(parameter,i))>1)
+ paste("(",paste(slot(parameter, i),
+ collapse=","), ")",sep="")
+ else
+ paste(slot(parameter, i))
+ txt <- c(txt,
+ gettextf("%s: %s\n", i, txt0))
+ }}}
+ txt <- c(txt, "\n Distribution of Lengths:\n",
+ showobj(radDistr(object)))
+ return(txt)
+ })
+
+setMethod("show", "SphericalDistribution",
+ function(object){
+ cls <- class(object)[1]
+ cat(showobj(object, className = cls))
+ ws <- distr:::.IssueWarn(object at .withArith, object at .withSim)
+ if(!is.null(ws$msgA)) warning(ws$msgA)
+ if(!is.null(ws$msgS)) warning(ws$msgS)
+ }
+ )
Added: branches/distr-2.2/pkg/distrEllipse/R/EllipticalDistribution.R
===================================================================
--- branches/distr-2.2/pkg/distrEllipse/R/EllipticalDistribution.R (rev 0)
+++ branches/distr-2.2/pkg/distrEllipse/R/EllipticalDistribution.R 2009-06-29 16:17:12 UTC (rev 486)
@@ -0,0 +1,186 @@
+## Generating function
+
+EllipticalDistribution <- function(radDistr = sqrt(Chisq(df = length(loc))),
+ loc = c(0,0), scale = diag(length(loc)), p = NULL, q = NULL){
+
+# class(scale) <- "matrix"
+ ldscale <- as.numeric(determinant(as.matrix(scale),
+ logarithm = TRUE)$modulus)
+ Iscale <- solve(scale)
+
+ dim0 <- length(loc)
+
+ param <- new("EllipticalParameter", loc=loc, scale=scale)
+
+ if(!is(radDistr,"UnivariateDistribution"))
+ stop("must be a univariate Distribution")
+ if(p.l(radDistr)(0)>0)
+ stop("distr must have pos. support")
+
+ dr <- d(radDistr)
+ dlog <- if(distr:::.inArgs("log", dr))
+ quote(dr(r, log = TRUE)) else quote(log(dr(r)))
+
+ if(is(radDistr,"AbscontDistribution")){
+ dfun <- function(x, log = FALSE){}
+ body(dfun) <- substitute({
+ x0 <- x-loc0
+ x1 <- Iscale0 %*% x0
+ r <- colSums(x0*x1)^.5
+ lg <- dlog0
+ lg <- lg + (1-dim1)*log(r) + lgamma(dim1/2) -
+ dim1/2*log(pi)-log(2)- ldscale0/2
+ return(if(log) lg else exp(lg))},
+ list(loc0 = loc, Iscale0 = Iscale, ldscale0 = ldscale,
+ dlog0 = dlog, dim1=dim0))
+ }else dfun <- NULL
+
+ rfun <- function(n){}
+ body(rfun) <- substitute({
+ r0 <- r(radDistr)(n)
+ u0 <- matrix(rnorm(n*dim1),ncol=dim1)
+ u0n <- rowSums(u0^2)^.5
+ un <- t(u0/u0n*r0)
+ scale0 %*% un + loc0
+ }, list(scale0=scale, loc0 = loc, dim1 = dim0))
+
+ img0 <- new("EuclideanSpace", dimension = round(dim0,0))
+
+ new("EllipticalDistribution",
+ r=rfun, d=dfun, p=p, q=q,
+ radDistr = radDistr,
+ img = img0, param = param,
+ .withSim = radDistr at .withSim,
+ .withArith = radDistr at .withArith,
+ .logExact = radDistr at .logExact,
+ .lowerExact = radDistr at .lowerExact,
+ Symmetry = EllipticalSymmetry(loc))
+ }
+
+## Parameter for Elliptically symmetric Distribution
+# accessors
+
+setMethod("scale", "EllipticalParameter",
+ function(x, center, scale) x at scale)
+setMethod("location", "EllipticalParameter",
+ function(object) object at loc)
+
+# replacements
+setReplaceMethod("scale", "EllipticalParameter",
+ function(object, value){ new("EllipticalParameter",
+ loc = object at loc,
+ scale = as.matrix(value))})
+setReplaceMethod("location", "EllipticalParameter",
+ function(object, value) new("EllipticalParameter", loc = value,
+ scale = object at scale))
+
+## Elliptically symmetric Distribution
+# accessors
+setMethod("scale", "EllipticalDistribution",
+ function(x, center, scale) (x at param)@scale)
+setMethod("location", "EllipticalDistribution",
+ function(object) (object at param)@loc)
+# replacements
+setReplaceMethod("scale", "EllipticalDistribution",
+ function(object, value){ param <- new("EllipticalParameter",
+ loc = object at param@loc,
+ scale= as.matrix(value))
+ object at param <- param; object})
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/distr -r 486
More information about the Distr-commits
mailing list