[Distr-commits] r1345 - in pkg/distrMod: . man tests/Examples
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed May 1 14:18:39 CEST 2019
Author: ruckdeschel
Date: 2019-05-01 14:18:38 +0200 (Wed, 01 May 2019)
New Revision: 1345
Modified:
pkg/distrMod/DESCRIPTION
pkg/distrMod/man/0distrMod-package.Rd
pkg/distrMod/man/BetaFamily.Rd
pkg/distrMod/man/ExpScaleFamily.Rd
pkg/distrMod/man/GammaFamily.Rd
pkg/distrMod/man/InfoNorm.Rd
pkg/distrMod/man/MCEstimator.Rd
pkg/distrMod/man/NormType-class.Rd
pkg/distrMod/man/NormType.Rd
pkg/distrMod/man/QFNorm.Rd
pkg/distrMod/man/SelfNorm.Rd
pkg/distrMod/man/returnlevelplot.Rd
pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
Log:
[distrMod] trunk -- now it is the fancy quotes ...
Modified: pkg/distrMod/DESCRIPTION
===================================================================
--- pkg/distrMod/DESCRIPTION 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/DESCRIPTION 2019-05-01 12:18:38 UTC (rev 1345)
@@ -1,6 +1,6 @@
Package: distrMod
Version: 2.8.2
-Date: 2019-04-30
+Date: 2019-05-01
Title: Object Oriented Implementation of Probability Models
Description: Implements S4 classes for probability models based on packages 'distr' and
'distrEx'.
@@ -18,4 +18,4 @@
URL: http://distr.r-forge.r-project.org/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-VCS/SVNRevision: 1342
+VCS/SVNRevision: 1344
Modified: pkg/distrMod/man/0distrMod-package.Rd
===================================================================
--- pkg/distrMod/man/0distrMod-package.Rd 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/man/0distrMod-package.Rd 2019-05-01 12:18:38 UTC (rev 1345)
@@ -14,7 +14,7 @@
\tabular{ll}{
Package: \tab distrMod \cr
Version: \tab 2.8.2 \cr
-Date: \tab 2019-04-30 \cr
+Date: \tab 2019-05-01 \cr
Depends: \tab R(>= 3.4), distr(>= 2.8.0), distrEx(>= 2.8.0), RandVar(>= 1.2.0), MASS, stats4,methods \cr
Imports: \tab startupmsg, sfsmisc, graphics, stats, grDevices \cr
Suggests: \tab ismev, evd, \cr
@@ -22,7 +22,7 @@
ByteCompile: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab http://distr.r-forge.r-project.org/\cr
-VCS/SVNRevision: \tab 1342 \cr
+VCS/SVNRevision: \tab 1344 \cr
}}
\section{Classes}{
\preformatted{
Modified: pkg/distrMod/man/BetaFamily.Rd
===================================================================
--- pkg/distrMod/man/BetaFamily.Rd 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/man/BetaFamily.Rd 2019-05-01 12:18:38 UTC (rev 1345)
@@ -28,7 +28,9 @@
\examples{
(B1 <- BetaFamily())
FisherInfo(B1)
+## IGNORE_RDIFF_BEGIN
checkL2deriv(B1)
+## IGNORE_RDIFF_END
}
\concept{Beta model}
\keyword{models}
Modified: pkg/distrMod/man/ExpScaleFamily.Rd
===================================================================
--- pkg/distrMod/man/ExpScaleFamily.Rd 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/man/ExpScaleFamily.Rd 2019-05-01 12:18:38 UTC (rev 1345)
@@ -30,7 +30,9 @@
(E1 <- ExpScaleFamily())
plot(E1)
Map(L2deriv(E1)[[1]])
+## IGNORE_RDIFF_BEGIN
checkL2deriv(E1)
+## IGNORE_RDIFF_END
}
\concept{exponential scale model}
\concept{scale model}
Modified: pkg/distrMod/man/GammaFamily.Rd
===================================================================
--- pkg/distrMod/man/GammaFamily.Rd 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/man/GammaFamily.Rd 2019-05-01 12:18:38 UTC (rev 1345)
@@ -31,7 +31,9 @@
\examples{
(G1 <- GammaFamily())
FisherInfo(G1)
+## IGNORE_RDIFF_BEGIN
checkL2deriv(G1)
+## IGNORE_RDIFF_END
}
\concept{Gamma model}
\keyword{models}
Modified: pkg/distrMod/man/InfoNorm.Rd
===================================================================
--- pkg/distrMod/man/InfoNorm.Rd 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/man/InfoNorm.Rd 2019-05-01 12:18:38 UTC (rev 1345)
@@ -19,12 +19,12 @@
%\note{}
\seealso{\code{\link{InfoNorm-class}}}
\examples{
- ## IGNORE_RDIFF_BEGIN
+## IGNORE_RDIFF_BEGIN
InfoNorm()
## The function is currently defined as
function(){ new("InfoNorm") }
- ## IGNORE_RDIFF_END
+## IGNORE_RDIFF_END
}
\concept{asymptotic covariance}
\concept{risk}
Modified: pkg/distrMod/man/MCEstimator.Rd
===================================================================
--- pkg/distrMod/man/MCEstimator.Rd 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/man/MCEstimator.Rd 2019-05-01 12:18:38 UTC (rev 1345)
@@ -97,8 +97,11 @@
## Total variation minimum distance estimator
## Note: you can also use function MDEstimator!
## discretize Gamma distribution
-MCEstimator(x = x, ParamFamily = G, criterion = TotalVarDist,
+
+## IGNORE_RDIFF_BEGIN
+MCEstimator(x = x, ParamFamily = G, criterion = TotalVarDist,
crit.name = "Total variation distance")
+## IGNORE_RDIFF_END
## or smooth empirical distribution (takes some time!)
#MCEstimator(x = x, ParamFamily = G, criterion = TotalVarDist,
Modified: pkg/distrMod/man/NormType-class.Rd
===================================================================
--- pkg/distrMod/man/NormType-class.Rd 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/man/NormType-class.Rd 2019-05-01 12:18:38 UTC (rev 1345)
@@ -40,11 +40,11 @@
%\note{}
\seealso{\code{\link{BiasType-class}}}
\examples{
- ## IGNORE_RDIFF_BEGIN
+## IGNORE_RDIFF_BEGIN
EuclNorm <- NormType("EuclideanNorm",EuclideanNorm)
fct(EuclNorm)
name(EuclNorm)
- ## IGNORE_RDIFF_END
+## IGNORE_RDIFF_END
}
\concept{asymptotic risk}
\concept{bias}
Modified: pkg/distrMod/man/NormType.Rd
===================================================================
--- pkg/distrMod/man/NormType.Rd 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/man/NormType.Rd 2019-05-01 12:18:38 UTC (rev 1345)
@@ -22,9 +22,9 @@
%\note{}
\seealso{\code{\link{NormType-class}}}
\examples{
- ## IGNORE_RDIFF_BEGIN
+## IGNORE_RDIFF_BEGIN
NormType()
- ## IGNORE_RDIFF_END
+## IGNORE_RDIFF_END
}
\concept{asymptotic covariance}
\concept{risk}
Modified: pkg/distrMod/man/QFNorm.Rd
===================================================================
--- pkg/distrMod/man/QFNorm.Rd 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/man/QFNorm.Rd 2019-05-01 12:18:38 UTC (rev 1345)
@@ -24,12 +24,12 @@
%\note{}
\seealso{\code{\link{QFNorm-class}}}
\examples{
+## IGNORE_RDIFF_BEGIN
QFNorm()
## The function is currently defined as
- ## IGNORE_RDIFF_BEGIN
function(){ new("QFNorm") }
- ## IGNORE_RDIFF_END
+## IGNORE_RDIFF_END
}
\concept{asymptotic covariance}
\concept{risk}
Modified: pkg/distrMod/man/SelfNorm.Rd
===================================================================
--- pkg/distrMod/man/SelfNorm.Rd 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/man/SelfNorm.Rd 2019-05-01 12:18:38 UTC (rev 1345)
@@ -19,12 +19,12 @@
%\note{}
\seealso{\code{\link{SelfNorm-class}}}
\examples{
- ## IGNORE_RDIFF_BEGIN
+## IGNORE_RDIFF_BEGIN
SelfNorm()
## The function is currently defined as
function(){ new("SelfNorm") }
- ## IGNORE_RDIFF_END
+## IGNORE_RDIFF_END
}
\concept{asymptotic covariance}
\concept{risk}
Modified: pkg/distrMod/man/returnlevelplot.Rd
===================================================================
--- pkg/distrMod/man/returnlevelplot.Rd 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/man/returnlevelplot.Rd 2019-05-01 12:18:38 UTC (rev 1345)
@@ -277,7 +277,7 @@
returnlevelplot(rain, GPDF, MaxOrPOT="POT", xlim=c(1e-1,1e3))
}
}
- ## IGNORE_RDIFF_END
+## IGNORE_RDIFF_END
}
\keyword{hplot}
\keyword{distribution}
Modified: pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
===================================================================
--- pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save 2019-04-30 23:16:26 UTC (rev 1344)
+++ pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save 2019-05-01 12:18:38 UTC (rev 1345)
@@ -1,7 +1,7 @@
R Under development (unstable) (2019-03-28 r76288) -- "Unsuffered Consequences"
Copyright (C) 2019 The R Foundation for Statistical Computing
-Platform: x86_64-w64-mingw32/x64 (64-bit)
+Platform: i386-w64-mingw32/i386 (32-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -167,8 +167,9 @@
shape1 shape2
shape1 1.0000000 -0.6449341
shape2 -0.6449341 1.0000000
+> ## IGNORE_RDIFF_BEGIN
> checkL2deriv(B1)
-precision of centering: 3.96327e-05 3.963591e-05
+precision of centering: 3.963281e-05 3.963334e-05
precision of Fisher information:
shape1 shape2
shape1 -1.8511e-05 1.6483e-06
@@ -179,6 +180,7 @@
[2,] -2.56e-04 -1.85e-03
condition of Fisher information:
[1] 5.2777
+> ## IGNORE_RDIFF_END
>
>
>
@@ -419,7 +421,7 @@
dimnames = list(nms, nms0))
list(fval = fval0, mat = mat0)
}
-<bytecode: 0x000000000c79b9f0>
+<bytecode: 0x0785b5b8>
Trafo / derivative matrix at which estimate was produced:
scale shape
shape 0.000 1
@@ -620,10 +622,11 @@
1)/c(scale = 1)
return(y)
}
-<environment: 0x0000000014dade30>
+<environment: 0x0cd99b98>
+> ## IGNORE_RDIFF_BEGIN
> checkL2deriv(E1)
-precision of centering: -2.042661e-06
+precision of centering: -2.04266e-06
precision of Fisher information:
scale
scale -3.5986e-05
@@ -632,6 +635,7 @@
[1,] -3.6e-03
condition of Fisher information:
[1] 1
+> ## IGNORE_RDIFF_END
>
>
>
@@ -749,8 +753,9 @@
scale shape
scale 1 1.000000
shape 1 1.644934
+> ## IGNORE_RDIFF_BEGIN
> checkL2deriv(G1)
-precision of centering: -2.042661e-06 1.791171e-06
+precision of centering: -2.04266e-06 1.791171e-06
precision of Fisher information:
scale shape
scale -3.5986e-05 -9.5036e-06
@@ -761,6 +766,7 @@
[2,] -9.5e-04 -2.4e-03
condition of Fisher information:
[1] 10.603
+> ## IGNORE_RDIFF_END
>
>
>
@@ -777,7 +783,7 @@
>
> ### ** Examples
>
-> ## IGNORE_RDIFF_BEGIN
+> ## IGNORE_RDIFF_BEGIN
> InfoNorm()
An object of class "InfoNorm"
Slot "QuadForm":
@@ -790,8 +796,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x000000000da8bab8>
-<environment: 0x000000000da89dc8>
+<bytecode: 0x0835e4e0>
+<environment: 0x0835d0f0>
>
> ## The function is currently defined as
@@ -800,7 +806,7 @@
{
new("InfoNorm")
}
-> ## IGNORE_RDIFF_END
+> ## IGNORE_RDIFF_END
>
>
>
@@ -1074,7 +1080,7 @@
1)/c(meanlog = 1)
return(y)
}
-<environment: 0x0000000014f39200>
+<environment: 0x0d93e088>
> checkL2deriv(L1)
precision of centering: -0.003003394
@@ -1309,7 +1315,9 @@
> ## Total variation minimum distance estimator
> ## Note: you can also use function MDEstimator!
> ## discretize Gamma distribution
-> MCEstimator(x = x, ParamFamily = G, criterion = TotalVarDist,
+>
+> ## IGNORE_RDIFF_BEGIN
+> MCEstimator(x = x, ParamFamily = G, criterion = TotalVarDist,
+ crit.name = "Total variation distance")
Evaluations of Minimum Total variation distance estimate:
---------------------------------------------------------
@@ -1320,10 +1328,11 @@
samplesize: 50
estimate:
scale shape
-0.2829687 5.0197306
+0.2829625 5.0197311
Criterion:
Total variation distance
- 0.4866141
+ 0.4819868
+> ## IGNORE_RDIFF_END
>
> ## or smooth empirical distribution (takes some time!)
> #MCEstimator(x = x, ParamFamily = G, criterion = TotalVarDist,
@@ -2105,7 +2114,7 @@
>
> ### ** Examples
>
-> ## IGNORE_RDIFF_BEGIN
+> ## IGNORE_RDIFF_BEGIN
> EuclNorm <- NormType("EuclideanNorm",EuclideanNorm)
> fct(EuclNorm)
function(x){
@@ -2114,11 +2123,11 @@
else
return(sqrt(colSums(x^2)))
}
-<bytecode: 0x00000000119b69b0>
+<bytecode: 0x08375ea0>
<environment: namespace:distrMod>
> name(EuclNorm)
[1] "EuclideanNorm"
-> ## IGNORE_RDIFF_END
+> ## IGNORE_RDIFF_END
>
>
>
@@ -2135,7 +2144,7 @@
>
> ### ** Examples
>
-> ## IGNORE_RDIFF_BEGIN
+> ## IGNORE_RDIFF_BEGIN
> NormType()
An object of class "NormType"
Slot "name":
@@ -2148,10 +2157,10 @@
else
return(sqrt(colSums(x^2)))
}
-<bytecode: 0x00000000119b69b0>
+<bytecode: 0x08375ea0>
<environment: namespace:distrMod>
-> ## IGNORE_RDIFF_END
+> ## IGNORE_RDIFF_END
>
>
>
@@ -2592,6 +2601,7 @@
>
> ### ** Examples
>
+> ## IGNORE_RDIFF_BEGIN
> QFNorm()
An object of class "QFNorm"
Slot "QuadForm":
@@ -2604,18 +2614,17 @@
Slot "fct":
function(x) QuadFormNorm(x, A= A0)
-<bytecode: 0x0000000015964f78>
-<environment: 0x0000000015968b18>
+<bytecode: 0x0adda7f0>
+<environment: 0x0af18d28>
>
> ## The function is currently defined as
-> ## IGNORE_RDIFF_BEGIN
> function(){ new("QFNorm") }
function ()
{
new("QFNorm")
}
-> ## IGNORE_RDIFF_END
+> ## IGNORE_RDIFF_END
>
>
>
@@ -2632,7 +2641,7 @@
>
> ### ** Examples
>
-> ## IGNORE_RDIFF_BEGIN
+> ## IGNORE_RDIFF_BEGIN
> SelfNorm()
An object of class "SelfNorm"
Slot "QuadForm":
@@ -2645,8 +2654,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x0000000014f9e188>
-<environment: 0x000000001316a788>
+<bytecode: 0x0b06e640>
+<environment: 0x0c6661f8>
>
> ## The function is currently defined as
@@ -2655,7 +2664,7 @@
{
new("SelfNorm")
}
-> ## IGNORE_RDIFF_END
+> ## IGNORE_RDIFF_END
>
>
>
@@ -2673,7 +2682,7 @@
> ### ** Examples
>
> addAlphTrsp2col(rgb(1,0.3,0.03), 25)
-[1] "#FF4D0819"
+[1] "#FF4C0819"
> addAlphTrsp2col("darkblue", 25)
[1] "#00008B19"
> addAlphTrsp2col("#AAAAAAAA",25)
@@ -3665,7 +3674,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x0000000014ac1948>
+<bytecode: 0x0b7f0dc8>
> print(param(NS), show.details = "minimal")
An object of class "ParamWithScaleFamParameter"
name: location and scale
@@ -3714,7 +3723,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x0000000014ac1948>
+<bytecode: 0x0b7f0dc8>
Trafo / derivative matrix:
mean sd
mu/sig 0.3668695 -0.3024814
@@ -3757,7 +3766,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x0000000014ac1948>
+<bytecode: 0x0b7f0dc8>
Trafo / derivative matrix:
mean sd
mu/sig 0.3669 -0.3025
@@ -3839,7 +3848,7 @@
> #
>
> ## IGNORE_RDIFF_BEGIN
-> ## IGNORE_RDIFF_END
+> ## IGNORE_RDIFF_END
>
>
>
@@ -4123,7 +4132,7 @@
> cleanEx()
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 30.2 0.66 31.53 NA NA
+Time elapsed: 29.3 0.58 30 NA NA
> grDevices::dev.off()
null device
1
More information about the Distr-commits
mailing list