Edit Anova

minjk-bl · minjk-bl · commit 0d83b1600822 · 2023-06-27T16:15:11.000+09:00
diff --git a/visualpython/html/m_stats/anova.html b/visualpython/html/m_stats/anova.html
@@ -51,9 +51,10 @@
                     <label for="sigLevel" class="vp-orange-text">Significance level</label>
                     <input type="number" id="sigLevel" class="vp-state vp-input" required/>
                     <label for="covariate" class="vp-orange-text">Post hoc analysis</label>
-                    <div class="vp-grid-col-p50">
+                    <div class="vp-grid-col-rp3">
                         <label><input type="checkbox" id="tukeyHSD" class="vp-state" checked><span>Tukey HSD</span></label>
                         <label><input type="checkbox" id="tukey" class="vp-state"><span>Tukey</span></label>
+                        <span></span>
                         <label><input type="checkbox" id="scheffe" class="vp-state"><span>Scheffe</span></label>
                         <label><input type="checkbox" id="duncan" class="vp-state"><span>Duncan</span></label>
                         <label><input type="checkbox" id="bonferroni" class="vp-state"><span>Bonferroni</span></label>
diff --git a/visualpython/js/m_stats/Anova.js b/visualpython/js/m_stats/Anova.js
@@ -31,7 +31,7 @@ define([
             super._init();
             /** Write codes executed before rendering */
             this.config.sizeLevel = 2;
-            this.config.checkModules = ['pd', 'np', 'vp_confidence_interval', 'vp_sem'];
+            this.config.checkModules = ['pd', 'np', 'scipy.stats', 'vp_confidence_interval', 'vp_sem'];
 
             this.state = {
                 testType: 'one-way',
@@ -188,7 +188,7 @@ define([
                         code.appendLine();
                         code.appendLine("# Statistics");
                         code.appendLine("display(Markdown('### Statistics'))");
-                        code.appendLine("display(pd.DataFrame(data={'Count':_df.count(),'Mean':_df.mean(),'Std. Deviation':_df.std(),'Min':_df.min(),'Max':_df.max(),");
+                        code.appendLine("display(pd.DataFrame(data={'Count':_df.count(),'Mean':_df.mean(numeric_only=True),'Std. Deviation':_df.std(numeric_only=True),'Min':_df.min(),'Max':_df.max(),");
                         code.appendLine("                           'Std. Error Mean':_df.apply(vp_sem),'Confidence interval':0.95,");
                         code.append("                           'Lower':_df.apply(vp_confidence_interval).T[0],'Upper':_df.apply(vp_confidence_interval).T[1] }))");
                     }
@@ -303,7 +303,7 @@ define([
                         code.appendLine();
                         code.appendLine("# Statistics");
                         code.appendLine("display(Markdown('### Statistics'))");
-                        code.appendLine("display(pd.DataFrame(data={'Count':_df.count(),'Mean':_df.mean(),'Std. Deviation':_df.std(),'Min':_df.min(),'Max':_df.max(),");
+                        code.appendLine("display(pd.DataFrame(data={'Count':_df.count(),'Mean':_df.mean(numeric_only=True),'Std. Deviation':_df.std(numeric_only=True),'Min':_df.min(),'Max':_df.max(),");
                         code.appendLine("                   'Std. Error Mean':_df.apply(vp_sem),'Confidence interval':0.95,");
                         code.append("                   'Lower':_df.apply(vp_confidence_interval).T[0],'Upper':_df.apply(vp_confidence_interval).T[1] }))");
                     }
@@ -427,7 +427,7 @@ define([
                         code.appendLine();
                         code.appendLine("# Statistics");
                         code.appendLine("display(Markdown('### Statistics'))");
-                        code.appendLine("display(pd.DataFrame(data={'Count':_df.count(),'Mean':_df.mean(),'Std. Deviation':_df.std(),'Min':_df.min(),'Max':_df.max(),");
+                        code.appendLine("display(pd.DataFrame(data={'Count':_df.count(),'Mean':_df.mean(numeric_only=True),'Std. Deviation':_df.std(numeric_only=True),'Min':_df.min(),'Max':_df.max(),");
                         code.appendLine("                   'Std. Error Mean':_df.apply(vp_sem),'Confidence interval':0.95,");
                         code.append("                   'Lower':_df.apply(vp_confidence_interval).T[0],'Upper':_df.apply(vp_confidence_interval).T[1] }))");
                     }
