From b4476cc4e34a8d4603de0f5e59e136ef210ca070 Mon Sep 17 00:00:00 2001 From: ripley Date: Sun, 9 Jul 2023 11:06:49 +0000 Subject: [PATCH] update, presumably from Matrix changes git-svn-id: https://svn.r-project.org/R/trunk@84661 00db46b3-68df-0310-9c12-caf00c1e9a41 --- tests/reg-S4.Rout.save | 7 +++---- tests/reg-tests-3.Rout.save | 19 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/tests/reg-S4.Rout.save b/tests/reg-S4.Rout.save index 053abb84be9..d25a322fd30 100644 --- a/tests/reg-S4.Rout.save +++ b/tests/reg-S4.Rout.save @@ -1,7 +1,7 @@ -R Under development (unstable) (2022-12-02 r83397) -- "Unsuffered Consequences" -Copyright (C) 2022 The R Foundation for Statistical Computing -Platform: aarch64-apple-darwin22.1.0 (64-bit) +R Under development (unstable) (2023-07-09 r84660) -- "Unsuffered Consequences" +Copyright (C) 2023 The R Foundation for Statistical Computing +Platform: aarch64-apple-darwin22.5.0 R is free software and comes with ABSOLUTELY NO WARRANTY. You are welcome to redistribute it under certain conditions. @@ -625,7 +625,6 @@ An object of class "foo" + TRUE) + } else + message("skipping tests requiring the Matrix package") -[ ]: .M.sub.i.logical() maybe inefficient > > > ## containing "array" ("matrix", "ts", ..) diff --git a/tests/reg-tests-3.Rout.save b/tests/reg-tests-3.Rout.save index 37455b68b8c..10c827fe256 100644 --- a/tests/reg-tests-3.Rout.save +++ b/tests/reg-tests-3.Rout.save @@ -1,7 +1,7 @@ -R Under development (unstable) (2023-04-13 r84246) -- "Unsuffered Consequences" +R Under development (unstable) (2023-07-09 r84660) -- "Unsuffered Consequences" Copyright (C) 2023 The R Foundation for Statistical Computing -Platform: x86_64-pc-linux-gnu (64-bit) +Platform: aarch64-apple-darwin22.5.0 R is free software and comes with ABSOLUTELY NO WARRANTY. You are welcome to redistribute it under certain conditions. @@ -757,10 +757,10 @@ x1 a b > ## median should work by default for a suitable S4 class. > ## adapted from adaptsmoFMRI > if(suppressMessages(require("Matrix"))) { -+ x <- matrix(c(1,2,3,4)) -+ print(m <- median(x)) -+ stopifnot(all.equal(m, median(as(x, "denseMatrix")))) -+ detach("package:Matrix") ++ x <- matrix(c(1,2,3,4)) ++ print(m <- median(x)) ++ stopifnot(all.equal(m, median(as(x, "denseMatrix")))) ++ detach("package:Matrix") + } [1] 2.5 > @@ -923,13 +923,12 @@ Error in nchar(x, "w") : invalid multibyte string, element 10 + detach("package:Matrix", unload=TRUE) + }##{Matrix} Loading required package: Matrix -[ ]: .M.sub.i.logical() maybe inefficient standardGeneric for "chol2inv" defined from package "base" function (x, ...) standardGeneric("chol2inv") - - + + Methods may be defined for arguments: x Use showMethods(chol2inv) for currently available ones. > @@ -1067,5 +1066,5 @@ A BibTeX entry for LaTeX users is [1] 4 > > cat('Time elapsed: ', proc.time(),'\n') -Time elapsed: 2.368 0.234 2.875 0.001 0.002 +Time elapsed: 1.49 0.072 1.568 0.001 0.003 >