[Distr-commits] r1353 - branches/distr-2.9/pkg/distrMod/inst pkg/distrMod pkg/distrMod/inst pkg/distrMod/man pkg/distrMod/tests/Examples pkg/utils
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Jan 18 06:40:29 CET 2020
Author: ruckdeschel
Date: 2020-01-18 06:40:28 +0100 (Sat, 18 Jan 2020)
New Revision: 1353
Modified:
branches/distr-2.9/pkg/distrMod/inst/NEWS
pkg/distrMod/DESCRIPTION
pkg/distrMod/inst/NEWS
pkg/distrMod/man/0distrMod-package.Rd
pkg/distrMod/man/isKerAinKerB.Rd
pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
pkg/utils/DESCRIPTIONutilsExamples.R
Log:
distrMod [trunk]:
+ ported changes from rev 1351 from branch to trunk
+ updated date, version, and svn Rev information
Modified: branches/distr-2.9/pkg/distrMod/inst/NEWS
===================================================================
--- branches/distr-2.9/pkg/distrMod/inst/NEWS 2019-12-11 09:02:03 UTC (rev 1352)
+++ branches/distr-2.9/pkg/distrMod/inst/NEWS 2020-01-18 05:40:28 UTC (rev 1353)
@@ -11,6 +11,11 @@
v 2.9.0
##############
under the hood:
+
+##############
+v 2.8.3
+##############
+under the hood:
+ inserted another ## IGNORE_RDIFF_BEGIN comment to prevent NOTES when comparing R.out.save to
R.out on varying architectures, e.g. Rblas/ATLAS in isKerAinKerB
Modified: pkg/distrMod/DESCRIPTION
===================================================================
--- pkg/distrMod/DESCRIPTION 2019-12-11 09:02:03 UTC (rev 1352)
+++ pkg/distrMod/DESCRIPTION 2020-01-18 05:40:28 UTC (rev 1353)
@@ -1,6 +1,6 @@
Package: distrMod
-Version: 2.8.2
-Date: 2019-05-01
+Version: 2.8.3
+Date: 2020-01-18
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: 1344
+VCS/SVNRevision: 1352
Modified: pkg/distrMod/inst/NEWS
===================================================================
--- pkg/distrMod/inst/NEWS 2019-12-11 09:02:03 UTC (rev 1352)
+++ pkg/distrMod/inst/NEWS 2020-01-18 05:40:28 UTC (rev 1353)
@@ -8,6 +8,13 @@
information)
##############
+v 2.8.3
+##############
+under the hood:
++ inserted another ## IGNORE_RDIFF_BEGIN comment to prevent NOTES when comparing R.out.save to
+ R.out on varying architectures, e.g. Rblas/ATLAS in isKerAinKerB
+
+##############
v 2.8.2
##############
under the hood:
Modified: pkg/distrMod/man/0distrMod-package.Rd
===================================================================
--- pkg/distrMod/man/0distrMod-package.Rd 2019-12-11 09:02:03 UTC (rev 1352)
+++ pkg/distrMod/man/0distrMod-package.Rd 2020-01-18 05:40:28 UTC (rev 1353)
@@ -13,8 +13,8 @@
\details{
\tabular{ll}{
Package: \tab distrMod \cr
-Version: \tab 2.8.2 \cr
-Date: \tab 2019-05-01 \cr
+Version: \tab 2.8.3 \cr
+Date: \tab 2020-01-18 \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 1344 \cr
+VCS/SVNRevision: \tab 1352 \cr
}}
\section{Classes}{
\preformatted{
Modified: pkg/distrMod/man/isKerAinKerB.Rd
===================================================================
--- pkg/distrMod/man/isKerAinKerB.Rd 2019-12-11 09:02:03 UTC (rev 1352)
+++ pkg/distrMod/man/isKerAinKerB.Rd 2020-01-18 05:40:28 UTC (rev 1353)
@@ -27,8 +27,11 @@
\examples{
ma <- cbind(1,1,c(1,1,7))
D <- t(ma \%*\% c(0,1,-1))
+## IGNORE_RDIFF_BEGIN
+## note that results may vary according to BLAS
isKerAinKerB(D,ma)
isKerAinKerB(ma,D)
+## IGNORE_RDIFF_END
}
\keyword{algebra}
\keyword{array}
Modified: pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
===================================================================
--- pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save 2019-12-11 09:02:03 UTC (rev 1352)
+++ pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save 2020-01-18 05:40:28 UTC (rev 1353)
@@ -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)
+R Under development (unstable) (2020-01-16 r77668) -- "Unsuffered Consequences"
+Copyright (C) 2020 The R Foundation for Statistical Computing
+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.
@@ -92,7 +92,7 @@
Loading required package: MASS
Loading required package: stats4
:distrMod> Object Oriented Implementation of Probability Models
-:distrMod> (version 2.8.2)
+:distrMod> (version 2.8.3)
:distrMod>
:distrMod> Some functions from pkg's 'base' and 'stats' are
:distrMod> intentionally masked ---see distrModMASK().
@@ -169,7 +169,7 @@
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
@@ -421,7 +421,7 @@
dimnames = list(nms, nms0))
list(fval = fval0, mat = mat0)
}
-<bytecode: 0x000000000c79e3a8>
+<bytecode: 0x087a1e50>
Trafo / derivative matrix at which estimate was produced:
scale shape
shape 0.000 1
@@ -622,11 +622,11 @@
1)/c(scale = 1)
return(y)
}
-<environment: 0x0000000014db0328>
+<environment: 0x075876b0>
> ## 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
@@ -755,7 +755,7 @@
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
@@ -796,8 +796,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x000000000da8c148>
-<environment: 0x000000000da8a458>
+<bytecode: 0x0d4dd040>
+<environment: 0x0d4debf0>
>
> ## The function is currently defined as
@@ -1080,7 +1080,7 @@
1)/c(meanlog = 1)
return(y)
}
-<environment: 0x0000000011e53cf0>
+<environment: 0x0ce04940>
> checkL2deriv(L1)
precision of centering: -0.003003394
@@ -1328,10 +1328,10 @@
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!)
@@ -2123,7 +2123,7 @@
else
return(sqrt(colSums(x^2)))
}
-<bytecode: 0x00000000123dccb0>
+<bytecode: 0x0b2ed500>
<environment: namespace:distrMod>
> name(EuclNorm)
[1] "EuclideanNorm"
@@ -2157,7 +2157,7 @@
else
return(sqrt(colSums(x^2)))
}
-<bytecode: 0x00000000123dccb0>
+<bytecode: 0x0b2ed500>
<environment: namespace:distrMod>
> ## IGNORE_RDIFF_END
@@ -2614,8 +2614,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A= A0)
-<bytecode: 0x000000001138cef8>
-<environment: 0x000000000fbd4da0>
+<bytecode: 0x09f24d80>
+<environment: 0x09f23a10>
>
> ## The function is currently defined as
@@ -2654,8 +2654,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x0000000015369200>
-<environment: 0x0000000013be6280>
+<bytecode: 0x09be5248>
+<environment: 0x09be2ec8>
>
> ## The function is currently defined as
@@ -2683,7 +2683,7 @@
>
> ## IGNORE_RDIFF_BEGIN
> addAlphTrsp2col(rgb(1,0.3,0.03), 25)
-[1] "#FF4D0819"
+[1] "#FF4C0819"
> ## gives "#FF4C0819" on 32bit and "#FF4D0819" on 64bit
> ## IGNORE_RDIFF_END
> addAlphTrsp2col("darkblue", 25)
@@ -3482,10 +3482,13 @@
>
> ma <- cbind(1,1,c(1,1,7))
> D <- t(ma %*% c(0,1,-1))
+> ## IGNORE_RDIFF_BEGIN
+> ## note that results may vary according to BLAS
> isKerAinKerB(D,ma)
[1] FALSE
> isKerAinKerB(ma,D)
[1] TRUE
+> ## IGNORE_RDIFF_END
>
>
>
@@ -3677,7 +3680,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x00000000148f3898>
+<bytecode: 0x0716a5a0>
> print(param(NS), show.details = "minimal")
An object of class "ParamWithScaleFamParameter"
name: location and scale
@@ -3726,7 +3729,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x00000000148f3898>
+<bytecode: 0x0716a5a0>
Trafo / derivative matrix:
mean sd
mu/sig 0.3668695 -0.3024814
@@ -3769,7 +3772,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x00000000148f3898>
+<bytecode: 0x0716a5a0>
Trafo / derivative matrix:
mean sd
mu/sig 0.3669 -0.3025
@@ -4135,7 +4138,7 @@
> cleanEx()
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 43.45 1.58 81.53 NA NA
+Time elapsed: 51.19 1.93 83.46 NA NA
> grDevices::dev.off()
null device
1
Modified: pkg/utils/DESCRIPTIONutilsExamples.R
===================================================================
--- pkg/utils/DESCRIPTIONutilsExamples.R 2019-12-11 09:02:03 UTC (rev 1352)
+++ pkg/utils/DESCRIPTIONutilsExamples.R 2020-01-18 05:40:28 UTC (rev 1353)
@@ -368,3 +368,63 @@
pkgs=Pkgs, values=Values,ReqRVersion =ReqRVersion0,
ReqDistrPkgVersion =ReqDistrPkgVersion0)
}
+
+if(FALSE){## nur RandVar Version 1.2.1 in trunk
+Pkgs <- c("RandVar")
+Names <- c("Version")
+Values <- matrix(c("1.2.1"),1,length(Pkgs))
+ReqRVersion0 <- rep("R(>= 3.4)",length(Pkgs))
+ReqDistrPkgVersion0 <- vector("list",length(Pkgs))
+names(ReqDistrPkgVersion0) <- Pkgs
+ReqDistrPkgVersion0[["RandVar"]] <- NA
+for(pk in Pkgs[-1]) ReqDistrPkgVersion0[[pk]] <- c("distr"="distr(>= 2.8.0)",
+ "distrEx"="distrEx(>= 2.8.0)","distrMod"="distrMod(>= 2.8.0)",
+ "RandVar"="RandVar(>= 1.2.0)", "RobAStBase"="RobAStBase(>= 1.2.0)",
+ "ROptEst"="ROptEst(>= 1.2.0)", "ROptEstOld"="ROptEstOld(>= 1.2.0)",
+ "RobAStRDA"="RobAStRDA(>= 1.2.0)", "ROptRegTS"="ROptRegTS(>= 1.2.0)")
+colnames(Values) <- names(ReqRVersion0)<- Pkgs
+rownames(Values) <- Names
+changeDescription(startDir = "C:/rtest/robast/",names=Names,
+ pkgs=Pkgs, values=Values,ReqRVersion =ReqRVersion0,
+ ReqDistrPkgVersion =ReqDistrPkgVersion0)
+}
+
+if(FALSE){## nur RandVar Version 1.3.0 in branch
+Pkgs <- c("RandVar")
+Names <- c("Version")
+Values <- matrix(c("1.3.0"),1,length(Pkgs))
+ReqRVersion0 <- rep("R(>= 3.4)",length(Pkgs))
+ReqDistrPkgVersion0 <- vector("list",length(Pkgs))
+names(ReqDistrPkgVersion0) <- Pkgs
+ReqDistrPkgVersion0[["RandVar"]] <- NA
+for(pk in Pkgs[-1]) ReqDistrPkgVersion0[[pk]] <- c("distr"="distr(>= 2.8.0)",
+ "distrEx"="distrEx(>= 2.8.0)","distrMod"="distrMod(>= 2.8.0)",
+ "RandVar"="RandVar(>= 1.2.0)", "RobAStBase"="RobAStBase(>= 1.2.0)",
+ "ROptEst"="ROptEst(>= 1.2.0)", "ROptEstOld"="ROptEstOld(>= 1.2.0)",
+ "RobAStRDA"="RobAStRDA(>= 1.2.0)", "ROptRegTS"="ROptRegTS(>= 1.2.0)")
+colnames(Values) <- names(ReqRVersion0)<- Pkgs
+rownames(Values) <- Names
+changeDescription(startDir = "C:/rtest/robast/branches/robast-1.3",names=Names,
+ pkgs=Pkgs, values=Values,ReqRVersion =ReqRVersion0,
+ ReqDistrPkgVersion =ReqDistrPkgVersion0)
+}
+
+if(FALSE){## nur distrMod Version 2.8.3 in trunk
+Pkgs <- c("distrMod")
+Names <- c("Version")
+Values <- matrix(c("2.8.3"),1,length(Pkgs))
+ReqRVersion0 <- c(NA,rep("R(>= 3.4)",length(Pkgs)-1))
+ReqDistrPkgVersion0 <- vector("list",length(Pkgs))
+names(ReqDistrPkgVersion0) <- Pkgs
+ReqDistrPkgVersion0[["RandVar"]] <- NA
+for(pk in Pkgs[-1]) ReqDistrPkgVersion0[[pk]] <- c("distr"="distr(>= 2.8.0)",
+ "distrEx"="distrEx(>= 2.8.0)","distrMod"="distrMod(>= 2.8.0)",
+ "RandVar"="RandVar(>= 1.2.0)")
+colnames(Values) <- names(ReqRVersion0) <- Pkgs
+rownames(Values) <- Names
+changeDescription(startDir = "C:/rtest/distr",names=Names,
+ pkgs=Pkgs, values=Values,ReqRVersion =ReqRVersion0,
+ ReqDistrPkgVersion =ReqDistrPkgVersion0)
+updateHTMLpages(pkgNames ="distrMod", pkgVersions = "2.8.3")
+}
+
More information about the Distr-commits
mailing list