Skip to content

Commit f8cf131

Browse files
author
ripley
committed
missed updates
git-svn-id: https://svn.r-project.org/R/trunk@87311 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 4d68189 commit f8cf131

File tree

2 files changed

+52
-53
lines changed

2 files changed

+52
-53
lines changed

tests/Examples/datasets-Ex.Rout.save

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
R Under development (unstable) (2024-03-04 r86047) -- "Unsuffered Consequences"
2+
R Under development (unstable) (2024-11-08 r87310) -- "Unsuffered Consequences"
33
Copyright (C) 2024 The R Foundation for Statistical Computing
4-
Platform: x86_64-pc-linux-gnu
4+
Platform: aarch64-apple-darwin24.1.0
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.
77
You are welcome to redistribute it under certain conditions.
@@ -3158,7 +3158,7 @@ HI -126.25 31.75
31583158
> require(stats); require(graphics)
31593159
> ## Compare the monthly series
31603160
> plot (sunspot.month,
3161-
+ main="sunspot.month & sunspots [package'datasets']", col=2)
3161+
+ main="sunspot.month & sunspots [package 'datasets']", col=2)
31623162
> lines(sunspots) # -> faint differences where they overlap
31633163
>
31643164
> ## Now look at the difference :
@@ -3329,6 +3329,7 @@ FALSE TRUE
33293329
> ssm0 <- sunspot.month[1:2988]
33303330
> with(as.data.frame(.sunspot.diff), ssm0[i] <<- ssm0[i] - res10/10)
33313331
> sunspot.month.0 <- ts(ssm0, start = 1749, frequency = 12)
3332+
> stopifnot(length(sunspot.month.0) == 2988)
33323333
>
33333334
>
33343335
>
@@ -3352,10 +3353,10 @@ FALSE TRUE
33523353
> ## The common time interval
33533354
> (t1 <- c(max(start(sm), start(sy)), 1)) # Jan 1749
33543355
[1] 1749 1
3355-
> (t2 <- c(min( end(sm)[1],end(sy)[1]), 12)) # Dec 1983
3356+
> (t2 <- c(min( end(sm)[1],end(sy)[1]), 12)) # Dec 1983 (will not be updated!)
33563357
[1] 1983 12
33573358
> s.m <- window(sm, start=t1, end=t2)
3358-
> s.y <- window(sy, start=t1, end=t2[1]) # {irrelevant warning}
3359+
> s.y <- window(sy, start=t1, end=t2[1])
33593360
> stopifnot(length(s.y) * 12 == length(s.m),
33603361
+ ## The yearly series *is* close to the averages of the monthly one:
33613362
+ all.equal(s.y, aggregate(s.m, FUN = mean), tolerance = 0.0020))
@@ -3694,7 +3695,7 @@ c0 -5.14
36943695
> cleanEx()
36953696
> options(digits = 7L)
36963697
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
3697-
Time elapsed: 1.781 0.033 1.814 0 0
3698+
Time elapsed: 1.091 0.066 1.158 0 0
36983699
> grDevices::dev.off()
36993700
null device
37003701
1

tests/Examples/stats-Ex.Rout.save

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11

2-
R Under development (unstable) (2024-08-21 r87038) -- "Unsuffered Consequences"
2+
R Under development (unstable) (2024-11-08 r87310) -- "Unsuffered Consequences"
33
Copyright (C) 2024 The R Foundation for Statistical Computing
4-
Platform: x86_64-pc-linux-gnu
4+
Platform: aarch64-apple-darwin24.1.0
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.
77
You are welcome to redistribute it under certain conditions.
88
Type 'license()' or 'licence()' for distribution details.
99

