[Distr-commits] r1175 - in pkg/startupmsg: . R man tests/Examples
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Jul 8 16:21:11 CEST 2018
Author: ruckdeschel
Date: 2018-07-08 16:21:11 +0200 (Sun, 08 Jul 2018)
New Revision: 1175
Modified:
pkg/startupmsg/DESCRIPTION
pkg/startupmsg/R/illustration.R
pkg/startupmsg/man/myStartupUtilities.Rd
pkg/startupmsg/tests/Examples/startupmsg-Ex.Rout.save
Log:
[startupmsg] merged branch 2.7 back to trunk
Modified: pkg/startupmsg/DESCRIPTION
===================================================================
--- pkg/startupmsg/DESCRIPTION 2018-07-08 14:20:16 UTC (rev 1174)
+++ pkg/startupmsg/DESCRIPTION 2018-07-08 14:21:11 UTC (rev 1175)
@@ -1,7 +1,7 @@
Package: startupmsg
Encoding: latin1
-Version: 0.9.4
-Date: 2017-04-23
+Version: 0.9.5
+Date: 2016-04-23
Title: Utilities for Start-Up Messages
Description: Provides utilities to create or suppress start-up messages.
Authors at R: person("Peter", "Ruckdeschel", role=c("cre", "cph", "aut"),
@@ -11,4 +11,4 @@
License: LGPL-3
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 1137
+SVNRevision: 1080
Modified: pkg/startupmsg/R/illustration.R
===================================================================
--- pkg/startupmsg/R/illustration.R 2018-07-08 14:20:16 UTC (rev 1174)
+++ pkg/startupmsg/R/illustration.R 2018-07-08 14:21:11 UTC (rev 1175)
@@ -64,7 +64,7 @@
MANUALL <- FALSE
MANUALS <- ""
if(!is.null(MANUAL))
- {if (all(substr(as.character(MANUAL),1,7)=="http://"))
+ {if (all(substr(as.character(MANUAL),1,7)=="https://"))
{MANUALL <- TRUE
MANUALS <- c("\n ",MANUAL)}
else {MANUAL1 <- paste(MANUAL,
Modified: pkg/startupmsg/man/myStartupUtilities.Rd
===================================================================
--- pkg/startupmsg/man/myStartupUtilities.Rd 2018-07-08 14:20:16 UTC (rev 1174)
+++ pkg/startupmsg/man/myStartupUtilities.Rd 2018-07-08 14:21:11 UTC (rev 1175)
@@ -110,7 +110,7 @@
buildStartupMessage(pkg="stats", msg)
-MNH <- "http://www.r-project.org/"
+MNH <- "https://www.r-project.org/"
buildStartupMessage(pkg="stats", msg, packageHelp=TRUE, MANUAL=MNH)
## not quite a manual, but to illustrate the principle:
## "demo/nlm.R" as a "manual": to be system-independent the
Modified: pkg/startupmsg/tests/Examples/startupmsg-Ex.Rout.save
===================================================================
--- pkg/startupmsg/tests/Examples/startupmsg-Ex.Rout.save 2018-07-08 14:20:16 UTC (rev 1174)
+++ pkg/startupmsg/tests/Examples/startupmsg-Ex.Rout.save 2018-07-08 14:21:11 UTC (rev 1175)
@@ -1,6 +1,6 @@
-R Under development (unstable) (2016-04-22 r70532) -- "Unsuffered Consequences"
-Copyright (C) 2016 The R Foundation for Statistical Computing
+R version 3.0.1 Patched (2013-09-02 r63805) -- "Good Sport"
+Copyright (C) 2013 The R Foundation for Statistical Computing
Platform: i386-w64-mingw32/i386 (32-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -21,8 +21,20 @@
> source(file.path(R.home("share"), "R", "examples-header.R"))
> options(warn = 1)
> options(pager = "console")
+> base::assign(".ExTimings", "startupmsg-Ex.timings", pos = 'CheckExEnv')
+> base::cat("name\tuser\tsystem\telapsed\n", file=base::get(".ExTimings", pos = 'CheckExEnv'))
+> base::assign(".format_ptime",
++ function(x) {
++ if(!is.na(x[4L])) x[1L] <- x[1L] + x[4L]
++ if(!is.na(x[5L])) x[2L] <- x[2L] + x[5L]
++ options(OutDec = '.')
++ format(x[1L:3L], digits = 7L)
++ },
++ pos = 'CheckExEnv')
+>
+> ### * </HEADER>
> library('startupmsg')
-:startupmsg> Utilities for Start-Up Messages (version 0.9.2)
+:startupmsg> Utilities for start-up messages (version 0.9)
:startupmsg>
:startupmsg> For more information see ?"startupmsg",
:startupmsg> NEWS("startupmsg")
@@ -35,6 +47,7 @@
>
> flush(stderr()); flush(stdout())
>
+> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: StartupUtilities
> ### Title: Utilities for start-up messages
> ### Aliases: startupmsg infoShow TOBEDONE NEWS readVersionInformation
@@ -95,7 +108,7 @@
> ### reading information file utilities
> readVersionInformation("stats")
$ver
-[1] "3.4.0"
+[1] "3.0.1"
$title
[1] "The R Stats Package"
@@ -107,17 +120,20 @@
NULL
> NEWS("stats") ## no NEWS file;
Warning in file.show(file.path(system.file(package = pkg, lib.loc = library), :
- file.show(): file 'C:/PROGRA~1/R/R-devel/library/stats/NEWS' does not exist
+ file.show(): file 'C:/PROGRA~1/R/R-30~1.1PA/library/stats/NEWS' does not exist
> ## for packages with NEWS file see e.g. randomForest, distr
>
>
>
+> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
+> base::cat("StartupUtilities", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("myStartupUtilities")
> ### * myStartupUtilities
>
> flush(stderr()); flush(stdout())
>
+> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: myStartupUtilities
> ### Title: Example functions to utilities for start-up messages
> ### Aliases: mystartupMessage mySMHandler buildStartupMessage
@@ -131,7 +147,7 @@
>
> ## issuing of messages controlled by options()
> buildStartupMessage(pkg="stats", msg)
-:stats> The R Stats Package (version 3.4.0)
+:stats> The R Stats Package (version 3.0.1)
:stats>
:stats> Note that you may set global options by options() --- cf.
:stats> ?"options".
@@ -140,13 +156,13 @@
> suppressMessages(buildStartupMessage(pkg="stats", msg))
> onlytypeStartupMessages(buildStartupMessage(pkg="stats", msg),
+ atypes="version")
-The R Stats Package (version 3.4.0)
+The R Stats Package (version 3.0.1)
>
> getOption("StartupBanner")
NULL
> buildStartupMessage(pkg="stats", msg)
-:stats> The R Stats Package (version 3.4.0)
+:stats> The R Stats Package (version 3.0.1)
:stats>
:stats> Note that you may set global options by options() --- cf.
:stats> ?"options".
@@ -159,7 +175,7 @@
> options("StartupBanner"="complete");getOption("StartupBanner")
[1] "complete"
> buildStartupMessage(pkg="stats", msg)
-:stats> The R Stats Package (version 3.4.0)
+:stats> The R Stats Package (version 3.0.1)
:stats>
:stats> Note that you may set global options by options() --- cf.
:stats> ?"options".
@@ -168,13 +184,13 @@
> options("StartupBanner"="something else");getOption("StartupBanner")
[1] "something else"
> buildStartupMessage(pkg="stats", msg)
-:stats> The R Stats Package (version 3.4.0)
+:stats> The R Stats Package (version 3.0.1)
:stats>
>
> options("StartupBanner"=NULL);getOption("StartupBanner")
NULL
> buildStartupMessage(pkg="stats", msg)
-:stats> The R Stats Package (version 3.4.0)
+:stats> The R Stats Package (version 3.0.1)
:stats>
:stats> Note that you may set global options by options() --- cf.
:stats> ?"options".
@@ -183,7 +199,7 @@
>
> MNH <- "http://www.r-project.org/"
> buildStartupMessage(pkg="stats", msg, packageHelp=TRUE, MANUAL=MNH)
-:stats> The R Stats Package (version 3.4.0)
+:stats> The R Stats Package (version 3.0.1)
:stats>
:stats> Note that you may set global options by options() --- cf.
:stats> ?"options".
@@ -195,33 +211,33 @@
> ## "demo/nlm.R" as a "manual": to be system-independent the
> ## first call is to be preferred
> buildStartupMessage(pkg="stats", msg, packageHelp=TRUE, MANUAL=c("demo","nlm.R"))
-:stats> The R Stats Package (version 3.4.0)
+:stats> The R Stats Package (version 3.0.1)
:stats>
:stats> Note that you may set global options by options() --- cf.
:stats> ?"options".
:stats>
-:stats> For more information see ?"stats", as well as
-:stats> C:/PROGRA~1/R/R-devel/library/stats/demo/nlm.R
+:stats> For more information see ?"stats"
> ### works, too, (i.e. is equivalent) under Linux and Windows (at least):
> buildStartupMessage(pkg="stats", msg, packageHelp=TRUE, MANUAL="demo/nlm.R")
-:stats> The R Stats Package (version 3.4.0)
+:stats> The R Stats Package (version 3.0.1)
:stats>
:stats> Note that you may set global options by options() --- cf.
:stats> ?"options".
:stats>
-:stats> For more information see ?"stats", as well as
-:stats> C:/PROGRA~1/R/R-devel/library/stats/demo/nlm.R
+:stats> For more information see ?"stats"
>
>
>
>
+> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
+> base::cat("myStartupUtilities", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> ### * <FOOTER>
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 0.05 0.04 0.09 NA NA
+Time elapsed: 0.27 0.06 0.34 NA NA
> grDevices::dev.off()
null device
1
More information about the Distr-commits
mailing list