improve tutorials

bc3LC · Sep 23, 2024 · 0b8d8b4 · 0b8d8b4
1 parent c7dbca1
commit 0b8d8b4
Show file tree

Hide file tree

Showing 10 changed files with 252 additions and 69 deletions.
diff --git a/R/main.R b/R/main.R
@@ -193,9 +193,16 @@ calc_ep <- function(year, index = "all"){
     year <- as.numeric(year)
   }
 
-  if (!year %in% seq(2006,2021,1)) {
-    stop(sprintf('You introduced year %s which is not available. Possible options are %s.',
-                 year, paste(seq(2006,2021,1), collapse = ", ")))
+  wrong_years <- year[!year %in% seq(2006,2021,1)]
+
+  if (length(wrong_years) != 0) {
+    if(length(wrong_years) == 1){
+      stop(sprintf('You introduced year %s which is not available. Possible options are %s.',
+                   paste0(wrong_years, collapse = ", "), paste(seq(2006,2021,1), collapse = ", ")))
+    }else{
+      stop(sprintf('You introduced years %s which are not available. Possible options are %s.',
+                   paste0(wrong_years, collapse = ", "), paste(seq(2006,2021,1), collapse = ", ")))
+    }
   }
 
   accepted <- c("all",
@@ -283,9 +290,16 @@ calc_tp <- function(year, index = "all"){
     year <- as.numeric(year)
   }
 
-  if (!year %in% seq(2006,2021,1)) {
-    stop(sprintf('You introduced year %s which is not available. Possible options are %s.',
-                 year, paste(seq(2006,2021,1), collapse = ", ")))
+  wrong_years <- year[!year %in% seq(2006,2021,1)]
+
+  if (length(wrong_years) != 0) {
+    if(length(wrong_years) == 1){
+      stop(sprintf('You introduced year %s which is not available. Possible options are %s.',
+                   paste0(wrong_years, collapse = ", "), paste(seq(2006,2021,1), collapse = ", ")))
+    }else{
+      stop(sprintf('You introduced years %s which are not available. Possible options are %s.',
+                   paste0(wrong_years, collapse = ", "), paste(seq(2006,2021,1), collapse = ", ")))
+    }
   }
 
   accepted <- c("all",

diff --git a/docs/articles/Tutorials.html b/docs/articles/Tutorials.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -10,4 +10,4 @@ articles:
   Tutorials: Tutorials.html
   TutorialsEnergyPoverty: TutorialsEnergyPoverty.html
   TutorialsTransportPoverty: TutorialsTransportPoverty.html
-last_built: 2024-09-18T14:47Z
+last_built: 2024-09-23T10:05Z
diff --git a/docs/reference/calc_ep.html b/docs/reference/calc_ep.html
diff --git a/docs/reference/calc_tp.html b/docs/reference/calc_tp.html