fixed linter issues

ncsu-landscape-dynamics · Feb 9, 2024 · 0426168 · 0426168 · cyborginhas · Feb 9, 2024
1 parent 553f9bf
commit 0426168
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/R/calibrate.R b/R/calibrate.R
@@ -331,7 +331,7 @@ calibrate <- function(infected_years_file,
         config <- host_pool_setup(config)
       }
       config$competency_table_list <- competency_table_list_creator(config$competency_table)
-      config$pest_host_table_list <- pest_host_table_list_creator(config$pest_host_table)      
+      config$pest_host_table_list <- pest_host_table_list_creator(config$pest_host_table)
 
       data <- pops_model(
         random_seed = config$random_seed,

diff --git a/R/checks.R b/R/checks.R
@@ -331,43 +331,43 @@ multihost_checks <-
     checks_passed <- FALSE
     failed_check <- competency_value_error
   }
-  
+
   if (!checks_passed && identical(names(competency_table)
                                   [(length(names(competency_table)) - 1):
-                                      length(names(competency_table))], 
+                                      length(names(competency_table))],
                                   competency_table_colnames)) {
     checks_passed <- FALSE
     failed_check <- competency_table_wrong_columns
   }
-  
+
   if (!checks_passed && (length(infected_file_list) + 1) <= nrow(competency_table)) {
     checks_passed <- FALSE
     failed_check <- competency_table_row_length_error
   } else {
     competency_table_list <- competency_table_list_creator(competency_table)
   }
-  
+
   if (!checks_passed && identical(names(pest_host_table), pest_host_table_colnames)) {
     checks_passed <- FALSE
     failed_check <- pest_host_table_wrong_columns
   }
 
-
   if (!checks_passed && all(pest_host_table$susceptibility_mean <= 1) &&
-      all(pest_host_table$susceptibility_mean >= 0) && all(pest_host_table$susceptibility_sd <= 1) &&
+      all(pest_host_table$susceptibility_mean >= 0) &&
+      all(pest_host_table$susceptibility_sd <= 1) &&
       all(pest_host_table$susceptibility_sd >= 0)) {
     checks_passed <- FALSE
     failed_check <- pest_host_susceptbility_value_error
   }
-  
+
   if (!checks_passed && all(pest_host_table$mortality_rate_mean <= 1) &&
-      all(pest_host_table$mortality_rate_mean >= 0) && all(pest_host_table$mortality_rate_sd <= 1) &&
+      all(pest_host_table$mortality_rate_mean >= 0) && 
+      all(pest_host_table$mortality_rate_sd <= 1) &&
       all(pest_host_table$mortality_rate_sd >= 0)) {
     checks_passed <- FALSE
     failed_check <- pest_host_mortality_rate_value_error
   }
-
-
+
   if (!checks_passed && length(infected_file_list) != nrow(pest_host_table)) {
     checks_passed <- FALSE
     failed_check <- pest_host_table_row_length_error

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -95,7 +95,7 @@ RcppExport SEXP _PoPS_pops_model_cpp(SEXP random_seedSEXP, SEXP multiple_random_
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error(CHAR(rcpp_msgSEXP_gen));
+        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;