Skip to content

Commit 42b1781

Browse files
committed
Renaming summary functions
1 parent 2fa8dfe commit 42b1781

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

crates/ark/src/data_explorer/r_data_explorer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ impl RDataExplorer {
607607
let dtype = display_type(column.sexp);
608608
match dtype.clone() {
609609
ColumnDisplayType::Number => {
610-
let r_stats: Vec<String> = RFunction::new("", ".ps.number_summary_stats")
610+
let r_stats: Vec<String> = RFunction::new("", "number_summary_stats")
611611
.param("column", column)
612612
.param("filtered_indices", match &self.filtered_indices {
613613
Some(indices) => RObject::try_from(indices)?,
@@ -632,7 +632,7 @@ impl RDataExplorer {
632632
})
633633
},
634634
ColumnDisplayType::String => {
635-
let r_stats: Vec<i32> = RFunction::new("", ".ps.string_summary_stats")
635+
let r_stats: Vec<i32> = RFunction::new("", "string_summary_stats")
636636
.param("column", column)
637637
.param("filtered_indices", match &self.filtered_indices {
638638
Some(indices) => RObject::try_from(indices)?,
@@ -654,7 +654,7 @@ impl RDataExplorer {
654654
})
655655
},
656656
ColumnDisplayType::Boolean => {
657-
let r_stats: Vec<i32> = RFunction::new("", ".ps.boolean_summary_stats")
657+
let r_stats: Vec<i32> = RFunction::new("", "boolean_summary_stats")
658658
.param("column", column)
659659
.param("filtered_indices", match &self.filtered_indices {
660660
Some(indices) => RObject::try_from(indices)?,

crates/ark/src/modules/positron/r_data_explorer.R

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
}
4545
}
4646

47-
.ps.number_summary_stats <- function(column, filtered_indices) {
48-
col <- .ps.col_filter_indices(column, filtered_indices)
47+
number_summary_stats <- function(column, filtered_indices) {
48+
col <- col_filter_indices(column, filtered_indices)
4949

5050
format(c(
5151
min = min(col, na.rm = TRUE),
@@ -56,20 +56,19 @@
5656
))
5757
}
5858

59-
.ps.string_summary_stats <- function(column, filtered_indices) {
60-
col <- .ps.col_filter_indices(column, filtered_indices)
59+
string_summary_stats <- function(column, filtered_indices) {
60+
col <- col_filter_indices(column, filtered_indices)
6161
c(num_empty = sum(!nzchar(col)), num_unique = length(unique(col)))
6262
}
6363

64-
.ps.boolean_summary_stats <- function(column, filtered_indices) {
65-
col <- .ps.col_filter_indices(column, filtered_indices)
64+
boolean_summary_stats <- function(column, filtered_indices) {
65+
col <- col_filter_indices(column, filtered_indices)
6666
c(true_count = sum(col, na.rm = TRUE), false_count = sum(!col, na.rm = TRUE))
6767
}
6868

69-
.ps.col_filter_indices <- function(column, filtered_indices) {
70-
col <- column
71-
if (!is.null(filtered_indices)) {
72-
col <- column[filtered_indices]
69+
col_filter_indices <- function(col, idx = NULL) {
70+
if (!is.null(idx)) {
71+
col <- col[idx]
7372
}
7473
col
7574
}

0 commit comments

Comments
 (0)