Edit Regression to exclude selected dependent column

minjk-bl · minjk-bl · commit be0cdf8157ba · 2023-06-27T17:42:33.000+09:00
diff --git a/visualpython/js/m_stats/LogisticRegression.js b/visualpython/js/m_stats/LogisticRegression.js
@@ -48,15 +48,32 @@ define([
             this.columnSelector = null;
         }
 
+        _unbindEvent() {
+            super._unbindEvent();
+            $(document).off('change', this.wrapSelector('#dependent'));
+        }
+
         _bindEvent() {
             super._bindEvent();
             /** Implement binding events */
             var that = this;
 
+            // data change
             $(this.wrapSelector('#data')).on('change', function() {
                 let data = $(this).val();
                 that.handleVariableChange(data);
             });
+
+            // dependent change
+            $(document).on('change', this.wrapSelector('#dependent'), function() {
+                let depVal = $(this).val();
+                that.columnSelector = new MultiSelector(that.wrapSelector('#independent'),
+                    {   
+                        mode: 'columns', parent: that.state.data, showDescription: false, 
+                        excludeList: [ depVal ]
+                    }
+                );
+            });
         }
 
         handleVariableChange(data) {
@@ -117,9 +134,14 @@ define([
                 com_generator.vp_bindColumnSource(this, 'data', ['dependent'], 'select', false, false);
             }
 
+            let excludeList = [];
+            if (this.state.dependent !== '') {
+                excludeList = [ this.state.dependent ];
+            }
+
             // render variable selector
             this.columnSelector = new MultiSelector(this.wrapSelector('#independent'),
-                        { mode: 'columns', parent: this.state.data, selectedList: this.state.independent, showDescription: false });
+                        { mode: 'columns', parent: this.state.data, selectedList: this.state.independent, excludeList: excludeList, showDescription: false });
         }
 
         generateCode() {
diff --git a/visualpython/js/m_stats/Regression.js b/visualpython/js/m_stats/Regression.js
@@ -66,6 +66,11 @@ define([
             this.columnSelector = null;
         }
 
+        _unbindEvent() {
+            super._unbindEvent();
+            $(document).off('change', this.wrapSelector('#dependent'));
+        }
+
         _bindEvent() {
             super._bindEvent();
             /** Implement binding events */
@@ -79,10 +84,19 @@ define([
                 $(that.wrapSelector('.vp-st-option')).hide();
                 $(that.wrapSelector('.vp-st-option.' + testType)).show();
 
+                let excludeList = [];
+                if (that.state.testType === 'multiple' 
+                || that.state.testType === 'hierarchical' 
+                || that.state.testType === 'dummy') {
+                    let depVal = $(that.wrapSelector('#dependent')).val();
+                    excludeList = [ depVal ];
+                }
+
                 // render variable selector
                 that.columnSelector = new MultiSelector(that.wrapSelector('#independentBox'),
                     { 
                         mode: 'columns', parent: that.state.data, showDescription: false,
+                        excludeList: excludeList,
                         change: function(type, list) {
                             that._handleMultiColumnChange(type, list);
                         } 
@@ -94,6 +108,24 @@ define([
                 let data = $(this).val();
                 that.handleVariableChange(data);
             });
+
+            // dependent change
+            $(document).on('change', this.wrapSelector('#dependent'), function() {
+                let depVal = $(this).val();
+                if (that.state.testType === 'multiple' 
+                || that.state.testType === 'hierarchical' 
+                || that.state.testType === 'dummy') {
+                    that.columnSelector = new MultiSelector(that.wrapSelector('#independentBox'),
+                        {   
+                            mode: 'columns', parent: that.state.data, showDescription: false, 
+                            excludeList: [ depVal ],
+                            change: function(type, list) {
+                                that._handleMultiColumnChange(type, list);
+                            }
+                        }
+                    );
+                }
+            });
         }
 
         handleVariableChange(data) {
@@ -116,7 +148,6 @@ define([
                     $(that.wrapSelector('#' + id)).prop('disabled', true);
                 });
             }
-
             // render variable selector
             this.columnSelector = new MultiSelector(this.wrapSelector('#independentBox'),
                 {   
@@ -191,10 +222,22 @@ define([
                     }
                 });
 
+            let excludeList = [];
+            if (this.state.testType === 'multiple' 
+                || this.state.testType === 'hierarchical' 
+                || this.state.testType === 'dummy') {
+                if (this.state.dependent !== '') {
+                    excludeList = [ this.state.dependent ];
+                }
+            }
+
             // render variable selector
             this.columnSelector = new MultiSelector(this.wrapSelector('#indenpendentBox'),
-                        { mode: 'columns', parent: this.state.data, selectedList: this.state.independentMulti.map(x=>x.code), showDescription: false }
-                    );
+                { 
+                    mode: 'columns', parent: this.state.data, 
+                    selectedList: this.state.independentMulti.map(x=>x.code), excludeList: excludeList, showDescription: false 
+                }
+            );
             
             // bind column if data exist
             if (this.state.data !== '') {
