[Distr-commits] r524 - in branches/distr-2.2/pkg: SweaveListingUtils/chm SweaveListingUtils/man distrMod/R distrMod/chm
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Aug 12 01:08:28 CEST 2009
Author: ruckdeschel
Date: 2009-08-12 01:08:27 +0200 (Wed, 12 Aug 2009)
New Revision: 524
Modified:
branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingOptions.html
branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
branches/distr-2.2/pkg/SweaveListingUtils/chm/library.html
branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingOptions.Rd
branches/distr-2.2/pkg/SweaveListingUtils/man/library.Rd
branches/distr-2.2/pkg/distrMod/R/confint.R
branches/distr-2.2/pkg/distrMod/chm/distrMod.chm
branches/distr-2.2/pkg/distrMod/chm/distrMod.hhp
Log:
SweaveListingUtils: minor issue in documentation
distrMod: there were problems in confint() when diag() was called with numeric of length one.
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingOptions.html
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingOptions.html 2009-08-11 00:14:42 UTC (rev 523)
+++ branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingOptions.html 2009-08-11 23:08:27 UTC (rev 524)
@@ -1,10 +1,10 @@
<html><head><title>Function to change the global options of the package ‘SweaveListingUtils’</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="Rchm.css">
-</head>
-<body>
+</head><body>
-<table width="100%"><tr><td>SweaveListingOptions(SweaveListingUtils)</td><td align="right">R Documentation</td></tr></table><object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<table width="100%"><tr><td>SweaveListingOptions(SweaveListingUtils)</td><td align="right">R Documentation</td></tr></table>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
<param name="keyword" value="R: SweaveListingOptions">
<param name="keyword" value="R: SweaveListingoptions">
<param name="keyword" value="R: getSweaveListingOption">
@@ -39,10 +39,8 @@
<h3>Description</h3>
-<p>
-With <code>SweaveListingOptions</code> you can inspect and change
-the global variables of the package <span class="pkg">SweaveListingUtils</span>.
-</p>
+<p>With <code>SweaveListingOptions</code> you can inspect and change
+the global variables of the package <span class="pkg">SweaveListingUtils</span>. </p>
<h3>Usage</h3>
@@ -59,20 +57,23 @@
<table summary="R argblock">
<tr valign="top"><td><code>...</code></td>
<td>
-any options can be defined, using name = value or by passing a list of such tagged values. </td></tr>
+ any options can be defined, using name = value or by passing a list of such tagged values. </td></tr>
<tr valign="top"><td><code>x</code></td>
<td>
-a character string holding an option name.</td></tr>
+ a character string holding an option name.</td></tr>
</table>
+
<h3>Value</h3>
<p>
<code>SweaveListingOptions()</code> returns a list of the global variables.<br>
<code>SweaveListingOptions(x)</code> returns the global variable <VAR>x</VAR>.<br>
<code>getSweaveListingOption(x)</code> returns the global variable <VAR>x</VAR>.<br>
-<code>SweaveListingOptions(x=y)</code> sets the value of the global variable <VAR>x</VAR> to <VAR>y</VAR>.</p>
+<code>SweaveListingOptions(x=y)</code> sets the value of the global variable <VAR>x</VAR> to <VAR>y</VAR>.
+</p>
+
<h3>SweaveListingoptions</h3>
<p>
@@ -83,15 +84,16 @@
<h3>Global Options</h3>
+<p>
+
<dl>
<dt>Rset:</dt><dd>default setting for \lstset-definition of R-code, default value is<br>
-<code>list("fancyvrb" = "true", "language" = "R", "escapechar" = "`", </code><br>
+<code>list("fancyvrb" = "true", "language" = "R", "escapechar" = "`", </code><br>
<code> "basicstyle" = "{\\color{Rcolor}\\footnotesize}",</code><br>
<code> "keywordstyle" = "{\\bf\\color{Rcolor}}",</code><br>
<code> "commentstyle" = "{\\color{Rcomment}\\ttfamily\\itshape}",</code><br>
<code> "literate" = "{<-}{{$\\leftarrow$}}2{<<-}{{$\\twoheadleftarrow$}}2",</code><br>
<code> "alsoother" = "{$}","alsoletter" = "{.<-}"</code><br>
-<code> "otherkeywords" = </code>
<code> "otherkeywords" = "{!,!=,~,$,*,\\&,\\ %/\\ %,\\ %*\\ %,\\ %\\ %,<-,<<-,/}")</code><br>
(CAVEAT: the spaces between the double backslashes and the percent sign in the last line
are <EM>not</EM> intended; I simply did not find another work-around)
@@ -154,8 +156,8 @@
(character); defaults to<br>
"http://r-forge.r-project.org/plugins/scmsvn/viewcvs.php/*checkout*/pkg/"
</dd>
-
-
+</p>
+<p>
<dt>addRset:</dt><dd>logical; default for argument <code>add</code> in command <code>Rset</code>;
defaults to <code>TRUE</code></dd>
<dt>addRdset:</dt><dd>logical; default for argument <code>add</code> in command <code>Rdset</code>;
@@ -168,18 +170,17 @@
<code>Rcodeset</code>; defaults to <code>TRUE</code></dd>
</dl>
+</p>
+
+
<h3>Author(s)</h3>
-<p>
-Peter Ruckdeschel <a href="mailto:Peter.Ruckdeschel at itwm.fraunhofer.de">Peter.Ruckdeschel at itwm.fraunhofer.de</a>
-</p>
+<p>Peter Ruckdeschel <a href="mailto:Peter.Ruckdeschel at itwm.fraunhofer.de">Peter.Ruckdeschel at itwm.fraunhofer.de</a></p>
<h3>See Also</h3>
-<p>
-<code><a onclick="findlink('base', 'options.html')" style="text-decoration: underline; color: blue; cursor: hand">options</a></code>, <code><a onclick="findlink('base', 'getOption.html')" style="text-decoration: underline; color: blue; cursor: hand">getOption</a></code>
-</p>
+<p><code><a href="../../base/html/options.html">options</a></code>, <code><a href="../../base/html/getOption.html">getOption</a></code></p>
<h3>Examples</h3>
@@ -203,7 +204,5 @@
}
</script>
-
<hr><div align="center">[Package <em>SweaveListingUtils</em> version 0.4 <a href="00Index.html">Index</a>]</div>
-
</body></html>
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/library.html
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/chm/library.html 2009-08-11 00:14:42 UTC (rev 523)
+++ branches/distr-2.2/pkg/SweaveListingUtils/chm/library.html 2009-08-11 23:08:27 UTC (rev 524)
@@ -1,10 +1,10 @@
<html><head><title>Loading Packages with registering symbols for TeX package 'listing'</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="Rchm.css">
-</head>
-<body>
+</head><body>
-<table width="100%"><tr><td>library(SweaveListingUtils)</td><td align="right">R Documentation</td></tr></table><object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<table width="100%"><tr><td>library(SweaveListingUtils)</td><td align="right">R Documentation</td></tr></table>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
<param name="keyword" value="R: library">
<param name="keyword" value="R: require">
<param name="keyword" value=" Loading Packages with registering symbols for TeX package 'listing'">
@@ -49,7 +49,7 @@
<table summary="R argblock">
<tr valign="top"><td><code>package, help</code></td>
<td>
-the name of a package, given as a <a href="onclick="findlink('distrTEst', 'name-methods.html')" style="text-decoration: underline; color: blue; cursor: hand"">name</a> or
+the name of a package, given as a <a href="../../base/html/name.html">name</a> or
literal character string, or a character string, depending on
whether <code>character.only</code> is <code>FALSE</code> (default) or
<code>TRUE</code>).</td></tr>
@@ -59,7 +59,7 @@
loaded package. Note that <code>.First.lib</code> may attach other
packages, and <code>pos</code> is computed <EM>after</EM> <code>.First.lib</code>
has been run. Can also be the name of a position on the current
-search list as given by <code><a onclick="findlink('base', 'search.html')" style="text-decoration: underline; color: blue; cursor: hand">search</a>()</code>.</td></tr>
+search list as given by <code><a href="../../base/html/search.html">search</a>()</code>.</td></tr>
<tr valign="top"><td><code>lib.loc</code></td>
<td>
a character vector describing the location of <font face="Courier New,Courier" color="#666666"><b>R</b></font>
@@ -82,7 +82,7 @@
<tr valign="top"><td><code>warn.conflicts</code></td>
<td>
logical. If <code>TRUE</code>, warnings are
-printed about <code><a onclick="findlink('base', 'conflicts.html')" style="text-decoration: underline; color: blue; cursor: hand">conflicts</a></code> from attaching the new
+printed about <code><a href="../../base/html/conflicts.html">conflicts</a></code> from attaching the new
package, unless that package contains an object
<code>.conflicts.OK</code>. A conflict is a function masking a function,
or a non-function masking a non-function.
@@ -91,10 +91,11 @@
<td>
logical. If <code>TRUE</code>, functions
‘keep their source’ including comments, see argument
-<code>keep.source</code> to <code><a onclick="findlink('distr', 'options.html')" style="text-decoration: underline; color: blue; cursor: hand">options</a></code>. This applies only to
+<code>keep.source</code> to <code><a href="../../base/html/options.html">options</a></code>. This applies only to
the named package, and not to any packages or name spaces which might be
loaded to satisfy dependencies or imports.
-<br>
+</p>
+<p>
This argument does not apply to packages using lazy-loading.
Whether they have kept source is determined when they are installed
(and is most likely false).
@@ -112,7 +113,7 @@
logical or environment. If <code>TRUE</code>, a call to
<code>require</code> from the source for a package will save the name of
the required package in the variable <code>".required"</code>, allowing
-function <code><a onclick="findlink('base', 'detach.html')" style="text-decoration: underline; color: blue; cursor: hand">detach</a></code> to warn if a required package is
+function <code><a href="../../base/html/detach.html">detach</a></code> to warn if a required package is
detached. See section ‘Packages that require other packages’ below.</td></tr>
<tr valign="top"><td><code>inSweave</code></td>
<td>
@@ -120,7 +121,7 @@
instead issuing new symbols for <code>morekeywords</code> tag in
language definition of <font face="Courier New,Courier" color="#666666"><b>R</b></font> in TeX package ‘<span class="file">listings</span>’)?
By default argument is taken from
-<code><a href="SweaveListingOptions.html">getSweaveListingOption</a></code>.</td></tr>
+<code><a href="../../SweaveListingUtils/html/SweaveListingOptions.html">getSweaveListingOption</a></code>.</td></tr>
<tr valign="top"><td><code>keywordstyles</code></td>
<td>
character or missing or <code>NULL</code>; added argument in masked
@@ -146,7 +147,7 @@
logical or missing or <code>NULL</code>; added argument in masked
versions of <code>library</code> and <code>require</code> of package
<span class="pkg">SweaveListingUtils</span>; if missing, the corresponding global option is read
-out by <code><a href="SweaveListingOptions.html">getSweaveListingOption</a></code>. Let us call the corresponding
+out by <code><a href="../../SweaveListingUtils/html/SweaveListingOptions.html">getSweaveListingOption</a></code>. Let us call the corresponding
possibly imputed value <EM>effective</EM> value. If this effective value is
<code>TRUE</code>, before registering a new symbol for TeX package 'listings',
we first check whether this symbol had already been registered in
@@ -160,13 +161,14 @@
logical or missing or <code>NULL</code>; added argument in masked
versions of <code>library</code> and <code>require</code> of package
<span class="pkg">SweaveListingUtils</span>; if missing, the corresponding global option is read
-out by <code><a href="SweaveListingOptions.html">getSweaveListingOption</a></code>. If the effective value is
+out by <code><a href="../../SweaveListingUtils/html/SweaveListingOptions.html">getSweaveListingOption</a></code>. If the effective value is
<code>TRUE</code>, also the symbols to be found in newly, automatically loaded
packages (loaded, because the required/"library"-ed package features them
in its corresponding <code>Depends</code> field in its DESCRIPTION file)
are registered for TeX package 'listings'.</td></tr>
</table>
+
<h3>Details</h3>
<p>
@@ -174,7 +176,7 @@
versions in package <span class="pkg">base</span>. This masking is necessary to allow for
extra arguments <code>keywordstyles</code>, <code>interm.keywordstyles</code>,
<code>overwrite</code>, <code>intermediate</code>. Hence please confer
-<code><a onclick="findlink('base', 'library.html')" style="text-decoration: underline; color: blue; cursor: hand">library</a></code>, <code><a onclick="findlink('base', 'require.html')" style="text-decoration: underline; color: blue; cursor: hand">require</a></code>.<br>
+<code><a href="../../base/html/library.html">library</a></code>, <code><a href="../../base/html/require.html">require</a></code>.<br>
</p>
<p>
If argument <code>inSweave</code> is <code>FALSE</code> or if argument
@@ -197,9 +199,11 @@
and if so use its corresponding keywordstyle; else we use option
<code>Keywordstyles</code> resp. <code>interm.Keywordstyles</code> (which we get
by <code>getSweaveListingOption</code>). New entries in the global variable
-<code>.tobeDefinedPkgs</code> may be appended by <code><a href="setToBeDefinedPkgs.html">setToBeDefinedPkgs</a></code>.<br>
+<code>.tobeDefinedPkgs</code> may be appended by <code><a href="../../SweaveListingUtils/html/setToBeDefinedPkgs.html">setToBeDefinedPkgs</a></code>.<br>
</p>
<p>
+</p>
+<p>
The masked versions work as follows: first the call is written to an
object and split into a <span class="pkg">base</span>-package-part and into the extra arguments
mentioned above. Then we call <code>base::<fct></code> where <code><fct></code> is either
@@ -207,7 +211,7 @@
before and after this call we also get hand on the intermediate packages,
which are automatically attached packages by dependence. After this call
we register the new symbols by corresponding calls to
-<code><a href="lstsetLanguage.html">lstsetLanguage</a></code>.
+<code><a href="../../SweaveListingUtils/html/lstsetLanguage.html">lstsetLanguage</a></code>.
</p>
<p>
For use in an <code>.Rnw</code> file, the call to <code>require</code> or <code>library</code>
@@ -231,18 +235,26 @@
unloadNamespace("SweaveListingUtils")
@
</pre>
+or, if you want to keep the namespace of <span class="pkg">SweaveListingUtils</span> loaded
+<pre>
+<<cleanup2, echo=FALSE>>=
+SweaveListingUtils(inSweave = FALSE)
+@
+</pre>
</p>
<h3>Value</h3>
<p>
-as the unmasked versions.</p>
+as the unmasked versions.
+</p>
+
<h3>See Also</h3>
<p>
-<code><a onclick="findlink('base', 'library.html')" style="text-decoration: underline; color: blue; cursor: hand">library</a></code>.
+<code><a href="../../base/html/library.html">library</a></code>.
</p>
@@ -262,7 +274,5 @@
}
</script>
-
<hr><div align="center">[Package <em>SweaveListingUtils</em> version 0.4 <a href="00Index.html">Index</a>]</div>
-
</body></html>
Modified: branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingOptions.Rd
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingOptions.Rd 2009-08-11 00:14:42 UTC (rev 523)
+++ branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingOptions.Rd 2009-08-11 23:08:27 UTC (rev 524)
@@ -52,13 +52,12 @@
\describe{
\item{Rset:}{%
default setting for \\lstset-definition of R-code, default value is\cr
-\code{list("fancyvrb" = "true", "language" = "R", "escapechar" = "`", }\cr
+\code{list("fancyvrb" = "true", "language" = "R", "escapechar" = "`", }\cr
\code{ "basicstyle" = "{\\\\color{Rcolor}\\\\footnotesize}",}\cr
\code{ "keywordstyle" = "{\\\\bf\\\\color{Rcolor}}",}\cr
\code{ "commentstyle" = "{\\\\color{Rcomment}\\\\ttfamily\\\\itshape}",}\cr
\code{ "literate" = "{<-}{{$\\\\leftarrow$}}2{<<-}{{$\\\\twoheadleftarrow$}}2",}\cr
\code{ "alsoother" = "{$}","alsoletter" = "{.<-}"}\cr
-\code{ "otherkeywords" = }%
\code{ "otherkeywords" = "{!,!=,~,$,*,\\\\&,\\\\ \%/\\\\ \%,\\\\ \%*\\\\ \%,\\\\ \%\\\\ \%,<-,<<-,/}")}\cr
(CAVEAT: the spaces between the double backslashes and the percent sign in the last line
are \emph{not} intended; I simply did not find another work-around)
Modified: branches/distr-2.2/pkg/SweaveListingUtils/man/library.Rd
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/man/library.Rd 2009-08-11 00:14:42 UTC (rev 523)
+++ branches/distr-2.2/pkg/SweaveListingUtils/man/library.Rd 2009-08-11 23:08:27 UTC (rev 524)
@@ -189,6 +189,7 @@
SweaveListingUtils(inSweave = FALSE)
@
}
+}
\value{
as the unmasked versions.
}
Modified: branches/distr-2.2/pkg/distrMod/R/confint.R
===================================================================
--- branches/distr-2.2/pkg/distrMod/R/confint.R 2009-08-11 00:14:42 UTC (rev 523)
+++ branches/distr-2.2/pkg/distrMod/R/confint.R 2009-08-11 23:08:27 UTC (rev 524)
@@ -20,7 +20,7 @@
return(NULL) }
- sd0 <- sqrt(diag(object at asvar)/object at samplesize)
+ sd0 <- sqrt(diag(as.matrix(object at asvar))/object at samplesize)
names(sd0) <- names(object at estimate)
### code borrowed from confint.default from package stats
Modified: branches/distr-2.2/pkg/distrMod/chm/distrMod.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/distrMod/chm/distrMod.hhp
===================================================================
--- branches/distr-2.2/pkg/distrMod/chm/distrMod.hhp 2009-08-11 00:14:42 UTC (rev 523)
+++ branches/distr-2.2/pkg/distrMod/chm/distrMod.hhp 2009-08-11 23:08:27 UTC (rev 524)
@@ -12,112 +12,8 @@
[FILES]
00Index.html
-0distrMod-package.html
-BetaFamily.html
-BiasType-class.html
-BinomFamily.html
-CauchyLocationScaleFamily.html
-Confint-class.html
-Estimate-class.html
-Estimator.html
-EvenSymmetric-class.html
-EvenSymmetric.html
-ExpScaleFamily.html
-FunSymmList-class.html
-FunSymmList.html
-FunctionSymmetry-class.html
-GammaFamily.html
-GumbelLocationFamily.html
-InfoNorm.html
+
InternalReturnClasses-class.html
-L2GroupFamily-class.html
-L2LocationFamily-class.html
-L2LocationFamily.html
-L2LocationScaleFamily-class.html
-L2LocationScaleFamily.html
-L2LocationUnknownScaleFamily.html
-L2ParamFamily-class.html
-L2ParamFamily.html
-L2ScaleFamily-class.html
-L2ScaleFamily.html
-L2ScaleUnknownLocationFamily.html
-LnormScaleFamily.html
-MCEstimate-class.html
-MCEstimator.html
-MDEstimator.html
-MLEstimator.html
-NonSymmetric-class.html
-NonSymmetric.html
-NormLocationFamily.html
-NormLocationScaleFamily.html
-NormLocationUnknownScaleFamily.html
-NormScaleFamily.html
-NormScaleUnknownLocationFamily.html
-NormType-class.html
-NormType.html
-OddSymmetric-class.html
-OddSymmetric.html
-ParamFamParameter-class.html
-ParamFamParameter.html
-ParamFamily-class.html
-ParamFamily.html
-PoisFamily.html
-ProbFamily-class.html
-QFNorm.html
-QFnorm-class.html
-RiskType-class.html
-SelfNorm.html
-asBias-class.html
-asBias.html
-asCov-class.html
-asCov.html
-asGRisk-class.html
-asHampel-class.html
-asHampel.html
-asMSE-class.html
-asMSE.html
-asRisk-class.html
-asRiskwithBias-class.html
-asSemivar-class.html
-asSemivar.html
-asUnOvShoot-class.html
-asUnOvShoot.html
-asymmetricBias-class.html
-asymmetricBias.html
-checkL2deriv.html
-confint-methods.html
-distrModMASK.html
-distrModOptions.html
-existsPIC.html
-fiBias-class.html
-fiBias.html
-fiCov-class.html
-fiCov.html
-fiHampel-class.html
-fiHampel.html
-fiMSE-class.html
-fiMSE.html
-fiRisk-class.html
-fiUnOvShoot-class.html
-fiUnOvShoot.html
internalClassUnions-class.html
internalmleHelpers.html
internals.html
-isKerAinKerB.html
-meRes.html
-mleCalc-methods.html
-modifyModel-methods.html
-negativeBias.html
-norms.html
-onesidedBias-class.html
-positiveBias.html
-print-methods.html
-symmetricBias-class.html
-symmetricBias.html
-trAsCov-class.html
-trAsCov.html
-trFiCov-class.html
-trFiCov.html
-trafo-methods.html
-trafoEst.html
-validParameter-methods.html
More information about the Distr-commits
mailing list