Skip to content

Commit

Permalink
changes prior to resubmit
Browse files Browse the repository at this point in the history
  • Loading branch information
tsrobinson committed Feb 9, 2022
1 parent fd553cf commit 2173849
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 16 deletions.
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# rMIDAS 0.4

* `python` argument in `set_python_env` renamed to `x` for clarity
* Minor fixes including bug in `complete()` function
* Minor fixes including remedying bug in `complete()` function
* Improved documentation

# rMIDAS 0.3
Expand Down
18 changes: 12 additions & 6 deletions R/load_utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ skip_if_no_numpy <- function() {
#' @return `NULL`
python_configured <- function() {

py_dep <- c("matplotlib","numpy","pandas","tensorflow","sklearn","os","random", "tensorflow_addons")
dep_avail <- sapply(py_dep, function (x) reticulate::py_module_available(x))

if (sum(dep_avail) == length(py_dep)) {
return(TRUE)
} else {
if (!reticulate::py_available()) {
return(FALSE)
} else {

py_dep <- c("matplotlib","numpy","pandas","tensorflow","sklearn","os","random", "tensorflow_addons")
dep_avail <- sapply(py_dep, function (x) reticulate::py_module_available(x))

if (sum(dep_avail) == length(py_dep)) {
return(TRUE)
} else {
return(FALSE)
}

}
}

Expand Down
6 changes: 4 additions & 2 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
## Resubmission
## Resubmission

This is a resubmission. In this version I have:

* Fixed the invalid URL to point to the moved content
* Updated system checking functions to ensure all requirements are met before running examples that interface with Python
* Added SystemRequirements to Description file
* Fixed invalid URL to point to the moved content

## v0.4.0

Expand Down
2 changes: 1 addition & 1 deletion inst/examples/overimputation.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
\dontrun{
# Run where Python available and configured correctly
# Run where Python initialised and configured correctly
if (python_configured()) {

raw_data <- data.table(a = sample(c("red","yellow","blue",NA),1000, replace = TRUE),
Expand Down
4 changes: 2 additions & 2 deletions man/complete.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/overimpute.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions man/python_configured.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/train.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2173849

Please sign in to comment.