Bug correction, code improved

InseeFr · Feb 7, 2018 · 1f44b68 · 1f44b68
1 parent 7618bf7
commit 1f44b68
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: JDCruncheR
 Title: Interface entre le cruncher JDemetra+ et R
-Version: 0.2.0
-Date: septembre 2017
+Version: 0.2.1
+Date: février 2017
 Authors@R: c(person("Hien", "Pham", email = "trong-hien.pham@insee.fr", role = c("aut")),
              person("Alain", "Quartier-la-Tente", email = "alain.quartier-la-tente@insee.fr", role = c("aut", "cre")))
 Authors: Hien Pham [aut],

diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+JDCruncher 0.2.1
+================
+Correction d'un bug sur les fonctions `retain_indicators()` et `remove_indicator()`.
+
 JDCruncher 0.2.0
 ================
 

diff --git a/R/QR_functions.R b/R/QR_functions.R
@@ -232,12 +232,12 @@ remove_indicators.default <- function(x, ...){
 remove_indicators.QR_matrix <- function(x, ...){
     indicators <- c(...)
     modalities_to_remove <- which(colnames(x$modalities) %in% indicators)
-    values_to_remove <- which(colnames(x$value) %in% indicators)
+    values_to_remove <- which(colnames(x$values) %in% indicators)
     if(length(modalities_to_remove) > 0){
         x$modalities <- x$modalities[, - modalities_to_remove]
     }
-    if(length(modalities_to_remove) > 0){
-        x$values <- x$values[, - modalities_to_remove]
+    if(length(values_to_remove) > 0){
+        x$values <- x$values[, - values_to_remove]
     }
     return(x)
 }
@@ -258,7 +258,7 @@ retain_indicators.default <- function(x, ...){
 retain_indicators.QR_matrix <- function(x, ...){
     indicators <- c(...)
     modalities_to_retain <- which(colnames(x$modalities) %in% indicators)
-    values_to_retain <- which(colnames(x$value) %in% indicators)
+    values_to_retain <- which(colnames(x$values) %in% indicators)
     if(length(modalities_to_retain) > 0){
         x$modalities <- x$modalities[, modalities_to_retain]
     }

diff --git a/R/extractQR.R b/R/extractQR.R
@@ -53,13 +53,6 @@ extract_QR <- function(matrix_output_file, sep = ";", dec = ","){
     if(!file.exists(matrix_output_file)|length(grep("\\.csv$",matrix_output_file))==0)
         stop("Le fichier n'existe pas ou n'est pas un fichier csv")
 
-#
-#     for (nom_fichier in c("demetra_m", "series_y")){
-#         table <- read.csv(file = paste0(data_dir,"/", nom_fichier, ".csv"),
-#                           sep = ";", dec = ",", stringsAsFactors = FALSE)
-#
-#         assign(nom_fichier, value = table)
-#     }
     demetra_m <- read.csv(file = matrix_output_file,
                       sep = sep, dec = dec, stringsAsFactors = FALSE,
                       na.strings = c("NA","?"))
@@ -76,11 +69,7 @@ extract_QR <- function(matrix_output_file, sep = ";", dec = ","){
     }
 
     demetra_m$series <- gsub("(^ *)|(* $)","",gsub("(^.* \\* )|(\\[frozen\\])","",demetra_m[,1]))
-    # years <- substr(series_y[,1],1,4)
     demetra_m$frequency <- extractFrequency(demetra_m)
-    # sapply(2:ncol(series_y),function(i){
-    #     max(table(years[!is.na(series_y[,i])]))
-    # })
 
     demetra_m <- cbind(demetra_m,
                        extractARIMA(demetra_m),