addind tests with testthat, removing some commented lines, more input conditions

Author: ischlo

R/workflow_rcpp.R

@@ -57,11 +57,8 @@ simulation <- function(flows_matrix
                        ,dist_matrix
                        ,beta_offset = .25
                        ) {
-  # ,cost_fun = "exp" # develop in a future version the possibility to provide a custom cost function.
-  # run name is a prefix to include in the name of saved files
 
   # CHECK VARIABLES PROVIDED TO SUBMIT TO CPP
-
   stopifnot(inherits(flows_matrix,"matrix")
             ,inherits(dist_matrix,"matrix")
             ,mode(dist_matrix) == "numeric"
@@ -111,12 +108,9 @@ run_model <- function(flows
   stopifnot(is.matrix(flows)
             ,is.matrix(distance) & is.numeric(distance)
             ,is.numeric(beta) & beta > 0
-            ,all(dim(flows)==dim(distance)))
-
-  # if(mode(flows)!='integer'){
-  #   flows <- `mode<-`(flows,'integer')
-  #   cat('Converting flows to integers by retaining the whole part of each value.')
-  # }
+            ,all(dim(flows)==dim(distance))
+            ,all(flows>=0)
+            ,all(distance>=0))
 
   # if(is.na(as.integer(ncores))) {
   #   print('Non integer value provided to ncores, using the default values of 1')
@@ -125,7 +119,6 @@ run_model <- function(flows
   #   print('Value provided to ncores to big, using default of one')
   #   ncores <<- 1
   # }
-
   # print(paste0("Running a model on "
   #              ,ncores
   #              ," cores."))
@@ -178,6 +171,10 @@ run_model_single <- function(flows
             ,is.numeric(distance)
             ,any(is.numeric(weight),is.null(weight))
             ,any(length(flows) == dim(distance))
+            ,all(flows>=0)
+            ,all(distance>=0)
+            ,is.numeric(beta) & beta > 0
+            ,any(all(weight > 0),is.null(weight))
             )
 
   if(is.null(weight) & length(flows) == dim(distance)[1]) {

tests/testthat.R

@@ -0,0 +1,12 @@
+# This file is part of the standard setup for testthat.
+# It is recommended that you do not modify it.
+#
+# Where should you do additional test configuration?
+# Learn more about the roles of various files in:
+# * https://r-pkgs.org/testing-design.html#sec-tests-files-overview
+# * https://testthat.r-lib.org/articles/special-files.html
+
+library(testthat)
+library(cppSim)
+
+test_check("cppSim")

tests/testthat/test-inputs.R

@@ -0,0 +1,95 @@
+
+test_that("doubly constrained tested", {
+
+  ## error datas
+  error_dist <- cbind(cppSim::distance_test,1:ncol(cppSim::distance_test))
+
+  error_dist_neg <- cppSim::distance_test
+  error_dist_neg[100,150] <- -1
+
+  error_flow_neg <- cppSim::flows_test
+  error_flow_neg[543,57] <- -1
+  # errors
+  testthat::expect_error({
+    cppSim::run_model(flows = cppSim::flows_test
+                      ,distance = error_dist)
+  })
+
+  testthat::expect_error({
+    cppSim::run_model(flows = cppSim::flows_test
+                      ,distance = cppSim::distance_test
+                      ,beta = -1)
+  })
+
+  testthat::expect_error({
+    cppSim::run_model(flows=cppSim::flows_test
+                      ,distance = error_dist_neg#cppSim::distance_test
+                      )
+  })
+
+  testthat::expect_error({
+    cppSim::run_model(flows= error_flow_neg
+                      ,distance = cppSim::distance_test
+    )
+  })
+
+
+  #### Correct
+
+  testthat::expect_type({
+
+    cppSim::run_model(flows = cppSim::flows_test
+                      ,distance = cppSim::distance_test)
+
+  },"list")
+
+})
+
+
+
+test_that("singly constrained tested", {
+
+  ## error datas
+  error_dist <- cbind(cppSim::distance_test,1:ncol(cppSim::distance_test))
+
+  error_dist_neg <- cppSim::distance_test
+  error_dist_neg[100,150] <- -1
+
+  orig_flow <- error_flow_neg <- apply(cppSim::flows_test,FUN = sum,MARGIN = 1)
+
+  error_flow_neg[543] <- -1
+
+  # errors
+  testthat::expect_error({
+    cppSim::run_model_single(flows = c(orig_flow,1,2)
+                             ,distance = error_dist)
+  })
+
+  testthat::expect_error({
+    cppSim::run_model_single(flows = orig_flow
+                      ,distance = cppSim::distance_test
+                      ,beta = -1)
+  })
+
+  testthat::expect_error({
+    cppSim::run_model_single(flows = orig_flow
+                      ,distance = error_dist_neg#cppSim::distance_test
+    )
+  })
+
+  testthat::expect_error({
+    cppSim::run_model_single(flows = error_flow_neg
+                      ,distance = cppSim::distance_test
+    )
+  })
+
+  #### Correct
+
+  testthat::expect_type({
+
+    cppSim::run_model_single(flows = orig_flow
+                             ,distance = cppSim::distance_test)
+
+  },"list")
+
+})