🐛 📝 nl_to_raster bugfix and pkg site update

ropensci · Mar 28, 2019 · beedd3a · beedd3a
1 parent 3fc93b8
commit beedd3a
Show file tree

Hide file tree

Showing 107 changed files with 1,461 additions and 1,640 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: nlrx
 Type: Package
 Title: Setup, Run and Analyze 'NetLogo' Model Simulations from 'R' via 'XML'
-Version: 0.1.0
+Version: 0.2.0
 Authors@R: c(person("Jan", "Salecker", email = "jsaleck@gwdg.de",
                      role = c("aut", "cre"), comment = c(ORCID = '0000-0002-9000-4229')),
              person("Marco", "Sciaini", email = "sciaini.marco@gmail.com", role = c("aut"), comment = c(ORCID = '0000-0002-3042-5435')),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
-# nlrx 0.1.0
+## nlrx 0.2.0
+
+* nl_to_raster() hotfix
+
+## nlrx 0.1.0
 
 * First release to CRAN.
diff --git a/R/nl_to_raster.R b/R/nl_to_raster.R
@@ -51,7 +51,7 @@ nl_to_raster <- function(nl){
 
   patches_dat <- patches %>%
     dplyr::select(patch.metrics) %>%
-    split(.,  patches[,c("siminputrow", "[step]", "random-seed")]) %>%
+    split(.,  patches[,c("siminputrow", "[step]", "random-seed")], lex.order=TRUE) %>%
     purrr::map(., function(x){
       raster::rasterFromXYZ(x[, c("pxcor",
                                             "pycor",

diff --git a/README.Rmd b/README.Rmd
@@ -49,9 +49,11 @@ While the nlrx package might work without setting the Java system path explicitl
 
 ## Installation
 
-~~You can install the released version of nlrx from~~
-~~[CRAN](https://CRAN.R-project.org) with:~~
-~~install.packages("nlrx")~~
+You can install the released version of nlrx from
+[CRAN](https://CRAN.R-project.org) with:
+``` r
+install.packages("nlrx")
+```
 
 And the development version from [GitHub](https://github.com/) with:
 

diff --git a/README.md b/README.md
diff --git a/cran-comments.md b/cran-comments.md
@@ -1,6 +1,7 @@
 # Resubmission
 
-We replaced \dontrun with \donttest for examples that are executable but run longer then 5 sec per Rd-file.
+Hotfix for nl_to_raster() function.
+In the previous package version, under some circumstances the raster column was reported in wrong order.
 
 ## Test environments
 * Windows 10, R 3.5.2

diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html
diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html