[Distr-commits] r1347 - branches/distr-2.9/pkg/distrMod/man branches/distr-2.9/pkg/distrMod/tests/Examples pkg/distrMod/man pkg/distrMod/tests/Examples

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Wed May 1 16:18:43 CEST 2019


Author: ruckdeschel
Date: 2019-05-01 16:18:42 +0200 (Wed, 01 May 2019)
New Revision: 1347

Modified:
   branches/distr-2.9/pkg/distrMod/man/addAlphTrsp2col.Rd
   branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
   pkg/distrMod/man/addAlphTrsp2col.Rd
   pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
Log:
[distrMod] final tweak yet another 32bit 64bit clitch to be caught -- rgb(1,0.3,0.03) returns different values for 32bit and 64bit; fixed in trunk (distrMod_2.8.2) and branch distr-2.9

Modified: branches/distr-2.9/pkg/distrMod/man/addAlphTrsp2col.Rd
===================================================================
--- branches/distr-2.9/pkg/distrMod/man/addAlphTrsp2col.Rd	2019-05-01 12:21:36 UTC (rev 1346)
+++ branches/distr-2.9/pkg/distrMod/man/addAlphTrsp2col.Rd	2019-05-01 14:18:42 UTC (rev 1347)
@@ -13,7 +13,10 @@
 \author{Peter Ruckdeschel \email{peter.ruckdeschel at uni-oldenburg.de}}
 %\note{}
 \examples{
+## IGNORE_RDIFF_BEGIN
   addAlphTrsp2col(rgb(1,0.3,0.03), 25)
+  ## gives "#FF4C0819" on 32bit and "#FF4D0819" on 64bit
+## IGNORE_RDIFF_END
   addAlphTrsp2col("darkblue", 25)
   addAlphTrsp2col("#AAAAAAAA",25)
   palette(rainbow(6))

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	2019-05-01 12:21:36 UTC (rev 1346)
+++ branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save	2019-05-01 14:18:42 UTC (rev 1347)
@@ -1,7 +1,7 @@
 
 R Under development (unstable) (2019-03-28 r76288) -- "Unsuffered Consequences"
 Copyright (C) 2019 The R Foundation for Statistical Computing
-Platform: i386-w64-mingw32/i386 (32-bit)
+Platform: x86_64-w64-mingw32/x64 (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
 You are welcome to redistribute it under certain conditions.
@@ -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
@@ -169,7 +169,7 @@
 shape2 -0.6449341  1.0000000
 > ## IGNORE_RDIFF_BEGIN
 > checkL2deriv(B1)
-precision of centering:	 3.963281e-05 3.963334e-05 
+precision of centering:	 3.96327e-05 3.963591e-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: 0x0785b5b8>
+<bytecode: 0x000000000c79e3a8>
 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: 0x0cd99b98>
+<environment: 0x0000000014db0328>
 
 > ## IGNORE_RDIFF_BEGIN
 > checkL2deriv(E1)
-precision of centering:	 -2.04266e-06 
+precision of centering:	 -2.042661e-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.04266e-06 1.791171e-06 
+precision of centering:	 -2.042661e-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: 0x0835e4e0>
-<environment: 0x0835d0f0>
+<bytecode: 0x000000000da8c148>
+<environment: 0x000000000da8a458>
 
 > 
 > ## The function is currently defined as
@@ -1080,7 +1080,7 @@
         1)/c(meanlog = 1)
     return(y)
 }
-<environment: 0x0d93e088>
+<environment: 0x0000000011e53cf0>
 
 > checkL2deriv(L1)
 precision of centering:	 -0.003003394 
@@ -1328,10 +1328,10 @@
 samplesize:   50
 estimate:
     scale     shape 
-0.2829625 5.0197311 
+0.2829687 5.0197306 
 Criterion:
 Total variation distance 
-               0.4819868 
+               0.4866141 
 > ## IGNORE_RDIFF_END
 > 
 > ## or smooth empirical distribution (takes some time!)
@@ -2123,7 +2123,7 @@
     else 
         return(sqrt(colSums(x^2)))
 }
