[Distr-commits] r1354 - branches/distr-2.9/pkg/distrMod/tests/Examples pkg/distrMod/inst pkg/distrMod/tests/Examples pkg/utils www
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Jan 18 16:21:49 CET 2020
Author: ruckdeschel
Date: 2020-01-18 16:21:48 +0100 (Sat, 18 Jan 2020)
New Revision: 1354
Modified:
branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
pkg/distrMod/inst/MASKING
pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
pkg/utils/finde.R
www/distrMod.html
Log:
[distrMod] branch 2.9 and trunk:
+ futile attempt to fix line feed issue in the diffs (3016d3015) of <pkg>-ex.Rout[.save] caused by a call to file.show() which inserts a line feed on Windows but not on Linux
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 2020-01-18 05:40:28 UTC (rev 1353)
+++ branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save 2020-01-18 15:21:48 UTC (rev 1354)
@@ -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: 0x065e9eb0>
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: 0x0adb3bf0>
> ## 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: 0x083c6bd0>
+<environment: 0x083c2300>
>
> ## The function is currently defined as
@@ -1080,7 +1080,7 @@
1)/c(meanlog = 1)
return(y)
}
-<environment: 0x0000000011e53cf0>
+<environment: 0x0773a0e0>
> 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: 0x0bfb1e38>
<environment: namespace:distrMod>
> name(EuclNorm)
[1] "EuclideanNorm"
@@ -2157,7 +2157,7 @@
else
return(sqrt(colSums(x^2)))
}
-<bytecode: 0x00000000123dccb0>
+<bytecode: 0x0bfb1e38>
<environment: namespace:distrMod>
> ## IGNORE_RDIFF_END
@@ -2614,8 +2614,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A= A0)
-<bytecode: 0x000000001138cef8>
-<environment: 0x000000000fbd4da0>
+<bytecode: 0x09408548>
+<environment: 0x09406db8>
>
> ## The function is currently defined as
@@ -2654,8 +2654,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x0000000015369200>
-<environment: 0x0000000013be6280>
+<bytecode: 0x0926fd98>
+<environment: 0x0926f178>
>
> ## 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)
@@ -3202,8 +3202,6 @@
masking:
+confint() (package "stats")
-
-
>
>
>
@@ -3482,10 +3480,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 +3678,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x00000000148f3898>
+<bytecode: 0x06616820>
> print(param(NS), show.details = "minimal")
An object of class "ParamWithScaleFamParameter"
name: location and scale
@@ -3726,7 +3727,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x00000000148f3898>
+<bytecode: 0x06616820>
Trafo / derivative matrix:
mean sd
mu/sig 0.3668695 -0.3024814
@@ -3769,7 +3770,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x00000000148f3898>
+<bytecode: 0x06616820>
Trafo / derivative matrix:
mean sd
mu/sig 0.3669 -0.3025
@@ -4135,7 +4136,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: 44.57 1.22 73.66 NA NA
> grDevices::dev.off()
null device
1
Modified: pkg/distrMod/inst/MASKING
===================================================================
--- pkg/distrMod/inst/MASKING 2020-01-18 05:40:28 UTC (rev 1353)
+++ pkg/distrMod/inst/MASKING 2020-01-18 15:21:48 UTC (rev 1354)
@@ -1,16 +1,14 @@
-######################################################################
-# On masking of and by other functions in package "distrMod"
-######################################################################
-
-Attention:
-
-*** intentional masking: ***
-
-To be able to use the same symbol for objects of S4-classes 'Estimate',
-we intentionally mask the following function[s] --- however this/these
-function[s] may still be used in exactly the same way as before
-masking:
-
-+confint() (package "stats")
-
-
+######################################################################
+# On masking of and by other functions in package "distrMod"
+######################################################################
+
+Attention:
+
+*** intentional masking: ***
+
+To be able to use the same symbol for objects of S4-classes 'Estimate',
+we intentionally mask the following function[s] --- however this/these
+function[s] may still be used in exactly the same way as before
+masking:
+
++confint() (package "stats")
Modified: pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
===================================================================
--- pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save 2020-01-18 05:40:28 UTC (rev 1353)
+++ pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save 2020-01-18 15:21:48 UTC (rev 1354)
@@ -421,7 +421,7 @@
dimnames = list(nms, nms0))
list(fval = fval0, mat = mat0)
}
-<bytecode: 0x087a1e50>
+<bytecode: 0x065e9eb0>
Trafo / derivative matrix at which estimate was produced:
scale shape
shape 0.000 1
@@ -622,7 +622,7 @@
1)/c(scale = 1)
return(y)
}
-<environment: 0x075876b0>
+<environment: 0x0adb3bf0>
> ## IGNORE_RDIFF_BEGIN
> checkL2deriv(E1)
@@ -796,8 +796,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x0d4dd040>
-<environment: 0x0d4debf0>
+<bytecode: 0x083c6bd0>
+<environment: 0x083c2300>
>
> ## The function is currently defined as
@@ -1080,7 +1080,7 @@
1)/c(meanlog = 1)
return(y)
}
-<environment: 0x0ce04940>
+<environment: 0x0773a0e0>
> checkL2deriv(L1)
precision of centering: -0.003003394
@@ -2123,7 +2123,7 @@
else
return(sqrt(colSums(x^2)))
}
-<bytecode: 0x0b2ed500>
+<bytecode: 0x0bfb1e38>
<environment: namespace:distrMod>
> name(EuclNorm)
[1] "EuclideanNorm"
@@ -2157,7 +2157,7 @@
else
return(sqrt(colSums(x^2)))
}
-<bytecode: 0x0b2ed500>
+<bytecode: 0x0bfb1e38>
<environment: namespace:distrMod>
> ## IGNORE_RDIFF_END
@@ -2614,8 +2614,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A= A0)
-<bytecode: 0x09f24d80>
-<environment: 0x09f23a10>
+<bytecode: 0x09408548>
+<environment: 0x09406db8>
>
> ## The function is currently defined as
@@ -2654,8 +2654,8 @@
Slot "fct":
function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x09be5248>
-<environment: 0x09be2ec8>
+<bytecode: 0x0926fd98>
+<environment: 0x0926f178>
>
> ## The function is currently defined as
@@ -3202,8 +3202,6 @@
masking:
+confint() (package "stats")
-
-
>
>
>
@@ -3680,7 +3678,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x0716a5a0>
+<bytecode: 0x06616820>
> print(param(NS), show.details = "minimal")
An object of class "ParamWithScaleFamParameter"
name: location and scale
@@ -3729,7 +3727,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x0716a5a0>
+<bytecode: 0x06616820>
Trafo / derivative matrix:
mean sd
mu/sig 0.3668695 -0.3024814
@@ -3772,7 +3770,7 @@
dimnames(mat) <- list(nfval, c("mean", "sd"))
return(list(fval = fval, mat = mat))
}
-<bytecode: 0x0716a5a0>
+<bytecode: 0x06616820>
Trafo / derivative matrix:
mean sd
mu/sig 0.3669 -0.3025
@@ -4138,7 +4136,7 @@
> cleanEx()
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 51.19 1.93 83.46 NA NA
+Time elapsed: 44.57 1.22 73.66 NA NA
> grDevices::dev.off()
null device
1
Modified: pkg/utils/finde.R
===================================================================
--- pkg/utils/finde.R 2020-01-18 05:40:28 UTC (rev 1353)
+++ pkg/utils/finde.R 2020-01-18 15:21:48 UTC (rev 1354)
@@ -27,7 +27,7 @@
}
if(FALSE){
-finde(x="q\\(", dir ="C:/rtest/distr/branches/distr-2.7/pkg/", rec=TRUE)
+finde(x="\\(CLT-based\\) confidence interval", dir ="C:/rtest/distr/pkg/", rec=TRUE)
finde(x="http\\:/", dir ="C:/rtest/distr/branches/distr-2.7/pkg/distr/", rec=TRUE)
#finde(x="Wow6432Node", dir ="C:/R/devel/src/gnuwin32", rec=TRUE, ext="")
finde(x="omega", dir ="C:/rtest/distr/branches/distr-2.7/pkg/distrMod/", rec=TRUE)
Modified: www/distrMod.html
===================================================================
--- www/distrMod.html 2020-01-18 05:40:28 UTC (rev 1353)
+++ www/distrMod.html 2020-01-18 15:21:48 UTC (rev 1354)
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head>
@@ -29,11 +29,11 @@
<hr style="width: 100%; height: 2px;">
-<div style="text-align: justify;"> Version: 2.8.0<br>
+<div style="text-align: justify;"> Version: 2.8.3 <br>
-Release Date: 2019-03-12 <br>
+Release Date: 2020-01-18 <br>
@@ -1028,7 +1028,7 @@
<div style="text-align: justify; color: rgb(0, 0, 0);">This page is
maintained by <a href="mailto:peter.ruckdeschel at uni-oldenburg.de?subject=distr-package">Peter
Ruckdeschel</a>
-and last updated on 2019-03-12.<br>
+and last updated on 2020-01-18. <br>
@@ -1036,4 +1036,4 @@
-</body></html>
\ No newline at end of file
+</body></html>
More information about the Distr-commits
mailing list