Add numeric_only option to corr function

minjk-bl · minjk-bl · commit 3e6ccdebd4f0 · 2023-06-27T16:07:31.000+09:00
diff --git a/visualpython/js/m_apps/Groupby.js b/visualpython/js/m_apps/Groupby.js
@@ -886,7 +886,12 @@ define([
                 // Method code generation
                 //================================================================
                 if (method != '') {
-                    methodStr.appendFormat('{0}()', method);
+                    let numericOnlyList = ['std', 'sum', 'mean', 'median', 'quantile'];
+                    if (numericOnlyList.includes(method)) {
+                        methodStr.appendFormat('{0}(numeric_only=True)', method);
+                    } else {
+                        methodStr.appendFormat('{0}()', method);
+                    }
                 }
             }
 
diff --git a/visualpython/js/m_stats/Regression.js b/visualpython/js/m_stats/Regression.js
@@ -464,8 +464,8 @@ define([
                         code.appendLine("# Mean Centering ");
                         independentValue = com_util.formatString("{0}_MC", independentValue);
                         moderatedValue = com_util.formatString("{0}_MC", moderatedValue);
-                        code.appendFormatLine("vp_df['{0}']   = vp_df[{1}] - vp_df[{2}].mean()", independentValue, independent, independent);
-                        code.appendFormatLine("vp_df['{0}'] = vp_df[{1}] - vp_df[{2}].mean()", moderatedValue, moderated, moderated);
+                        code.appendFormatLine("vp_df['{0}']   = vp_df[{1}] - vp_df[{2}].mean(numeric_only=True)", independentValue, independent, independent);
+                        code.appendFormatLine("vp_df['{0}'] = vp_df[{1}] - vp_df[{2}].mean(numeric_only=True)", moderatedValue, moderated, moderated);
                     }
                     // Model 1 to 3
                     code.appendLine();
@@ -683,8 +683,8 @@ define([
                     code.appendLine();
                     code.appendLine("# Residual statistics");
                     code.appendLine("display(Markdown('### Residual statistics'))");
-                    code.appendLine("display(pd.DataFrame(data={'Min':vp_residual.min(),'Max':vp_residual.max(),'Mean':vp_residual.mean(),");
-                    code.append("                           'Std. Deviation':vp_residual.std(),'N':vp_residual.count()}))");
+                    code.appendLine("display(pd.DataFrame(data={'Min':vp_residual.min(),'Max':vp_residual.max(),'Mean':vp_residual.mean(numeric_only=True),");
+                    code.append("                           'Std. Deviation':vp_residual.std(numeric_only=True),'N':vp_residual.count()}))");
                 }
                 if (normTest === true) {
                     code.appendLine();
diff --git a/visualpython/js/m_visualize/Chart.js b/visualpython/js/m_visualize/Chart.js
@@ -1308,8 +1308,8 @@ define([
                 'numerical': [
                     { label: 'count', method: 'count()' },
                     { label: 'unique count', method: 'unique()' },
-                    { label: 'sum', method: 'sum()' },
-                    { label: 'average', method: 'mean()' },
+                    { label: 'sum', method: 'sum(numeric_only=True)' },
+                    { label: 'average', method: 'mean(numeric_only=True)' },
                     { label: 'min', method: 'min()' },
                     { label: 'max', method: 'max()' }
                 ]
diff --git a/visualpython/js/m_visualize/Seaborn.js b/visualpython/js/m_visualize/Seaborn.js
@@ -944,10 +944,10 @@ define([
                 }
                 if (chartType === 'barplot' && sortX !== '' && sortY !== '') {
                     if (hue !== '' && sortHue !== '') {
-                        sortCode = com_util.formatString("{0}[{1}[{2}]=={3}].groupby({4})[{5}].mean().sort_values({6}).index"
+                        sortCode = com_util.formatString("{0}[{1}[{2}]=={3}].groupby({4})[{5}].mean(numeric_only=True).sort_values({6}).index"
                                             , state.data, state.data, state.hue, com_util.convertToStr(sortHue, sortHueText), sortX, sortY, sortTypeStr);
                     } else {
-                        sortCode = com_util.formatString("{0}.groupby({1})[{2}].mean().sort_values({3}).index", state.data, sortX, sortY, sortTypeStr);
+                        sortCode = com_util.formatString("{0}.groupby({1})[{2}].mean(numeric_only=True).sort_values({3}).index", state.data, sortX, sortY, sortTypeStr);
                     }
                 } else if (chartType === 'countplot' && (sortX !== '' || sortY !== '')) {
                     let countVar = sortX === ''? sortY: sortX;

Original file line number	Diff line number	Diff line change
`@@ -886,7 +886,12 @@ define([`
`886`	`886`	`// Method code generation`
`887`	`887`	`//================================================================`
`888`	`888`	`if (method != '') {`
`889`		`- methodStr.appendFormat('{0}()', method);`
	`889`	`+ let numericOnlyList = ['std', 'sum', 'mean', 'median', 'quantile'];`
	`890`	`+ if (numericOnlyList.includes(method)) {`
	`891`	`+ methodStr.appendFormat('{0}(numeric_only=True)', method);`
	`892`	`+ } else {`
	`893`	`+ methodStr.appendFormat('{0}()', method);`
	`894`	`+ }`
`890`	`895`	`}`
`891`	`896`	`}`
`892`	`897`
Original file line number	Diff line number	Diff line change
`@@ -944,10 +944,10 @@ define([`
`944`	`944`	`}`
`945`	`945`	`if (chartType === 'barplot' && sortX !== '' && sortY !== '') {`
`946`	`946`	`if (hue !== '' && sortHue !== '') {`
`947`		`- sortCode = com_util.formatString("{0}[{1}[{2}]=={3}].groupby({4})[{5}].mean().sort_values({6}).index"`
	`947`	`+ sortCode = com_util.formatString("{0}[{1}[{2}]=={3}].groupby({4})[{5}].mean(numeric_only=True).sort_values({6}).index"`
`948`	`948`	`, state.data, state.data, state.hue, com_util.convertToStr(sortHue, sortHueText), sortX, sortY, sortTypeStr);`
`949`	`949`	`} else {`
`950`		`- sortCode = com_util.formatString("{0}.groupby({1})[{2}].mean().sort_values({3}).index", state.data, sortX, sortY, sortTypeStr);`
	`950`	`+ sortCode = com_util.formatString("{0}.groupby({1})[{2}].mean(numeric_only=True).sort_values({3}).index", state.data, sortX, sortY, sortTypeStr);`
`951`	`951`	`}`
`952`	`952`	`} else if (chartType === 'countplot' && (sortX !== '' \|\| sortY !== '')) {`
`953`	`953`	`let countVar = sortX === ''? sortY: sortX;`