-<bytecode: 0x08375ea0>
+<bytecode: 0x00000000123dccb0>
 <environment: namespace:distrMod>
 > name(EuclNorm)
 [1] "EuclideanNorm"
@@ -2157,7 +2157,7 @@
     else 
         return(sqrt(colSums(x^2)))
 }
-<bytecode: 0x08375ea0>
+<bytecode: 0x00000000123dccb0>
 <environment: namespace:distrMod>
 
 > ## IGNORE_RDIFF_END
@@ -2614,8 +2614,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A= A0)
-<bytecode: 0x0adda7f0>
-<environment: 0x0af18d28>
+<bytecode: 0x000000001138cef8>
+<environment: 0x000000000fbd4da0>
 
 > 
 > ## The function is currently defined as
@@ -2654,8 +2654,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x0b06e640>
-<environment: 0x0c6661f8>
+<bytecode: 0x0000000015369200>
+<environment: 0x0000000013be6280>
 
 > 
 > ## The function is currently defined as
@@ -2681,8 +2681,11 @@
 > 
 > ### ** Examples
 > 
+> ## IGNORE_RDIFF_BEGIN
 >   addAlphTrsp2col(rgb(1,0.3,0.03), 25)
-[1] "#FF4C0819"
+[1] "#FF4D0819"
+>   ## gives "#FF4C0819" on 32bit and "#FF4D0819" on 64bit
+> ## IGNORE_RDIFF_END
 >   addAlphTrsp2col("darkblue", 25)
 [1] "#00008B19"
 >   addAlphTrsp2col("#AAAAAAAA",25)
@@ -3674,7 +3677,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x0b7f0dc8>
+<bytecode: 0x00000000148f3898>
 > print(param(NS), show.details = "minimal")
 An object of class "ParamWithScaleFamParameter"
 name:	location and scale
@@ -3723,7 +3726,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x0b7f0dc8>
+<bytecode: 0x00000000148f3898>
 Trafo / derivative matrix:
             mean         sd
 mu/sig 0.3668695 -0.3024814
@@ -3766,7 +3769,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x0b7f0dc8>
+<bytecode: 0x00000000148f3898>
 Trafo / derivative matrix:
          mean      sd
 mu/sig 0.3669 -0.3025
@@ -4132,7 +4135,7 @@
 > cleanEx()
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  29.3 0.58 30 NA NA 
+Time elapsed:  43.45 1.58 81.53 NA NA 
 > grDevices::dev.off()
 null device 
           1 

Modified: pkg/distrMod/man/addAlphTrsp2col.Rd
===================================================================
--- pkg/distrMod/man/addAlphTrsp2col.Rd	2019-05-01 12:21:36 UTC (rev 1346)
+++ pkg/distrMod/man/addAlphTrsp2col.Rd	2019-05-01 14:18:42 UTC (rev 1347)
@@ -13,7 +13,10 @@
 \author{Peter Ruckdeschel \email{peter.ruckdeschel at uni-oldenburg.de}}
 %\note{}
 \examples{
+## IGNORE_RDIFF_BEGIN
   addAlphTrsp2col(rgb(1,0.3,0.03), 25)
+  ## gives "#FF4C0819" on 32bit and "#FF4D0819" on 64bit
+## IGNORE_RDIFF_END
   addAlphTrsp2col("darkblue", 25)
   addAlphTrsp2col("#AAAAAAAA",25)
   palette(rainbow(6))

Modified: pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
===================================================================
--- pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save	2019-05-01 12:21:36 UTC (rev 1346)
+++ pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save	2019-05-01 14:18:42 UTC (rev 1347)
@@ -1,7 +1,7 @@
 
 R Under development (unstable) (2019-03-28 r76288) -- "Unsuffered Consequences"
 Copyright (C) 2019 The R Foundation for Statistical Computing
-Platform: i386-w64-mingw32/i386 (32-bit)
+Platform: x86_64-w64-mingw32/x64 (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
 You are welcome to redistribute it under certain conditions.
@@ -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
@@ -169,7 +169,7 @@
 shape2 -0.6449341  1.0000000
 > ## IGNORE_RDIFF_BEGIN
 > checkL2deriv(B1)
-precision of centering:	 3.963281e-05 3.963334e-05 
+precision of centering:	 3.96327e-05 3.963591e-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: 0x0785b5b8>
+<bytecode: 0x000000000c79e3a8>
 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: 0x0cd99b98>
+<environment: 0x0000000014db0328>
 
 > ## IGNORE_RDIFF_BEGIN
 > checkL2deriv(E1)
-precision of centering:	 -2.04266e-06 
+precision of centering:	 -2.042661e-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.04266e-06 1.791171e-06 
+precision of centering:	 -2.042661e-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: 0x0835e4e0>
-<environment: 0x0835d0f0>
+<bytecode: 0x000000000da8c148>
+<environment: 0x000000000da8a458>
 
 > 
 > ## The function is currently defined as
@@ -1080,7 +1080,7 @@
         1)/c(meanlog = 1)
     return(y)
 }
