Skip to content

Commit 4fcb4c2

Browse files
Now option 'progressr.interval' defaults to 0.0
1 parent 36a8b5d commit 4fcb4c2

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

NEWS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
Package: progressr
22
==================
33

4-
Version: 0.1.1-9000 [2019-06-13]
4+
Version: 0.1.1-9000 [2019-06-14]
55

66
NEW FEATURES:
77

88
* with_progress() gained arguments 'enable' and 'interval' as an alternative
99
to setting corresponding options progressr.*.
10+
11+
* Now option 'progressr.interval' defaults to 0.0 (was 0.5 seconds).
1012

1113

1214
Version: 0.1.1 [2019-06-08]

R/progression_handler.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#' @return A function of class `progression_handler`.
2929
#'
3030
#' @export
31-
progression_handler <- function(name, reporter = list(), handler = NULL, enable = getOption("progressr.enable", interactive()), enable_after = getOption("progressr.enable_after", 0.0), times = getOption("progressr.times", +Inf), interval = getOption("progressr.interval", 0.5), intrusiveness = 1.0, clear = getOption("progressr.clear", TRUE)) {
31+
progression_handler <- function(name, reporter = list(), handler = NULL, enable = getOption("progressr.enable", interactive()), enable_after = getOption("progressr.enable_after", 0.0), times = getOption("progressr.times", +Inf), interval = getOption("progressr.interval", 0.0), intrusiveness = 1.0, clear = getOption("progressr.clear", TRUE)) {
3232
if (!enable) times <- 0
3333
name <- as.character(name)
3434
stop_if_not(length(name) == 1L, !is.na(name), nzchar(name))

R/slow_sum.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
slow_sum <- function(x, delay = getOption("delay", 0.05), stdout = FALSE, message = FALSE) {
1919
progress <- progressor(length(x))
2020

21-
res <- 0
21+
sum <- 0
2222
for (kk in seq_along(x)) {
2323
if (stdout) cat(sprintf("O: Element #%d\n", kk))
2424
Sys.sleep(delay)
25-
res <- res + x[kk]
25+
sum <- sum + x[kk]
2626
progress(message = sprintf("P: Adding %g", kk))
2727
if (message) message(sprintf("M: Added value %g", x[kk]))
2828
}
2929

30-
res
30+
sum
3131
}

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ Assume that we have a function `slow_sum()` for adding up the values in a vector
1414
```r
1515
slow_sum <- function(x) {
1616
progress <- progressr::progressor(length(x))
17-
res <- 0
17+
sum <- 0
1818
for (kk in seq_along(x)) {
1919
Sys.sleep(0.1)
20-
res <- res + x[kk]
21-
progress()
20+
sum <- sum + x[kk]
21+
progress(message = sprintf("Added %g", x[kk]))
2222
}
23-
res
23+
sum
2424
}
2525
```
2626

man/progression_handler.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)