Skip to content

Commit

Permalink
Merge pull request #118 from r-spatialecology/main
Browse files Browse the repository at this point in the history
Remove Sys.sleep for verbose reconstruction
  • Loading branch information
mhesselbarth authored Aug 29, 2023
2 parents d05111a + 71a34dc commit e7c40a0
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 29 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: shar
Title: Species-Habitat Associations
Version: 2.0.3
Version: 2.0.4
Authors@R: c(person("Maximilian H.K.", "Hesselbarth", email = "[email protected]",
role = c("aut", "cre"), comment = c(ORCID = "0000-0003-1125-9918")),
person("Marco", "Sciaini", email = "[email protected]",
Expand Down Expand Up @@ -36,14 +36,14 @@ Imports:
stats,
terra,
utils
RoxygenNote: 7.2.3
Suggests:
covr,
dplyr,
knitr,
rmarkdown,
spatstat (>= 2.0-0),
testthat (>= 3.0.0)
RoxygenNote: 7.2.3
VignetteBuilder: knitr
Encoding: UTF-8
LazyData: true
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# shar 2.0.4
* Improvements
* Remove `Sys.sleep` for verbose reconstruction

# shar 2.0.3
* Improvements
* Allow fixed max r distance during pattern reconstruction
Expand Down
6 changes: 0 additions & 6 deletions R/reconstruct_pattern_cluster.R
Original file line number Diff line number Diff line change
Expand Up @@ -321,12 +321,6 @@ reconstruct_pattern_cluster <- function(pattern,
# print progress
if (verbose) {

if (!plot) {

Sys.sleep(0.01)

}

message("\r> Progress: n_random: ", current_pattern, "/", n_random,
" || max_runs: ", floor(i / max_runs * 100), "%",
" || energy = ", round(energy_current, 5), "\t\t",
Expand Down
6 changes: 0 additions & 6 deletions R/reconstruct_pattern_hetero.R
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,6 @@ reconstruct_pattern_hetero <- function(pattern,
# print progress
if (verbose) {

if (!plot) {

Sys.sleep(0.01)

}

message("\r> Progress: n_random: ", current_pattern, "/", n_random,
" || max_runs: ", floor(i / max_runs * 100), "%",
" || energy = ", round(energy_current, 5), "\t\t",
Expand Down
6 changes: 0 additions & 6 deletions R/reconstruct_pattern_homo.R
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,6 @@ reconstruct_pattern_homo <- function(pattern,
# print progress
if (verbose) {

if (!plot) {

Sys.sleep(0.01)

}

message("\r> Progress: n_random: ", current_pattern, "/", n_random,
" || max_runs: ", floor(i / max_runs * 100), "%",
" || energy = ", round(energy_current, 5), "\t\t",
Expand Down
6 changes: 0 additions & 6 deletions R/reconstruct_pattern_marks.R
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,6 @@ reconstruct_pattern_marks <- function(pattern,
# print progress
if (verbose) {

if (!plot) {

Sys.sleep(0.01)

}

message("\r> Progress: n_random: ", current_pattern, "/", n_random,
" || max_runs: ", floor(i / max_runs * 100), "%",
" || energy = ", round(energy_current, 5), "\t\t",
Expand Down
6 changes: 3 additions & 3 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"codeRepository": "https://r-spatialecology.github.io/shar/",
"issueTracker": "https://github.com/r-spatialecology/shar/issues/",
"license": "https://spdx.org/licenses/GPL-3.0",
"version": "2.0.3",
"version": "2.0.4",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
"url": "https://r-project.org"
},
"runtimePlatform": "R version 4.2.2 (2022-10-31)",
"runtimePlatform": "R version 4.3.1 (2023-06-16)",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -250,7 +250,7 @@
},
"SystemRequirements": null
},
"fileSize": "1007.422KB",
"fileSize": "1007.274KB",
"citation": [
{
"@type": "ScholarlyArticle",
Expand Down
3 changes: 3 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
For details changes, please see NEWS.md

## shar 2.0.4
Small speed improvments

## shar 2.0.3
This is a re-submission. The below error has now been fixed

Expand Down

0 comments on commit e7c40a0

Please sign in to comment.