-<environment: 0x0d93e088>
+<environment: 0x0000000011e53cf0>
 
 > checkL2deriv(L1)
 precision of centering:	 -0.003003394 
@@ -1328,10 +1328,10 @@
 samplesize:   50
 estimate:
     scale     shape 
-0.2829625 5.0197311 
+0.2829687 5.0197306 
 Criterion:
 Total variation distance 
-               0.4819868 
+               0.4866141 
 > ## IGNORE_RDIFF_END
 > 
 > ## or smooth empirical distribution (takes some time!)
@@ -2123,7 +2123,7 @@
     else 
         return(sqrt(colSums(x^2)))
 }
-<bytecode: 0x08375ea0>
+<bytecode: 0x00000000123dccb0>
 <environment: namespace:distrMod>
 > name(EuclNorm)
 [1] "EuclideanNorm"
@@ -2157,7 +2157,7 @@
     else 
         return(sqrt(colSums(x^2)))
 }
-<bytecode: 0x08375ea0>
+<bytecode: 0x00000000123dccb0>
 <environment: namespace:distrMod>
 
 > ## IGNORE_RDIFF_END
@@ -2614,8 +2614,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A= A0)
-<bytecode: 0x0adda7f0>
-<environment: 0x0af18d28>
+<bytecode: 0x000000001138cef8>
+<environment: 0x000000000fbd4da0>
 
 > 
 > ## The function is currently defined as
@@ -2654,8 +2654,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x0b06e640>
-<environment: 0x0c6661f8>
+<bytecode: 0x0000000015369200>
+<environment: 0x0000000013be6280>
 
 > 
 > ## The function is currently defined as
@@ -2681,8 +2681,11 @@
 > 
 > ### ** Examples
 > 
+> ## IGNORE_RDIFF_BEGIN
 >   addAlphTrsp2col(rgb(1,0.3,0.03), 25)
-[1] "#FF4C0819"
+[1] "#FF4D0819"
+>   ## gives "#FF4C0819" on 32bit and "#FF4D0819" on 64bit
+> ## IGNORE_RDIFF_END
 >   addAlphTrsp2col("darkblue", 25)
 [1] "#00008B19"
 >   addAlphTrsp2col("#AAAAAAAA",25)
@@ -3674,7 +3677,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x0b7f0dc8>
+<bytecode: 0x00000000148f3898>
 > print(param(NS), show.details = "minimal")
 An object of class "ParamWithScaleFamParameter"
 name:	location and scale
@@ -3723,7 +3726,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x0b7f0dc8>
+<bytecode: 0x00000000148f3898>
 Trafo / derivative matrix:
             mean         sd
 mu/sig 0.3668695 -0.3024814
@@ -3766,7 +3769,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x0b7f0dc8>
+<bytecode: 0x00000000148f3898>
 Trafo / derivative matrix:
          mean      sd
 mu/sig 0.3669 -0.3025
@@ -4132,7 +4135,7 @@
 > cleanEx()
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  29.3 0.58 30 NA NA 
+Time elapsed:  43.45 1.58 81.53 NA NA 
 > grDevices::dev.off()
 null device 
           1 



More information about the Distr-commits mailing list