[Distr-commits] r1397 - in branches/distr-2.9/pkg/distrMod: . R inst man tests/Examples
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Nov 14 20:46:00 CET 2022
Author: ruckdeschel
Date: 2022-11-14 20:46:00 +0100 (Mon, 14 Nov 2022)
New Revision: 1397
Modified:
branches/distr-2.9/pkg/distrMod/DESCRIPTION
branches/distr-2.9/pkg/distrMod/NAMESPACE
branches/distr-2.9/pkg/distrMod/R/SimpleL2ParamFamilies.R
branches/distr-2.9/pkg/distrMod/inst/NEWS
branches/distr-2.9/pkg/distrMod/man/CauchyLocationScaleFamily.Rd
branches/distr-2.9/pkg/distrMod/man/LogisticLocationScaleFamily.Rd
branches/distr-2.9/pkg/distrMod/man/NormLocationScaleFamily.Rd
branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
Log:
[distrMod] ported changes from trunk to devel branch distr-2.9
Modified: branches/distr-2.9/pkg/distrMod/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrMod/DESCRIPTION 2022-11-14 19:44:50 UTC (rev 1396)
+++ branches/distr-2.9/pkg/distrMod/DESCRIPTION 2022-11-14 19:46:00 UTC (rev 1397)
@@ -1,5 +1,5 @@
Package: distrMod
-Version: 2.9.0
+Version: 2.9.1
Date: 2019-03-13
Title: Object Oriented Implementation of Probability Models
Description: Implements S4 classes for probability models based on packages 'distr' and
Modified: branches/distr-2.9/pkg/distrMod/NAMESPACE
===================================================================
--- branches/distr-2.9/pkg/distrMod/NAMESPACE 2022-11-14 19:44:50 UTC (rev 1396)
+++ branches/distr-2.9/pkg/distrMod/NAMESPACE 2022-11-14 19:46:00 UTC (rev 1397)
@@ -79,10 +79,11 @@
export("NonSymmetric", "EvenSymmetric", "OddSymmetric", "FunSymmList")
export("ParamFamParameter", "ParamFamily", "L2ParamFamily",
"BinomFamily", "PoisFamily", "NbinomFamily", "NormLocationFamily",
- "NormScaleFamily", "ExpScaleFamily",
+ "NormScaleFamily", "ExpScaleFamily", "LogisticLocationScaleFamily",
"LnormScaleFamily", "GammaFamily", "BetaFamily", "NormLocationScaleFamily",
"CauchyLocationScaleFamily", "NbinomwithSizeFamily", "NbinomMeanSizeFamily",
- "LogisticLocationScaleFamily", "CauchyLocationFamily")
+ "LogisticLocationScaleFamily", "CauchyLocationFamily",
+ "NormFamily", "CauchyFamily", "LogisticFamily")
export("asCov", "trAsCov", "asHampel", "asBias", "asMSE", "asUnOvShoot",
"fiCov", "trFiCov", "fiHampel", "fiMSE", "fiBias", "fiUnOvShoot")
export("positiveBias", "negativeBias", "symmetricBias",
Modified: branches/distr-2.9/pkg/distrMod/R/SimpleL2ParamFamilies.R
===================================================================
--- branches/distr-2.9/pkg/distrMod/R/SimpleL2ParamFamilies.R 2022-11-14 19:44:50 UTC (rev 1396)
+++ branches/distr-2.9/pkg/distrMod/R/SimpleL2ParamFamilies.R 2022-11-14 19:46:00 UTC (rev 1397)
@@ -655,6 +655,9 @@
return(res)
}
+## alias
+NormFamily <- NormLocationScaleFamily
+
###############################################################################
## other location and / or scale models
###############################################################################
@@ -799,6 +802,8 @@
}
+## alias
+CauchyFamily <- CauchyLocationScaleFamily
##################################################################
## Logistic location scale family
@@ -833,6 +838,8 @@
return(res)
}
+## alias
+LogisticFamily <- LogisticLocationScaleFamily
#####################################
Modified: branches/distr-2.9/pkg/distrMod/inst/NEWS
===================================================================
--- branches/distr-2.9/pkg/distrMod/inst/NEWS 2022-11-14 19:44:50 UTC (rev 1396)
+++ branches/distr-2.9/pkg/distrMod/inst/NEWS 2022-11-14 19:46:00 UTC (rev 1397)
@@ -8,8 +8,12 @@
information)
##############
-v 2.9
+v 2.9.0
##############
+user-visible CHANGES:
++ as proposed by M. Kohl:
+ new aliases NormFamily for NormLocationScaleFamily, LogisticFamily for LogisticLocationScaleFamily,
+ CauchyFamily for CauchyLocationScaleFamily,
##############
v 2.8.5
Modified: branches/distr-2.9/pkg/distrMod/man/CauchyLocationScaleFamily.Rd
===================================================================
--- branches/distr-2.9/pkg/distrMod/man/CauchyLocationScaleFamily.Rd 2022-11-14 19:44:50 UTC (rev 1396)
+++ branches/distr-2.9/pkg/distrMod/man/CauchyLocationScaleFamily.Rd 2022-11-14 19:46:00 UTC (rev 1397)
@@ -1,5 +1,6 @@
\name{CauchyLocationScaleFamily}
\alias{CauchyLocationScaleFamily}
+\alias{CauchyFamily}
\title{Generating function for Cauchy location and scale families}
\description{
@@ -28,6 +29,7 @@
\seealso{\code{\link{L2ParamFamily-class}}, \code{\link[distr]{Cauchy-class}}}
\examples{
(C1 <- CauchyLocationScaleFamily())
+## synonymous: C1 <- CauchyFamily()
plot(C1)
FisherInfo(C1)
### need smaller integration range:
Modified: branches/distr-2.9/pkg/distrMod/man/LogisticLocationScaleFamily.Rd
===================================================================
--- branches/distr-2.9/pkg/distrMod/man/LogisticLocationScaleFamily.Rd 2022-11-14 19:44:50 UTC (rev 1396)
+++ branches/distr-2.9/pkg/distrMod/man/LogisticLocationScaleFamily.Rd 2022-11-14 19:46:00 UTC (rev 1397)
@@ -1,5 +1,6 @@
\name{LogisticLocationScaleFamily}
\alias{LogisticLocationScaleFamily}
+\alias{LogisticFamily}
\alias{LOGISTINT2}
@@ -35,6 +36,7 @@
\seealso{\code{\link{L2ParamFamily-class}}, \code{\link[distr]{Logis-class}}}
\examples{
(L1 <- LogisticLocationScaleFamily())
+## synonymous: L1 <- LogisticFamily()
plot(L1)
FisherInfo(L1)
### need smaller integration range:
Modified: branches/distr-2.9/pkg/distrMod/man/NormLocationScaleFamily.Rd
===================================================================
--- branches/distr-2.9/pkg/distrMod/man/NormLocationScaleFamily.Rd 2022-11-14 19:44:50 UTC (rev 1396)
+++ branches/distr-2.9/pkg/distrMod/man/NormLocationScaleFamily.Rd 2022-11-14 19:46:00 UTC (rev 1397)
@@ -1,5 +1,6 @@
\name{NormLocationScaleFamily}
\alias{NormLocationScaleFamily}
+\alias{NormFamily}
\title{Generating function for normal location and scale families}
\description{
@@ -28,6 +29,7 @@
\seealso{\code{\link{L2ParamFamily-class}}, \code{\link[distr]{Norm-class}}}
\examples{
(N1 <- NormLocationScaleFamily())
+## synonymous: N1 <- NormFamily()
plot(N1)
FisherInfo(N1)
checkL2deriv(N1)
Modified: branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
===================================================================
--- branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save 2022-11-14 19:44:50 UTC (rev 1396)
+++ branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save 2022-11-14 19:46:00 UTC (rev 1397)
@@ -1,5 +1,5 @@
-R version 4.1.2 Patched (2022-01-17 r81511) -- "Bird Hippie"
+R Under development (unstable) (2022-09-25 r82916 ucrt) -- "Unsuffered Consequences"
Copyright (C) 2022 The R Foundation for Statistical Computing
Platform: x86_64-w64-mingw32/x64 (64-bit)
@@ -31,7 +31,7 @@
Loading required package: sfsmisc
:distr> Object Oriented Implementation of Distributions (version
-:distr> 2.8.0)
+:distr> 2.9.0)
:distr>
:distr> Attention: Arithmetics on distribution objects are
:distr> understood as operations on corresponding random variables
@@ -57,7 +57,7 @@
df, qqplot, sd
Loading required package: distrEx
-:distrEx> Extensions of Package 'distr' (version 2.8.0)
+:distrEx> Extensions of Package 'distr' (version 2.9.0)
:distrEx>
:distrEx> Note: Packages "e1071", "moments", "fBasics" should be
:distrEx> attached /before/ package "distrEx". See
@@ -92,7 +92,7 @@
Loading required package: MASS
Loading required package: stats4
:distrMod> Object Oriented Implementation of Probability Models
-:distrMod> (version 2.8.5)
+:distrMod> (version 2.9.0)
:distrMod>
:distrMod> Some functions from pkg's 'base' and 'stats' are
:distrMod> intentionally masked ---see distrModMASK().
@@ -313,7 +313,7 @@
>
> ### Name: CauchyLocationScaleFamily
> ### Title: Generating function for Cauchy location and scale families
-> ### Aliases: CauchyLocationScaleFamily
+> ### Aliases: CauchyLocationScaleFamily CauchyFamily
> ### Keywords: models
>
> ### ** Examples
@@ -339,6 +339,7 @@
[1] "The Cauchy Location and scale family is invariant under"
[2] "the group of transformations 'g(x) = scale*x + loc'"
[3] "with location parameter 'loc' and scale parameter 'scale'"
+> ## synonymous: C1 <- CauchyFamily()
> plot(C1)
> FisherInfo(C1)
An object of class "PosDefSymmMatrix"
@@ -421,7 +422,7 @@
dimnames = list(nms, nms0))
list(fval = fval0, mat = mat0)
}
-<bytecode: 0x00000000207b07a0>
+<bytecode: 0x0000017a0f4b5578>
Trafo / derivative matrix at which estimate was produced:
scale shape
shape 0.000 1
@@ -622,7 +623,7 @@
1)/c(scale = 1)
return(y)
}
-<environment: 0x000000001f0b16c8>
+<environment: 0x0000017a10591d40>
> ## IGNORE_RDIFF_BEGIN
> checkL2deriv(E1)
@@ -796,8 +797,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x000000002658fdd0>
-<environment: 0x0000000026591ac0>
+<bytecode: 0x0000017a0fa44f10>
+<environment: 0x0000017a0fa46c48>
>
> ## The function is currently defined as
@@ -1080,7 +1081,7 @@
1)/c(meanlog = 1)
return(y)
}
-<environment: 0x00000000237637a0>
+<environment: 0x0000017a0a709860>
> checkL2deriv(L1)
precision of centering: -0.003003394
@@ -1103,7 +1104,7 @@
>
> ### Name: LogisticLocationScaleFamily
> ### Title: Generating function for Logistic location and scale families
-> ### Aliases: LogisticLocationScaleFamily LOGISTINT2
+> ### Aliases: LogisticLocationScaleFamily LogisticFamily LOGISTINT2
> ### Keywords: models
>
> ### ** Examples
@@ -1132,6 +1133,7 @@
[1] "The normal location and scale family is invariant under"
[2] "the group of transformations 'g(x) = scale*x + loc'"
[3] "with location parameter 'loc' and scale parameter 'scale'"
+> ## synonymous: L1 <- LogisticFamily()
> plot(L1)
> FisherInfo(L1)
An object of class "PosDefSymmMatrix"
@@ -1286,18 +1288,6 @@
> ## Note: you can also use function MDEstimator!
> MCEstimator(x = x, ParamFamily = G, criterion = KolmogorovDist,
+ crit.name = "Kolmogorov distance")
-Warning in fn(par, ...) :
- Criterion evaluation at theta = 0.298,4.655 threw an error;
-returning starting par;
-
-Warning in fn(par, ...) :
- Criterion evaluation at theta = 0.764,4.655 threw an error;
-returning starting par;
-
-Warning in fn(par, ...) :
- Criterion evaluation at theta = 0.298,5.12 threw an error;
-returning starting par;
-
Evaluations of Minimum Kolmogorov distance estimate:
----------------------------------------------------
An object of class "MCEstimate"
@@ -1307,10 +1297,10 @@
samplesize: 50
estimate:
scale shape
-0.2983286 4.6547001
+0.3398645 4.2654569
Criterion:
Kolmogorov distance
- 1e+20
+ 0.06350364
>
> ## Total variation minimum distance estimator
> ## Note: you can also use function MDEstimator!
@@ -1899,7 +1889,7 @@
>
> ### Name: NormLocationScaleFamily
> ### Title: Generating function for normal location and scale families
-> ### Aliases: NormLocationScaleFamily
+> ### Aliases: NormLocationScaleFamily NormFamily
> ### Keywords: models
>
> ### ** Examples
@@ -1924,6 +1914,7 @@
[1] "The normal location and scale family is invariant under"
[2] "the group of transformations 'g(x) = scale*x + loc'"
[3] "with location parameter 'loc' and scale parameter 'scale'"
+> ## synonymous: N1 <- NormFamily()
> plot(N1)
> FisherInfo(N1)
An object of class "PosDefSymmMatrix"
@@ -2132,7 +2123,7 @@
else
return(sqrt(colSums(x^2)))
}
-<bytecode: 0x00000000205c6e80>
+<bytecode: 0x0000017a0818c308>
<environment: namespace:distrMod>
> name(EuclNorm)
[1] "EuclideanNorm"
@@ -2166,7 +2157,7 @@
else
return(sqrt(colSums(x^2)))
}
-<bytecode: 0x00000000205c6e80>
+<bytecode: 0x0000017a0818c308>
<environment: namespace:distrMod>
> ## IGNORE_RDIFF_END
@@ -2623,8 +2614,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A= A0)
-<bytecode: 0x00000000205b09e8>
-<environment: 0x000000002410f9f8>
+<bytecode: 0x0000017a08292700>
+<environment: 0x0000017a0f053790>
>
> ## The function is currently defined as
@@ -2663,8 +2654,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x00000000205049b8>
-<environment: 0x0000000021f64820>
+<bytecode: 0x0000017a07d886b0>
+<environment: 0x0000017a0f48d6c8>
>
> ## The function is currently defined as
@@ -3494,7 +3485,7 @@
> isKerAinKerB(D,ma)
[1] FALSE
> isKerAinKerB(ma,D)
-[1] TRUE
+[1] FALSE
> ## IGNORE_RDIFF_END
>
>
@@ -3687,7 +3678,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x000000001c904bf8>
+<bytecode: 0x0000017a032a7ac8>
> print(param(NS), show.details = "minimal")
An object of class "ParamWithScaleFamParameter"
name: location and scale
@@ -3736,7 +3727,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x000000001c904bf8>
+<bytecode: 0x0000017a032a7ac8>
Trafo / derivative matrix:
mean sd
mu/sig 0.3668695 -0.3024814
@@ -3779,7 +3770,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x000000001c904bf8>
+<bytecode: 0x0000017a032a7ac8>
Trafo / derivative matrix:
mean sd
mu/sig 0.3669 -0.3025
@@ -4145,7 +4136,7 @@
> cleanEx()
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 25.22 0.45 25.88 NA NA
+Time elapsed: 38.53 1 40.4 NA NA
> grDevices::dev.off()
null device
1
More information about the Distr-commits
mailing list