10-
Natural language support but running in an English locale
11-
1210
R is a collaborative project with many contributors.
1311
Type 'contributors()' for more information and
1412
'citation()' on how to cite R or R packages in publications.
@@ -1268,16 +1266,16 @@ Residual standard error: 0.04103 on 7 degrees of freedom
12681266
+ nls(conc ~ SSbiexp(time, A1, lrc1, A2, lrc2), data = datN,
12691267
+ trace=TRUE, control = list(maxiter = 10)) )
12701268
0.01722077 (5.34e+02): par = (0.6168807 -1.783839 2.050204 0.2004597)
1271-
3.308943e-06 (1.13e+04): par = (0.5798674 -1.784335 2.028943 0.1920502)
1272-
2.571069e-11 (7.68e+06): par = (0.5793882 -1.78778 2.029276 0.1915479)
1273-
1.669346e-23 (5.53e+03): par = (0.5793887 -1.787785 2.029277 0.1915475)
1274-
2.285755e-29 (1.59e+01): par = (0.5793887 -1.787785 2.029277 0.1915475)
1275-
1.345909e-29 (1.20e+01): par = (0.5793887 -1.787785 2.029277 0.1915475)
1276-
1.224242e-29 (9.63e+00): par = (0.5793887 -1.787785 2.029277 0.1915475)
1277-
1.224242e-29 (9.63e+00): par = (0.5793887 -1.787785 2.029277 0.1915475)
1278-
1.224242e-29 (9.63e+00): par = (0.5793887 -1.787785 2.029277 0.1915475)
1279-
1.224242e-29 (9.63e+00): par = (0.5793887 -1.787785 2.029277 0.1915475)
1280-
1.224242e-29 (9.63e+00): par = (0.5793887 -1.787785 2.029277 0.1915475)
1269+
3.308944e-06 (1.13e+04): par = (0.5798674 -1.784335 2.028943 0.1920502)
1270+
2.571079e-11 (7.68e+06): par = (0.5793882 -1.78778 2.029276 0.1915479)
1271+
1.650535e-23 (2.91e+03): par = (0.5793887 -1.787785 2.029277 0.1915475)
1272+
3.486470e-28 (9.76e-01): par = (0.5793887 -1.787785 2.029277 0.1915475)
1273+
3.475413e-28 (1.03e+00): par = (0.5793887 -1.787785 2.029277 0.1915475)
1274+
3.425893e-28 (5.48e-01): par = (0.5793887 -1.787785 2.029277 0.1915475)
1275+
3.425893e-28 (5.48e-01): par = (0.5793887 -1.787785 2.029277 0.1915475)
1276+
3.425893e-28 (5.48e-01): par = (0.5793887 -1.787785 2.029277 0.1915475)
1277+
3.425893e-28 (5.48e-01): par = (0.5793887 -1.787785 2.029277 0.1915475)
1278+
3.425893e-28 (5.48e-01): par = (0.5793887 -1.787785 2.029277 0.1915475)
12811279
Error in nls(y ~ cbind(exp(-exp(lrc1) * x), exp(-exp(lrc2) * x)), data = xy, :
12821280
number of iterations exceeded maximum of 10
12831281
> ## End(Don't show)
@@ -1290,13 +1288,13 @@ Error in nls(y ~ cbind(exp(-exp(lrc1) * x), exp(-exp(lrc2) * x)), data = xy, :
12901288
3.308942e-06 (9.08e-04): par = (0.5798674 -1.784335 2.028943 0.1920502)
12911289
It. 2, fac= 1, eval (no.,total): ( 1, 2): new dev = 2.57108e-11
12921290
2.571081e-11 (2.53e-06): par = (0.5793882 -1.78778 2.029276 0.1915479)
1293-
It. 3, fac= 1, eval (no.,total): ( 1, 3): new dev = 1.66926e-23
1294-
1.669257e-23 (2.04e-12): par = (0.5793887 -1.787785 2.029277 0.1915475)
1295-
1.670550e-23 (1.67e-13): par = (2.029277 0.5793887 0.1915475 -1.787785)
1291+
It. 3, fac= 1, eval (no.,total): ( 1, 3): new dev = 1.66968e-23
1292+
1.669677e-23 (2.04e-12): par = (0.5793887 -1.787785 2.029277 0.1915475)
1293+
1.667503e-23 (1.67e-13): par = (2.029277 0.5793887 0.1915475 -1.787785)
12961294
> all.equal(coef(fm1), coef(fmX1), tolerance=0) # ... rel.diff.: 1.57e-6
1297-
[1] "Mean relative difference: 1.574118e-06"
1295+
[1] "Mean relative difference: 1.574121e-06"
12981296
> all.equal(coef(fm1), coef(fmX), tolerance=0) # ... rel.diff.: 1.03e-12
1299-
[1] "Mean relative difference: 1.032123e-12"
1297+
[1] "Mean relative difference: 1.031016e-12"
13001298
> ## IGNORE_RDIFF_END
13011299
> stopifnot(all.equal(coef(fm1), coef(fmX1), tolerance = 6e-6),
13021300
+ all.equal(coef(fm1), coef(fmX ), tolerance = 1e-11))
@@ -5126,7 +5124,7 @@ function (V)
51265124
r[seq.int(from = 1L, by = p + 1L, length.out = p)] <- 1
51275125
r
51285126
}
5129-
<bytecode: 0x55b297bbece0>
5127+
<bytecode: 0x10b83cec8>
51305128
<environment: namespace:stats>
51315129
> stopifnot(all.equal(Cl, cov2cor(cov(longley))),
51325130
+ all.equal(cor(longley, method = "kendall"),
@@ -7774,7 +7772,7 @@ attr(,".Environment")
77747772
> environment(as.formula("y ~ x"))
77757773
<environment: R_GlobalEnv>
77767774
> environment(as.formula("y ~ x", env = new.env()))
7777-
<environment: 0x55b2975fdb10>
7775+
<environment: 0x10d923d98>
77787776
>
77797777
>
77807778
> ## Create a formula for a model with a large number of variables:
@@ -8722,7 +8720,7 @@ Error in integrate(f, 0, 1) :
87228720
0.5 with absolute error < 1.6e-07
87238721
> integrate(dnorm, 0, 2000)
87248722
0.5 with absolute error < 4.4e-06
8725-
> integrate(dnorm, 0, 20000) ## fails on many systems
8723+
> integrate(dnorm, 0, 20000) ## "fails" on many systems -- "wrongly" giving '0'
87268724
0 with absolute error < 0
87278725
> integrate(dnorm, 0, Inf) ## works
87288726
0.5 with absolute error < 4.7e-05
@@ -9022,23 +9020,23 @@ totss 60.99123 60.99123
90229020
> ## The ordering of the clusters may be platform-dependent.
90239021
> ## IGNORE_RDIFF_BEGIN
90249022
> (cl <- kmeans(x, 5, nstart = 25))
9025-
K-means clustering with 5 clusters of sizes 12, 24, 24, 15, 25
9023+
K-means clustering with 5 clusters of sizes 12, 15, 25, 24, 24
90269024

90279025
Cluster means:
90289026
x y
90299027
1 1.3290081 1.1185534
9030-
2 0.1581362 -0.1761590
9031-
3 0.8043520 0.7805033
9032-
4 0.8609139 1.3145869
9033-
5 -0.1096832 0.2106891
9028+
2 0.8609139 1.3145869
9029+
3 -0.1096832 0.2106891
9030+
4 0.1581362 -0.1761590
9031+
5 0.8043520 0.7805033
90349032

90359033
Clustering vector:
9036-
[1] 5 2 5 2 5 5 2 2 5 5 3 2 5 5 2 5 2 5 2 5 2 2 5 5 2 5 2 5 5 2 2 2 5 2 5 5 5
9037-
[38] 2 2 2 2 5 5 5 5 5 2 2 2 2 4 3 3 3 3 1 1 1 3 1 4 3 1 4 3 4 3 3 1 4 4 1 4 3
9038-
[75] 3 1 4 4 4 4 3 4 1 3 1 3 4 3 3 3 3 1 3 4 3 3 1 3 4 3
9034+
[1] 3 4 3 4 3 3 4 4 3 3 5 4 3 3 4 3 4 3 4 3 4 4 3 3 4 3 4 3 3 4 4 4 3 4 3 3 3
9035+
[38] 4 4 4 4 3 3 3 3 3 4 4 4 4 2 5 5 5 5 1 1 1 5 1 2 5 1 2 5 2 5 5 1 2 2 1 2 5
9036+
[75] 5 1 2 2 2 2 5 2 1 5 1 5 2 5 5 5 5 1 5 2 5 5 1 5 2 5
90399037

90409038
Within cluster sum of squares by cluster:
9041-
[1] 1.0314888 1.2816507 1.5056575 0.7104553 2.5330710
9039+
[1] 1.0314888 0.7104553 2.5330710 1.2816507 1.5056575
90429040
(between_SS / total_SS = 88.4 %)
90439041

90449042
Available components:
@@ -11352,16 +11350,16 @@ Initializing ‘Const’, ‘A’, ‘B’ to '1.'.
1135211350
Consider specifying 'start' or using a selfStart model
1135311351
1017460.306 (4.15e+02): par = (1 1 1)
1135411352
758164.7503 (2.34e+02): par = (13.42031396 1.961485 0.05947543745)
11355-
269506.3539 (3.23e+02): par = (51.75719815 -13.09155956 0.8428607704)
11356-
68969.21896 (1.03e+02): par = (76.0006985 -1.93522674 1.019085799)
11357-
633.3672231 (1.29e+00): par = (100.3761515 8.624648403 5.104490265)
11358-
151.4400225 (9.39e+00): par = (100.6344391 4.913490981 0.2849209558)
11359-
53.08739902 (7.24e+00): par = (100.6830407 6.899303306 0.4637755073)
11360-
1.344478646 (5.97e-01): par = (100.0368306 9.897714142 0.516929494)
11353+
269506.3538 (3.23e+02): par = (51.75719816 -13.09155956 0.8428607705)
11354+
68969.21895 (1.03e+02): par = (76.0006985 -1.935226741 1.019085799)
11355+
633.3672233 (1.29e+00): par = (100.3761515 8.624648407 5.104490263)
11356+
151.4400223 (9.39e+00): par = (100.6344391 4.913490982 0.2849209561)
11357+
53.08739887 (7.24e+00): par = (100.6830407 6.899303309 0.4637755073)
11358+
1.344478645 (5.97e-01): par = (100.0368306 9.897714142 0.516929494)
1136111359
0.9908415909 (1.55e-02): par = (100.0300625 9.9144191 0.5023516843)
1136211360
0.9906046057 (1.84e-05): par = (100.0288724 9.916224018 0.5025207337)
11363-
0.9906046054 (9.94e-08): par = (100.028875 9.916228366 0.50252165)
11364-
0.9906046054 (5.87e-10): par = (100.028875 9.916228388 0.5025216549)
11361+
0.9906046054 (9.93e-08): par = (100.028875 9.916228366 0.50252165)
11362+
0.9906046054 (6.56e-10): par = (100.028875 9.916228388 0.5025216549)
1136511363
Nonlinear regression model
1136611364
model: y ~ Const + A * exp(B * x)
1136711365
data: parent.frame()
@@ -12716,14 +12714,14 @@ attr(,"class")
1271612714
$linkfun
1271712715
function (mu)
1271812716
mu^lambda
12719-
<bytecode: 0x55b297781bb8>
12720-
<environment: 0x55b29752c6a0>
12717+
<bytecode: 0x10dce8030>
12718+
<environment: 0x10dcf1fd8>
1272112719

1272212720
$linkinv
1272312721
function (eta)
1272412722
pmax(eta^(1/lambda), .Machine$double.eps)
12725-
<bytecode: 0x55b297781a30>
12726-
<environment: 0x55b29752c6a0>
12723+
<bytecode: 0x10dce7ee0>
12724+
<environment: 0x10dcf1fd8>
1272712725

1272812726
>
1272912727
>
@@ -16179,7 +16177,7 @@ Contrast 1 Contrast 2 Contrast 3
1617916177
> getInitial(weight ~ mySSlogis(Time, Asym, xmid, scal),
1618016178
+ data = subset(ChickWeight, Chick == 1))
1618116179
Asym xmid scal
16182-
937.03011 35.22296 11.40521
16180+
937.03000 35.22296 11.40521
1618316181
> ## IGNORE_RDIFF_END
1618416182
>
1618516183
> # 'first.order.log.model' is a function object defining a first order
@@ -17082,8 +17080,8 @@ Step function with continuity 'f'= 0.2 , 3 knots at
1708217080
> unclass(sfun0)
1708317081
function (v)
1708417082
.approxfun(x, y, v, method, yleft, yright, f, na.rm)
17085-
<bytecode: 0x55b2973e08c0>
17086-
<environment: 0x55b293689d40>
17083+
<bytecode: 0x12c5bc600>
17084+
<environment: 0x10d8ab2d8>
1708717085
attr(,"call")
1708817086
stepfun(1:3, y0, f = 0)
1708917087
> ls(envir = environment(sfun0))
@@ -19649,7 +19647,7 @@ Number of Fisher Scoring iterations: 6
1964919647
> cleanEx()
1965019648
> options(digits = 7L)
1965119649
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
19652-
Time elapsed: 9.527 0.16 9.691 0 0
19650+
Time elapsed: 2.868 0.238 3.12 0 0
1965319651
> grDevices::dev.off()
1965419652
null device
1965519653
1

0 commit comments

Comments
 (0)