potential full fix #82 (#90)

* potential full fix * update NEWS + rebuild site
ModelOriented · Dec 17, 2019 · 7bf16aa · 7bf16aa
1 parent 0aec450
commit 7bf16aa
Show file tree

Hide file tree

Showing 123 changed files with 756 additions and 530 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,7 @@ ingredients 0.5.0
 ---------------------------------------------------------------
 * `feature_importance` now does `15` permutations on each variable by default. Use the `B` argument to change this number
 * added boxplots to `plot.feature_importance` and `plotD3.feature_importance` that showcase the permutation data
+* in `aggregate_profiles`: preserve `_x_` column factor order and sort its values [#82](https://github.com/ModelOriented/ingredients/issues/82)
 
 ingredients 0.4.2
 ---------------------------------------------------------------

diff --git a/R/aggregate_profiles.R b/R/aggregate_profiles.R
@@ -318,6 +318,7 @@ aggregated_profiles_partial <- function(all_profiles, groups = NULL) {
   # as in https://github.com/ModelOriented/ingredients/issues/82
   if (!is.numeric(all_profiles$`_x_`)) {
     aggregated_profiles$`_x_` <- factor(aggregated_profiles$`_x_`, levels = unique(all_profiles$`_x_`))
+    aggregated_profiles <- aggregated_profiles[order(aggregated_profiles$`_x_`),]
   }
 
   aggregated_profiles
@@ -352,6 +353,10 @@ aggregated_profiles_conditional <- function(all_profiles, groups = NULL, span =
       # for categorical variables we will calculate weighted average
       # but weights are 0-1, 1 if it's the same level and 0 otherwise
       split_profile$`_w_` <- split_profile$`_orginal_` == split_profile$`_x_`
+
+      # for factors, keep proper order
+      # as in https://github.com/ModelOriented/ingredients/issues/82
+      split_profile$`_x_` <- factor(split_profile$`_x_`, levels = unique(split_profile$`_x_`))
     }
 
     per_points <- split(split_profile, split_profile[, c("_x_", groups)])
@@ -373,12 +378,6 @@ aggregated_profiles_conditional <- function(all_profiles, groups = NULL, span =
     aggregated_profiles$`_label_` <- paste(aggregated_profiles$`_label_`, aggregated_profiles$`_groups_`, sep = "_")
   }
 
-
-  # for factors, keep proper order
-  # as in https://github.com/ModelOriented/ingredients/issues/82
-  if (!is.numeric(all_profiles$`_x_`)) {
-    aggregated_profiles$`_x_` <- factor(aggregated_profiles$`_x_`, levels = unique(all_profiles$`_x_`))
-  }
   aggregated_profiles$`_ids_` <- 0
 
   aggregated_profiles

diff --git a/R/plotD3_aggregated_profiles.R b/R/plotD3_aggregated_profiles.R
@@ -84,7 +84,7 @@ plotD3.aggregated_profiles_explainer <- function(x, ..., size = 2, alpha = 1,
 
   ymax <- max(aggregated_profiles$`_yhat_`)
   ymin <- min(aggregated_profiles$`_yhat_`)
-  ymargin <- abs(ymax - ymin)*0.1;
+  ymargin <- abs(ymax - ymin)*0.1
 
   aggregated_profiles_list <- split(aggregated_profiles, aggregated_profiles$`_vname_`)
 
@@ -120,7 +120,8 @@ plotD3.aggregated_profiles_explainer <- function(x, ..., size = 2, alpha = 1,
       ret
     })
 
-    ymean <- round(attr(x, "mean_prediction"),3)
+
+    ymean <- ifelse("partial_dependency_explainer" %in% class(x), round(attr(x, "mean_prediction"), 3), 0)
   }
 
   options <- list(variableNames = as.list(all_variables),

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/vignette_describe.html b/docs/articles/vignette_describe.html
diff --git a/docs/articles/vignette_describe_files/figure-html/unnamed-chunk-10-1.png b/docs/articles/vignette_describe_files/figure-html/unnamed-chunk-10-1.png
diff --git a/docs/articles/vignette_describe_files/figure-html/unnamed-chunk-11-1.png b/docs/articles/vignette_describe_files/figure-html/unnamed-chunk-11-1.png
diff --git a/docs/articles/vignette_describe_files/figure-html/unnamed-chunk-3-1.png b/docs/articles/vignette_describe_files/figure-html/unnamed-chunk-3-1.png
diff --git a/docs/articles/vignette_describe_files/figure-html/unnamed-chunk-5-1.png b/docs/articles/vignette_describe_files/figure-html/unnamed-chunk-5-1.png
diff --git a/docs/articles/vignette_describe_files/figure-html/unnamed-chunk-9-1.png b/docs/articles/vignette_describe_files/figure-html/unnamed-chunk-9-1.png
diff --git a/docs/articles/vignette_simulated.html b/docs/articles/vignette_simulated.html
diff --git a/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-3-1.png b/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-3-1.png
diff --git a/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-4-1.png b/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-4-1.png
diff --git a/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-4-2.png b/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-4-2.png
diff --git a/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-5-1.png b/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-5-1.png
diff --git a/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-5-2.png b/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-5-2.png
diff --git a/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-5-3.png b/docs/articles/vignette_simulated_files/figure-html/unnamed-chunk-5-3.png
diff --git a/docs/articles/vignette_titanic.html b/docs/articles/vignette_titanic.html
diff --git a/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-10-1.png b/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-10-1.png
diff --git a/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-4-1.png b/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-4-1.png
diff --git a/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-5-1.png b/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-5-1.png
diff --git a/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-6-1.png b/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-6-1.png
diff --git a/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-7-1.png b/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-7-1.png
diff --git a/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-8-1.png b/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-8-1.png
diff --git a/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-9-1.png b/docs/articles/vignette_titanic_files/figure-html/unnamed-chunk-9-1.png
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
@@ -1,4 +1,4 @@
-pandoc: 2.3.1
+pandoc: '2.6'
 pkgdown: 1.4.1
 pkgdown_sha: ~
 articles:

diff --git a/docs/reference/accumulated_dependency-1.png b/docs/reference/accumulated_dependency-1.png
diff --git a/docs/reference/accumulated_dependency-2.png b/docs/reference/accumulated_dependency-2.png