Skip to content

Commit

Permalink
the example correctly uses 2 cores as maximum
Browse files Browse the repository at this point in the history
  • Loading branch information
hzambran committed Jan 4, 2020
1 parent 483fd86 commit 347da95
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: RFmerge
Type: Package
Title: Merging of Satellite Datasets with Ground Observations using Random Forests
Version: 0.1-4
Version: 0.1-5
Author: Mauricio Zambrano-Bigiarini [aut, cre, cph] (<https://orcid.org/0000-0002-9536-643X>), Oscar M. Baez-Villanueva [aut, cph], Juan Giraldo-Osorio [ctb]
Authors@R: c(person("Mauricio Zambrano-Bigiarini", email = "[email protected]", role=c("aut", "cre", "cph"), comment=c(ORCID = "0000-0002-9536-643X")), person("Oscar M. Baez-Villanueva", email = "[email protected]", role=c("aut", "cph")), person("Juan Giraldo-Osorio", email = "[email protected]", role=c("ctb")) )
Maintainer: Mauricio Zambrano-Bigiarini <[email protected]>
Expand All @@ -17,4 +17,4 @@ BugReports: https://github.com/hzambran/RFmerge/issues
LazyLoad: yes
NeedsCompilation: no
Repository: CRAN
Packaged: Sat Jan 4 12:16:40 -03 2020; hzambran
Packaged: Sat Jan 4 13:02:57 -03 2020; hzambran
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
NEWS/ChangeLog for RFmerge
--------------------------

0.1-5 04-Jan-2020
o 'RFmerge-package.Rd': now the example correctly uses 2 cores as maximum when package is tested with the "--run-donttest" option

0.1-4 04-Jan-2020
o DOI was added to the CITATION file and all the references within the package (the article was available online in January 2nd).
o A maximum of two cores is used in all examples (fixed, with respect to the previous version).
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ To cite RFmerge in publications use:
> Baez-Villanueva, O. M.; Zambrano-Bigiarini, M.; Beck, H.; McNamara, I.; Ribbe, L.; Nauditt, A.; Birkel, C.; Verbist, K.; Giraldo-Osorio, J.D.; Thinh, N.X. (2020). [RF-MEP: a novel Random Forest method for merging gridded precipitation products and ground-based measurements](https://authors.elsevier.com/c/1aKrd7qzSnJWL), Remote Sensing of Environment, 239, 111610. doi:10.1016/j.rse.2019.111606. Full article available [here](https://authors.elsevier.com/c/1aKrd7qzSnJWL) until February 21th 2020.
* R package:
> Zambrano-Bigiarini, M.; Baez-Villanueva, O.M., Giraldo-Osorio, J. RFmerge: Merging of Satellite Datasets with Ground Observations using Random Forests. R package version 0.1-4. URL https://hzambran.github.io/RFmerge/. doi:10.5281/zenodo.3581515.
> Zambrano-Bigiarini, M.; Baez-Villanueva, O.M., Giraldo-Osorio, J. RFmerge: Merging of Satellite Datasets with Ground Observations using Random Forests. R package version 0.1-5. URL https://hzambran.github.io/RFmerge/. doi:10.5281/zenodo.3581515.


Expand All @@ -150,7 +150,7 @@ BibTeX entries for LaTeX users are:
> @Manual{Zambrano-Bigiarini+al2020-RFmerge_pkg,
> title = {RFmerge: Merging of Satellite Datasets with Ground Observations using Random Forests},
> author = {Zambrano-Bigiarini, M. and Baez-Villanueva, O.M. and Giraldo-Osorio, J.},
> note = {R package version 0.1-4. doi:10.5281/zenodo.3581515},
> note = {R package version 0.1-5. doi:10.5281/zenodo.3581515},
> url = {https://CRAN.R-project.org/package=RFmerge},
> }
Expand Down
6 changes: 3 additions & 3 deletions man/RFmerge-package.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ The focus of this package has been put in providing a collection of tools useful
\tabular{ll}{
Package: \tab RFmerge\cr
Type: \tab Package\cr
Version: \tab 0.1-4\cr
Version: \tab 0.1-5\cr
Date: \tab 2020-01-04\cr
License: \tab GPL >= 3 \cr
LazyLoad: \tab yes\cr
Packaged: \tab Sat Jan 4 12:16:40 -03 2020; MZB \cr
Packaged: \tab Sat Jan 4 13:02:57 -03 2020; MZB \cr
BuiltUnder: \tab R version 3.6.2 (2019-12-12) -- "Dark and Stormy Night" ; x86_64-pc-linux-gnu (64-bit) \cr
}
%%~~ An overview of how to use the package, including the most important functions ~~
Expand Down Expand Up @@ -75,7 +75,7 @@ rfmep <- RFmerge(x=ValparaisoPPts, metadata=ValparaisoPPgis, cov=covariates,
id="Code", lat="lat", lon="lon", mask=ValparaisoSHP, training=1)
# Limiting the maximum number of cores to be used in this toy example to 2
par.nnodes <- max(parallel::detectCores()-1, 2)
par.nnodes <- min(parallel::detectCores()-1, 2)
# using parallelisation in GNU/Linux machines
rfmep <- RFmerge(x=ValparaisoPPts, metadata=ValparaisoPPgis, cov=covariates,
Expand Down

0 comments on commit 347da95

Please sign in to comment.