changes for CRAN

Author: davidruegamer

R/deepregression.R

@@ -124,15 +124,7 @@ deepregression <- function(
 )
 {
 
-  if(!is.null(seed)){
-    if(engine == "tf"){
-      try(tensorflow::set_random_seed(seed), silent = TRUE)
-    } else {
-      try(torch::torch_manual_seed(seed), silent = TRUE)
-      }
-    }
 
-  
   if(engine == "tf"){
     if(!reticulate::py_available())
     {
@@ -146,6 +138,14 @@ deepregression <- function(
       invisible(return(NULL))
     }}
 
+  if(!is.null(seed)){
+    if(engine == "tf"){
+      try(tensorflow::set_random_seed(seed), silent = TRUE)
+    } else {
+      try(torch::torch_manual_seed(seed), silent = TRUE)
+    }
+  }
+  
   if(engine == "tf"){
     if(is.null(subnetwork_builder)) subnetwork_builder = subnetwork_init
     if(is.null(model_builder)) model_builder = keras_dr

R/families_torch.R

@@ -16,11 +16,11 @@
 #' with parameters (and corresponding inverse link function in brackets):
 #'
 #' \itemize{
-#'  \item{"normal": }{normal distribution with location (identity), scale (exp)}
-#'  \item{"bernoulli": }{bernoulli distribution with logits (identity)}
-#'  \item{"exponential": }{exponential with lambda (exp)}
-#'  \item{"gamma": }{gamma with concentration (exp) and rate (exp)}
-#'  \item{"poisson": }{poisson with rate (exp)}
+#'  \item \code{"normal"} : normal distribution with location (identity), scale (exp)
+#'  \item \code{"bernoulli"} : bernoulli distribution with logits (identity)
+#'  \item \code{"exponential"} : exponential with lambda (exp)
+#'  \item \code{"gamma"} : gamma with concentration (exp) and rate (exp)
+#'  \item \code{"poisson"} : poisson with rate (exp)
 #'  }
 #' @param add_const small positive constant to stabilize calculations
 #' @param trafo_list list of transformations for each distribution parameter.

R/zzz.R

@@ -15,7 +15,7 @@ create_package_name <- function(package, version)
   {
     res <- suppressMessages(reticulate::configure_environment(pkgname))
     if(res & requireNamespace("tensorflow", quietly = TRUE) & 
-       requireNamespace("keras", quietly = TRUE)){
+       requireNamespace("keras", quietly = TRUE) & .Platform$OS.type != "windows"){
       suppressMessages(try(tf$compat$v1$logging$set_verbosity(
         tf$compat$v1$logging$ERROR)))
       suppressMessages(try(tf$get_logger()$setLevel('ERROR')))

man/dr_families.Rd

@@ -2,6 +2,7 @@ library(testthat)
 library(deepregression)
 
 if (reticulate::py_module_available("tensorflow") & 
-    reticulate::py_module_available("keras")){
+    reticulate::py_module_available("keras") & 
+    .Platform$OS.type != "windows"){
   test_check("deepregression")
-}
+}