fixed error messages,update to decision rules

davidcarayon · Aug 24, 2021 · 95af60f · 95af60f
1 parent b40b9a1
commit 95af60f
Show file tree

Hide file tree

Showing 30 changed files with 74 additions and 38 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: IDEATools
 Title: A Collection of Tools Dedicated to the IDEA4 Method
-Version: 2.0.6
+Version: 2.0.7
 Authors@R: 
     person(given = "David",
            family = "Carayon",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,10 @@
+# IDEATools 2.0.7
+
+* Changed the error message occuring when `read_idea()` fails in `diag_idea()`
+* added a better and easier to maintain check for NA's in the output of `read_idea()`
+* New categorisation rules for indicators
+* New computation rules for items
+
 # IDEATools 2.0.6
 
 * Bug fixes and modifying `plot_idea()` as the unofficial hack `<ggplot_object> + ggsave()` does not work anymore.

diff --git a/R/compute_idea.R b/R/compute_idea.R
@@ -45,6 +45,9 @@ compute_idea <- function(data) {
 
   ## Extracting metadata from input data
   metadata <- data$metadata
+  version <- metadata$MTD_00
+  version_number <- as.numeric(stringr::str_remove_all(version, "\\."))
+
 
   # 5 Decision rules for indicators using custom functions --------------------------------------------------------
 
@@ -60,7 +63,15 @@ compute_idea <- function(data) {
       }
 
       if (indicateur == "A5") {
-        value <- ifelse(metadata$MTD_15 >= 0.75, yes = 5, no = sum(items))
+
+        if(version_number < 430) {
+          value <- ifelse(metadata$MTD_15 >= 0.75, yes = 5, no = sum(items))
+        } else {
+          value <- sum(items)
+        }
+
+
+
       }
 
       if (indicateur == "A7") {
@@ -72,7 +83,15 @@ compute_idea <- function(data) {
       }
 
       if (indicateur == "A8") {
-        value <- ifelse(metadata$MTD_15 >= 0.95, yes = 8, no = sum(items))
+
+        if(version_number <= 430) {
+          value <- ifelse(metadata$MTD_15 >= 0.95, yes = 8, no = sum(items))
+        } else {
+          value <- sum(items)
+        }
+
+
+
       }
 
       if (indicateur == "A14") {

diff --git a/R/diag_idea.R b/R/diag_idea.R
@@ -100,7 +100,7 @@ diag_idea <- function(input, output_directory, type = "single", export_type = c(
     ## If the first pipeline fails, try the old_idea one
     if (any(class(test_version) == "try-error")) {
       if (!quiet) {
-        cli::cat_bullet("Note : Le calculateur ins\u00e9r\u00e9 est soit ancien (Version < 4.2.0) soit incomplet. Tentative de r\u00e9cup\u00e9ration des donn\u00e9es...\n", bullet = "warning", bullet_col = "orange", col = "orange")
+        cli::cat_bullet("Note : Erreur dans la lecture du calculateur (Utilisez la fonction `read_idea()` pour plus d'informations). Tentative de r\u00e9cup\u00e9ration des donn\u00e9es via un algorithme de secours.\n ", bullet = "warning", bullet_col = "orange", col = "orange")
       }
 
       ## Reading items (and estimating duration)
@@ -229,7 +229,7 @@ diag_idea <- function(input, output_directory, type = "single", export_type = c(
       ## If the first pipeline fails, try the old_idea one
       if (any(class(test_version) == "try-error")) {
         if (!quiet) {
-          cli::cat_bullet(paste0("Note : Le calculateur '", basename(i), "' est soit ancien (Version < 4.2.0) soit incomplet. Tentative de r\u00e9cup\u00e9ration des donn\u00e9es...\n"), bullet = "warning", bullet_col = "orange", col = "orange")
+          cli::cat_bullet("Note : Erreur dans la lecture du calculateur (Utilisez la fonction `read_idea()` pour plus d'informations). Tentative de r\u00e9cup\u00e9ration des donn\u00e9es via un algorithme de secours.\n ", bullet = "warning", bullet_col = "orange", col = "orange")
         }
 
         # Old alternative
@@ -336,7 +336,7 @@ diag_idea <- function(input, output_directory, type = "single", export_type = c(
       ## If the first pipeline fails, try the old_idea one
       if (any(class(test_version) == "try-error")) {
         if (!quiet) {
-          cli::cat_bullet(paste0("Note : Le calculateur '", basename(i), "' est soit ancien (Version < 4.2.0) soit incomplet. Tentative de r\u00e9cup\u00e9ration des donn\u00e9es...\n"), bullet = "warning", bullet_col = "orange", col = "orange")
+          cli::cat_bullet("Note : Erreur dans la lecture du calculateur (Utilisez la fonction `read_idea()` pour plus d'informations). Tentative de r\u00e9cup\u00e9ration des donn\u00e9es via un algorithme de secours.\n ", bullet = "warning", bullet_col = "orange", col = "orange")
         }
 
         # Old alternative

diff --git a/R/read_idea.R b/R/read_idea.R
@@ -217,14 +217,12 @@ read_idea <- function(input) {
       tidyr::drop_na(item)
 
     ## Error if not complete
-
-    if(version_number < 430) {
-      if (nrow(tidyr::drop_na(items)) != 118) (stop(paste0("The items field in '", basename(input), "' has ", nrow(items), " entries but expects 118.")))
-    } else {
-      if (nrow(tidyr::drop_na(items)) != 119) (stop(paste0("The items field in '", basename(input), "' has ", nrow(items), " entries but expects 119.")))
+    if (sum(is.na(items$value)) > 0) {
+      stop(
+        paste0("The items field in '", basename(input), "' has missing values")
+      )
     }
 
-
   }
 
   if (filetype %in% c("xls", "xlsx")) {
@@ -235,10 +233,10 @@ read_idea <- function(input) {
       tidyr::drop_na(item)
 
     ## Error if not complete
-    if(version_number < 430) {
-    if (nrow(tidyr::drop_na(items)) != 118) (stop(paste0("The 118-rows dataframe for items in 'Renvoi BDD' can't be found in range A25:E143 for the file '", basename(input), "'.")))
-    } else {
-      if (nrow(tidyr::drop_na(items)) != 119) (stop(paste0("The 119-rows dataframe for items in 'Renvoi BDD' can't be found in range A25:E144 for the file '", basename(input), "'.")))
+    if (sum(is.na(items$value)) > 0) {
+      stop(
+        paste0("The items field in '", basename(input), "' has missing values")
+      )
     }
 
 

diff --git a/R/sysdata.rda b/R/sysdata.rda
diff --git a/R/themes.R b/R/themes.R
@@ -57,7 +57,7 @@ theme_idea <- function(base_size = 15, base_family = "") {
 
       # Strip (Used with multiple panels)
       strip.background = ggplot2::element_rect(fill = "#2c3e50", color = "black"),
-      strip.text = ggplot2::element_text(color = white, face = "bold", size = ggplot2::rel(0.8), margin = ggplot2::margin(t = 5, b = 5)),
+      strip.text = ggplot2::element_text(color = white, face = "bold", size = ggplot2::rel(0.7), margin = ggplot2::margin(t = 5, b = 5)),
 
       # Plot
       plot.title = ggplot2::element_text(

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/articles/colored_trees.html b/docs/articles/colored_trees.html
diff --git a/docs/articles/decision_rules.html b/docs/articles/decision_rules.html
diff --git a/docs/articles/ideatools_advanced_fr.html b/docs/articles/ideatools_advanced_fr.html
diff --git a/docs/articles/ideatools_advanced_fr_files/figure-html/unnamed-chunk-6-1.png b/docs/articles/ideatools_advanced_fr_files/figure-html/unnamed-chunk-6-1.png
diff --git a/docs/articles/ideatools_advanced_fr_files/figure-html/unnamed-chunk-7-1.png b/docs/articles/ideatools_advanced_fr_files/figure-html/unnamed-chunk-7-1.png
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -5,5 +5,5 @@ articles:
   colored_trees: colored_trees.html
   decision_rules: decision_rules.html
   ideatools_advanced_fr: ideatools_advanced_fr.html
-last_built: 2021-07-22T07:36Z
+last_built: 2021-08-24T07:21Z
 
diff --git a/docs/reference/compute_idea.html b/docs/reference/compute_idea.html
diff --git a/docs/reference/diag_idea.html b/docs/reference/diag_idea.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/old_idea.html b/docs/reference/old_idea.html
diff --git a/docs/reference/pipe.html b/docs/reference/pipe.html
diff --git a/docs/reference/plot_idea.html b/docs/reference/plot_idea.html
diff --git a/docs/reference/read_idea.html b/docs/reference/read_idea.html
diff --git a/docs/reference/show_canvas.html b/docs/reference/show_canvas.html
diff --git a/docs/reference/show_decision_rules.html b/docs/reference/show_decision_rules.html
diff --git a/docs/reference/theme_idea.html b/docs/reference/theme_idea.html
diff --git a/docs/reference/write_idea.html b/docs/reference/write_idea.html