Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.r-project.org/R/branches/R-3-2-branch@69701 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
ripley committed Nov 26, 2015
1 parent 1bbda86 commit fc15843
Show file tree
Hide file tree
Showing 46 changed files with 84 additions and 84 deletions.
4 changes: 2 additions & 2 deletions src/library/grDevices/tests/ps-tests.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -95,4 +95,4 @@ null device
>
> proc.time()
user system elapsed
0.389 0.013 0.404
0.343 0.013 0.345
4 changes: 2 additions & 2 deletions src/library/grDevices/tests/xfig-tests.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -102,4 +102,4 @@ Type 'q()' to quit R.
>
> proc.time()
user system elapsed
0.180 0.019 0.189
0.129 0.014 0.134
4 changes: 2 additions & 2 deletions src/library/grid/tests/testls.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -340,4 +340,4 @@ List of 6
>
> proc.time()
user system elapsed
0.220 0.015 0.226
0.239 0.019 0.246
4 changes: 2 additions & 2 deletions src/library/parallel/tests/multicore2.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -45,4 +45,4 @@ Calculations on Transformed Scale; Intervals on Original Scale
>
> proc.time()
user system elapsed
0.130 0.017 0.204
0.121 0.017 0.229
4 changes: 2 additions & 2 deletions src/library/parallel/tests/snow2.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -50,4 +50,4 @@ Calculations on Transformed Scale; Intervals on Original Scale
>
> proc.time()
user system elapsed
0.175 0.023 0.573
0.171 0.028 0.621
4 changes: 2 additions & 2 deletions src/library/stats/tests/glm.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -29,4 +29,4 @@ Warning messages:
>
> proc.time()
user system elapsed
0.110 0.011 0.111
0.135 0.019 0.143
4 changes: 2 additions & 2 deletions src/library/stats/tests/ks-test.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -114,4 +114,4 @@ In ks.test(round(ds2, 1), "pnorm", exact = TRUE) :
>
> proc.time()
user system elapsed
0.118 0.018 0.128
0.108 0.014 0.113
4 changes: 2 additions & 2 deletions src/library/stats/tests/nls.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -703,4 +703,4 @@ Warning in nls(y ~ b0[fac] + b1 * x, start = list(b0 = c(1, 1), b1 = 101), :
>
> proc.time()
user system elapsed
1.191 0.026 1.205
1.129 0.020 1.139
4 changes: 2 additions & 2 deletions src/library/stats/tests/simulate.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -406,4 +406,4 @@ log(u) 0.015569 0.00033659 46.256 5.7704e-10
>
> proc.time()
user system elapsed
0.164 0.021 0.177
0.165 0.019 0.174
4 changes: 2 additions & 2 deletions tests/Examples/datasets-Ex.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -3458,7 +3458,7 @@ c0 -5.14
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 1.316 0.021 1.338 0 0
Time elapsed: 1.283 0.024 1.307 0 0
> grDevices::dev.off()
null device
1
Expand Down
4 changes: 2 additions & 2 deletions tests/Examples/grDevices-Ex.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -3764,7 +3764,7 @@ $zlab
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 7.999 0.145 8.149 0 0
Time elapsed: 7.666 0.14 7.808 0 0
> grDevices::dev.off()
null device
1
Expand Down
8 changes: 4 additions & 4 deletions tests/Examples/graphics-Ex.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -2066,7 +2066,7 @@ N
> points.default # to see how it calls "plot.xy(xy.coords(x, y), ...)"
function (x, y = NULL, type = "p", ...)
plot.xy(xy.coords(x, y), type = type, ...)
<bytecode: 0x3967fe8>
<bytecode: 0x226f648>
<environment: namespace:graphics>
>
>
Expand Down Expand Up @@ -2936,7 +2936,7 @@ function (xy = 1, warn.log = TRUE)
u <- par("usr")
xy * c(u[2L] - u[1L], u[4L] - u[3L])/par("pin")
}
<bytecode: 0x3c20908>
<bytecode: 0x2627700>
<environment: namespace:graphics>
>
> ## plot labels offset 0.12 inches to the right
Expand Down Expand Up @@ -3016,7 +3016,7 @@ function (xy = 1, warn.log = TRUE)
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 1.843 0.039 1.883 0 0
Time elapsed: 1.786 0.024 1.81 0 0
> grDevices::dev.off()
null device
1
Expand Down
4 changes: 2 additions & 2 deletions tests/Examples/grid-Ex.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -2058,7 +2058,7 @@ vp1::vp2
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 1.057 0.006 1.064 0 0
Time elapsed: 1 0.014 1.013 0 0
> grDevices::dev.off()
null device
1
Expand Down
4 changes: 2 additions & 2 deletions tests/Examples/splines-Ex.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -582,7 +582,7 @@ attr(,"class")
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 0.107 0 0.107 0 0
Time elapsed: 0.098 0.006 0.104 0 0
> grDevices::dev.off()
null device
1
Expand Down
22 changes: 11 additions & 11 deletions tests/Examples/stats-Ex.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -3792,7 +3792,7 @@ sigma^2 estimated as 0.4566: log likelihood = -101.2, aic = 212.4
>
> asOneSidedFormula("age")
~age
<environment: 0x3046910>
<environment: 0x5ada038>
> asOneSidedFormula(~ age)
~age
>
Expand Down Expand Up @@ -4755,7 +4755,7 @@ function (V)
r[cbind(1L:p, 1L:p)] <- 1
r
}
<bytecode: 0x48c4038>
<bytecode: 0x593a510>
<environment: namespace:stats>
> stopifnot(all.equal(Cl, cov2cor(cov(longley))),
+ all.equal(cor(longley, method = "kendall"),
Expand Down Expand Up @@ -7279,7 +7279,7 @@ attr(,".Environment")
> environment(as.formula("y ~ x"))
<environment: R_GlobalEnv>
> environment(as.formula("y ~ x", env = new.env()))
<environment: 0x26d92c8>
<environment: 0x35ad868>
>
>
> ## Create a formula for a model with a large number of variables:
Expand Down Expand Up @@ -11762,14 +11762,14 @@ attr(,"class")
$linkfun
function (mu)
mu^lambda
<bytecode: 0x4d884f8>
<environment: 0x4d7e4a8>
<bytecode: 0x56f9018>
<environment: 0x56eec00>

$linkinv
function (eta)
pmax(eta^(1/lambda), .Machine$double.eps)
<bytecode: 0x4d88610>
<environment: 0x4d7e4a8>
<bytecode: 0x56f9130>
<environment: 0x56eec00>

>
>
Expand Down Expand Up @@ -15642,8 +15642,8 @@ Step function with continuity 'f'= 0.2 , 3 knots at
> unclass(sfun0)
function (v)
.approxfun(x, y, v, method, yleft, yright, f)
<bytecode: 0x408e2f0>
<environment: 0x780a108>
<bytecode: 0x45fe0e8>
<environment: 0x5472518>
attr(,"call")
stepfun(1:3, y0, f = 0)
> ls(envir = environment(sfun0))
Expand Down Expand Up @@ -17920,7 +17920,7 @@ Number of Fisher Scoring iterations: 6
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 4.43 0.108 4.54 0 0
Time elapsed: 4.368 0.107 4.476 0 0
> grDevices::dev.off()
null device
1
Expand Down
4 changes: 2 additions & 2 deletions tests/Examples/stats4-Ex.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -184,7 +184,7 @@ Coefficients:
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 0.293 0.004 0.298 0 0
Time elapsed: 0.337 0.003 0.34 0 0
> grDevices::dev.off()
null device
1
Expand Down
6 changes: 3 additions & 3 deletions tests/Examples/tools-Ex.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -188,7 +188,7 @@ Error in assertWarning(ff()) :
> bibstyle("unsorted", sortKeys = function(refs) seq_along(refs),
+ fmtPrefix = function(paper) paste0("[", paper$.index, "]"),
+ .init = TRUE)
<environment: 0x1d42498>
<environment: 0xf9ac68>
> print(refs, .bibstyle = "unsorted")
[1] R Core Team (2013). _R: A Language and Environment for Statistical
Computing_. R Foundation for Statistical Computing, Vienna, Austria.
Expand Down Expand Up @@ -981,7 +981,7 @@ List of 6
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 0.193 0.004 0.197 0 0
Time elapsed: 0.197 0.006 0.204 0 0
> grDevices::dev.off()
null device
1
Expand Down
2 changes: 1 addition & 1 deletion tests/R-intro.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down
2 changes: 1 addition & 1 deletion tests/any-all.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down
4 changes: 2 additions & 2 deletions tests/arith-true.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -323,5 +323,5 @@ Warning messages:
>
> ## Last Line:
> cat('Time elapsed: ', proc.time() - .proctime00,'\n')
Time elapsed: 0.152 0.001 0.153 0 0
Time elapsed: 0.15 0.001 0.15 0 0
>
2 changes: 1 addition & 1 deletion tests/arith.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down
2 changes: 1 addition & 1 deletion tests/array-subset.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down
2 changes: 1 addition & 1 deletion tests/complex.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down
4 changes: 2 additions & 2 deletions tests/d-p-q-r-tests.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down Expand Up @@ -1322,5 +1322,5 @@ Type 'q()' to quit R.
>
>
> cat("Time elapsed: ", proc.time() - .ptime,"\n")
Time elapsed: 0.971 0.009 0.981 0 0
Time elapsed: 0.891 0.009 0.9 0 0
>
2 changes: 1 addition & 1 deletion tests/datasets.Rout.save
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

R version 3.2.2 Patched (2015-11-19 r69664) -- "Fire Safety"
R version 3.2.2 Patched (2015-11-26 r69700) -- "Fire Safety"
Copyright (C) 2015 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)

Expand Down
Loading

0 comments on commit fc15843

Please sign in to comment.