Skip to content

Commit 93ca900

Browse files
authored
Maintenance Release (#16)
1 parent 3dce263 commit 93ca900

8 files changed

+42
-47
lines changed

DESCRIPTION

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,5 @@ Suggests:
2626
randomForest,
2727
rpart,
2828
testthat
29-
LazyData: yes
30-
ByteCompile: yes
31-
Version: 1.4.2
32-
RoxygenNote: 7.1.0
29+
Version: 1.4.3
30+
RoxygenNote: 7.1.2

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
BatchExperiments_1.4.3
2+
- Maintenance release. Removed calls to deprecated `default.stringAsFactors()`.
3+
14
BatchExperiments_1.4.2
25
- Added support for read-only mode of registries. See ?loadRegistry for more
36
information.

R/reduceResultsExperiments.R

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#' Additional arguments to \code{fun}.
2929
#' @param strings.as.factors [\code{logical(1)}]
3030
#' Should all character columns in result be converted to factors?
31-
#' Default is \code{default.stringsAsFactors()} for R < 4.1.0 and \code{FALSE} otherwise.
31+
#' Default is \code{FALSE}.
3232
#' @param block.size [\code{integer(1)}]
3333
#' Results will be fetched in blocks of this size.
3434
#' Default is max(100, 5 percent of ids).
@@ -45,7 +45,7 @@
4545
#' @aliases ReducedResultsExperiments
4646
#' @export
4747
reduceResultsExperiments = function(reg, ids, part = NA_character_, fun, ...,
48-
strings.as.factors = NULL, block.size, impute.val,
48+
strings.as.factors = FALSE, block.size, impute.val,
4949
apply.on.missing = FALSE, progressbar = TRUE) {
5050

5151
checkExperimentRegistry(reg, strict = TRUE, writeable = FALSE)
@@ -73,12 +73,6 @@ reduceResultsExperiments = function(reg, ids, part = NA_character_, fun, ...,
7373
else
7474
assertFunction(fun, c("job", "res"))
7575

76-
if (is.null(strings.as.factors)) {
77-
if(getRversion() < "4.1.0")
78-
strings.as.factors = default.stringsAsFactors()
79-
else
80-
strings.as.factors = FALSE
81-
}
8276
assertFlag(strings.as.factors)
8377
if (missing(block.size)) {
8478
block.size = max(100L, as.integer(0.05 * length(ids)))

R/reduceResultsExperimentsParallel.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#' @return [\code{data.frame}]. Aggregated results, containing problem and algorithm paramaters and collected values.
1919
#' @export
2020
reduceResultsExperimentsParallel = function(reg, ids, part = NA_character_, fun, ...,
21-
timeout = 604800L, njobs = 20L, strings.as.factors = default.stringsAsFactors(), impute.val,
21+
timeout = 604800L, njobs = 20L, strings.as.factors = FALSE, impute.val,
2222
apply.on.missing = FALSE, progressbar = TRUE) {
2323
checkExperimentRegistry(reg, strict = TRUE, writeable = FALSE)
2424
syncRegistry(reg)

README.md

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

3-
[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/BatchExperiments)](http://cran.r-project.org/web/packages/BatchExperiments)
3+
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/BatchExperiments)](http://cran.r-project.org/web/packages/BatchExperiments)
44
[![Build Status](https://travis-ci.org/tudo-r/BatchExperiments.png)](https://travis-ci.org/tudo-r/BatchExperiments)
55
[![Build status](https://ci.appveyor.com/api/projects/status/f9052xe5y3njcudd/branch/master?svg=true)](https://ci.appveyor.com/project/mllg/batchexperiments/branch/master)
66
[![Coverage Status](https://coveralls.io/repos/tudo-r/BatchExperiments/badge.svg)](https://coveralls.io/r/tudo-r/BatchExperiments)
@@ -14,7 +14,7 @@
1414
To cite BatchJobs or BatchExperiments in publications use:
1515
1616
Bernd Bischl, Michel Lang, Olaf Mersmann, Joerg Rahnenfuehrer, Claus Weihs (2015). BatchJobs and BatchExperiments: Abstraction Mechanisms for Using R in Batch Environments. Journal
17-
of Statistical Software, 64(11), 1-25. URL http://www.jstatsoft.org/v64/i11/.
17+
of Statistical Software, 64(11), 1-25. URL https://www.jstatsoft.org/v64/i11/.
1818
1919
A BibTeX entry for LaTeX users is
2020
@@ -26,7 +26,7 @@ A BibTeX entry for LaTeX users is
2626
volume = {64},
2727
number = {11},
2828
pages = {1--25},
29-
url = {http://www.jstatsoft.org/v64/i11/},
29+
url = {https://www.jstatsoft.org/v64/i11/},
3030
}
3131
```
3232

@@ -47,16 +47,16 @@ To install the latest stable release from CRAN:
4747
```splus
4848
install.packages("BatchExperiments")
4949
```
50-
To install the development version use [devtools](http://cran.r-project.org/web/packages/devtools):
50+
To install the development version use [devtools](https://cran.r-project.org/web/packages/devtools):
5151
```splus
5252
library(devtools);
5353
install_github("tudo-r/BatchJobs")
5454
install_github("tudo-r/BatchExperiments")
5555
```
5656
Please see the documentation of [BatchJobs](https://github.com/tudo-r/BatchJobs) to set up your system for parallel execution.
57-
Currently the best introduction to the package is our [technical report](http://sfb876.tu-dortmund.de/PublicPublicationFiles/bischl_etal_2012a.pdf).
58-
For more detailed information on the functions please use the [R documentation](http://tudo-r.github.io/BatchExperiments/).
57+
Currently the best introduction to the package is our [technical report](https://sfb876.tu-dortmund.de/PublicPublicationFiles/bischl_etal_2012a.pdf).
58+
For more detailed information on the functions please use the [R documentation](https://tudo-r.github.io/BatchExperiments/).
5959
You can also peek into some examples provided in the [wiki](../../wiki).
6060

61-
We also have a [mailing list](http://groups.google.com/group/batchjobs).
61+
We also have a [mailing list](https://groups.google.com/group/batchjobs).
6262

inst/CITATION

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
citHeader("To cite BatchJobs or BatchExperiments in publications use:")
2-
3-
citEntry(entry = "Article",
4-
title = "{BatchJobs} and {BatchExperiments}: Abstraction Mechanisms for Using {R} in Batch Environments",
5-
author = personList(as.person("Bernd Bischl"),
6-
as.person("Michel Lang"),
7-
as.person("Olaf Mersmann"),
8-
as.person("J{\\\"o}rg Rahnenf{\\\"u}hrer"),
9-
as.person("Claus Weihs")),
10-
journal = "Journal of Statistical Software",
11-
year = "2015",
12-
volume = "64",
13-
number = "11",
14-
pages = "1--25",
15-
url = "http://www.jstatsoft.org/v64/i11/",
16-
17-
textVersion =
18-
paste("Bernd Bischl, Michel Lang, Olaf Mersmann, Joerg Rahnenfuehrer, Claus Weihs (2015).",
19-
"BatchJobs and BatchExperiments: Abstraction Mechanisms for Using R in Batch Environments.",
20-
"Journal of Statistical Software, 64(11), 1-25.",
21-
"URL http://www.jstatsoft.org/v64/i11/.")
22-
)
23-
1+
citHeader("To cite BatchJobs or BatchExperiments in publications use:")
2+
3+
citEntry(entry = "Article",
4+
title = "{BatchJobs} and {BatchExperiments}: Abstraction Mechanisms for Using {R} in Batch Environments",
5+
author = personList(as.person("Bernd Bischl"),
6+
as.person("Michel Lang"),
7+
as.person("Olaf Mersmann"),
8+
as.person("J{\\\"o}rg Rahnenf{\\\"u}hrer"),
9+
as.person("Claus Weihs")),
10+
journal = "Journal of Statistical Software",
11+
year = "2015",
12+
volume = "64",
13+
number = "11",
14+
pages = "1--25",
15+
url = "https://www.jstatsoft.org/v64/i11/",
16+
17+
textVersion =
18+
paste("Bernd Bischl, Michel Lang, Olaf Mersmann, Joerg Rahnenfuehrer, Claus Weihs (2015).",
19+
"BatchJobs and BatchExperiments: Abstraction Mechanisms for Using R in Batch Environments.",
20+
"Journal of Statistical Software, 64(11), 1-25.",
21+
"URL https://www.jstatsoft.org/v64/i11/.")
22+
)
23+

man/reduceResultsExperiments.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/reduceResultsExperimentsParallel.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)