Skip to content

Commit

Permalink
remove things related to S(!)
Browse files Browse the repository at this point in the history
don't rely on round-to-end for the exact printout


git-svn-id: https://svn.r-project.org/R/trunk@23329 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
ripley committed Feb 25, 2003
1 parent 1f06ffd commit 7955baf
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 38 deletions.
7 changes: 4 additions & 3 deletions tests/print-tests.R
Expand Up @@ -6,9 +6,6 @@
#### == (csh)
opt.conformance <- 0

if(!is.R())options(echo = T, warn = 1)#-- for Splus
print(search())#---- for Splus

DIG <- function(d) if(missing(d)) options("digits")$dig else
options(digits=as.integer(d))

Expand All @@ -20,6 +17,10 @@ i1 <- as.integer(n1)

v1 <- 2^c(-12, 2*(-4:-2),3,6,9)
v2 <- v1^(63/64)
## avoid ending in `5' as printing then depends on rounding of
## the run-time (and not all round to even).
v1[2:4] <-c(3.90624e-03, 1.5624e-02, 6.24e-02)


v3 <- pi*100^(-1:3)
v4 <- (0:2)/1000 + 1e-10 #-- tougher one
Expand Down
69 changes: 34 additions & 35 deletions tests/print-tests.Rout.save
@@ -1,6 +1,6 @@

R : Copyright 2003, The R Development Core Team
Version 1.7.0 Under development (unstable) (2003-01-16)
Version 1.7.0 Under development (unstable) (2003-02-25)

R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
Expand All @@ -21,11 +21,6 @@ Type `q()' to quit R.
> #### == (csh)
> opt.conformance <- 0
>
> if(!is.R())options(echo = T, warn = 1)#-- for Splus
> print(search())#---- for Splus
[1] ".GlobalEnv" "package:ctest" "package:methods" "Autoloads"
[5] "package:base"
>
> DIG <- function(d) if(missing(d)) options("digits")$dig else
+ options(digits=as.integer(d))
>
Expand All @@ -37,6 +32,10 @@ Type `q()' to quit R.
>
> v1 <- 2^c(-12, 2*(-4:-2),3,6,9)
> v2 <- v1^(63/64)
> ## avoid ending in `5' as printing then depends on rounding of
> ## the run-time (and not all round to even).
> v1[2:4] <-c(3.90624e-03, 1.5624e-02, 6.24e-02)
>
>
> v3 <- pi*100^(-1:3)
> v4 <- (0:2)/1000 + 1e-10 #-- tougher one
Expand Down Expand Up @@ -85,17 +84,17 @@ Type `q()' to quit R.
>
> ## Assignment to .Options$digits: Does NOT work for print() nor cat()
> for(i in digs1) { .Options$digits <- i; cat(i,":"); print (v1[-1]) }
1 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
2 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
4 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
6 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
8 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
10 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
11 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
12 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
13 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
14 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
15 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
1 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
2 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
4 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
6 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
8 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
10 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
11 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
12 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
13 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
14 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
15 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
>
> ## using options() *does* things
> for(i in digs1) { DIG(i); cat(i,":"); print (v3) }
Expand Down Expand Up @@ -130,29 +129,29 @@ Type `q()' to quit R.
> for(i in digs1) { cat(i,":"); print(v1, digits=i) }
1 :[1] 2e-04 4e-03 2e-02 6e-02 8e+00 6e+01 5e+02
2 :[1] 2.4e-04 3.9e-03 1.6e-02 6.2e-02 8.0e+00 6.4e+01 5.1e+02
4 :[1] 2.441e-04 3.906e-03 1.562e-02 6.250e-02 8.000e+00 6.400e+01 5.120e+02
6 :[1] 2.44141e-04 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
8 :[1] 2.4414062e-04 3.9062500e-03 1.5625000e-02 6.2500000e-02 8.0000000e+00 6.4000000e+01 5.1200000e+02
10 :[1] 2.44140625e-04 3.90625000e-03 1.56250000e-02 6.25000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
11 :[1] 2.44140625e-04 3.90625000e-03 1.56250000e-02 6.25000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
12 :[1] 2.44140625e-04 3.90625000e-03 1.56250000e-02 6.25000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
13 :[1] 2.44140625e-04 3.90625000e-03 1.56250000e-02 6.25000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
14 :[1] 2.44140625e-04 3.90625000e-03 1.56250000e-02 6.25000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
15 :[1] 2.44140625e-04 3.90625000e-03 1.56250000e-02 6.25000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
4 :[1] 2.441e-04 3.906e-03 1.562e-02 6.240e-02 8.000e+00 6.400e+01 5.120e+02
6 :[1] 2.44141e-04 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
8 :[1] 2.4414062e-04 3.9062400e-03 1.5624000e-02 6.2400000e-02 8.0000000e+00 6.4000000e+01 5.1200000e+02
10 :[1] 2.44140625e-04 3.90624000e-03 1.56240000e-02 6.24000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
11 :[1] 2.44140625e-04 3.90624000e-03 1.56240000e-02 6.24000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
12 :[1] 2.44140625e-04 3.90624000e-03 1.56240000e-02 6.24000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
13 :[1] 2.44140625e-04 3.90624000e-03 1.56240000e-02 6.24000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
14 :[1] 2.44140625e-04 3.90624000e-03 1.56240000e-02 6.24000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
15 :[1] 2.44140625e-04 3.90624000e-03 1.56240000e-02 6.24000000e-02 8.00000000e+00 6.40000000e+01 5.12000000e+02
>
> ## R 0.50-a1: switches at 10 inst. 11
> for(i in digs1) { cat(i,":"); print(v1[-1], digits=i) }
1 :[1] 4e-03 2e-02 6e-02 8e+00 6e+01 5e+02
2 :[1] 3.9e-03 1.6e-02 6.2e-02 8.0e+00 6.4e+01 5.1e+02
4 :[1] 3.906e-03 1.562e-02 6.250e-02 8.000e+00 6.400e+01 5.120e+02
6 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
8 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
10 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
11 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
12 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
13 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
14 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
15 :[1] 3.90625e-03 1.56250e-02 6.25000e-02 8.00000e+00 6.40000e+01 5.12000e+02
4 :[1] 3.906e-03 1.562e-02 6.240e-02 8.000e+00 6.400e+01 5.120e+02
6 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
8 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
10 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
11 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
12 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
13 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
14 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
15 :[1] 3.90624e-03 1.56240e-02 6.24000e-02 8.00000e+00 6.40000e+01 5.12000e+02
>
> for(i in digs1) { DIG(i); cat(i,":", formatC(v2, digits=i, width=8),"\n") }
1 : 0.0003 0.004 0.02 0.07 8 6e+01 5e+02
Expand Down

0 comments on commit 7955baf

Please sign in to comment.