Skip to content

Commit 3f3dbb2

Browse files
author
minjk-bl
committed
VarSelector renewal
1 parent 92e5541 commit 3f3dbb2

File tree

10 files changed

+215
-135
lines changed

10 files changed

+215
-135
lines changed

‎js/com/com_Event.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ define([], function() {
6363
&& $('.vp-close-on-blur').find(target).length == 0) {
6464
$('.vp-close-on-blur').hide();
6565
}
66+
// VarSelector filter box
67+
if ($('.vp-vs-blur-btn').find(target).length == 0
68+
&& !$(target).hasClass('vp-vs-blur-btn')
69+
&& $('.vp-vs-blur-btn').find(target).length == 0) {
70+
$('.vp-vs-blur').removeClass('vp-inline-block');
71+
}
6672
}
6773
},
6874
{

‎js/com/com_Kernel.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,13 @@ define([
9696
});
9797
}
9898

99-
getDataList(dataTypeList=[]) {
99+
getDataList(dataTypeList=[], excludeList=[]) {
100100
// use function command to get variable list of selected data types
101101
var cmdSB = '_vp_print(_vp_get_variables_list(None))';
102-
if (dataTypeList && dataTypeList.length > 0) {
103-
cmdSB = com_util.formatString('_vp_print(_vp_get_variables_list({0}))', JSON.stringify(dataTypeList));
102+
if (!dataTypeList || dataTypeList.length <= 0) {
103+
dataTypeList = [];
104104
}
105+
cmdSB = com_util.formatString('_vp_print(_vp_get_variables_list({0}, {1}))', JSON.stringify(dataTypeList), JSON.stringify(excludeList));
105106

106107
var that = this;
107108
return new Promise(function(resolve, reject) {

‎js/com/component/VarSelector2.js

Lines changed: 191 additions & 118 deletions
Large diffs are not rendered by default.

‎js/m_ml/dataSplit.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,21 +102,21 @@ define([
102102
$(page).find('#testSize').html(sizeOptions);
103103

104104
// varselector TEST:
105-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'List', 'string']);
105+
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
106106
varSelector.setComponentID('featureData');
107107
varSelector.addClass('vp-state vp-input');
108108
varSelector.setValue(this.state.featureData);
109109
varSelector.setPlaceholder('Select feature data');
110110
$(page).find('#featureData').replaceWith(varSelector.toTagString());
111111

112-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'List', 'string']);
112+
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
113113
varSelector.setComponentID('targetData');
114114
varSelector.addClass('vp-state vp-input');
115115
varSelector.setValue(this.state.targetData);
116116
varSelector.setPlaceholder('Select target data');
117117
$(page).find('#targetData').replaceWith(varSelector.toTagString());
118118

119-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'List', 'string']);
119+
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
120120
varSelector.setComponentID('stratify');
121121
varSelector.addClass('vp-state vp-input');
122122
varSelector.setValue(this.state.stratify);

‎js/m_ml/evaluation.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ define([
7373
$(page).find('.vp-eval-'+this.state.modelType).show();
7474

7575
// varselector TEST:
76-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'List', 'string']);
76+
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
7777
varSelector.setComponentID('predictData');
7878
varSelector.addClass('vp-state vp-input');
7979
varSelector.setValue(this.state.predictData);
8080
$(page).find('#predictData').replaceWith(varSelector.toTagString());
8181

82-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'List', 'string']);
82+
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
8383
varSelector.setComponentID('targetData');
8484
varSelector.addClass('vp-state vp-input');
8585
varSelector.setValue(this.state.targetData);

‎js/m_ml/fitting.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ define([
7171
});
7272

7373
// feature data
74-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'List', 'string']);
74+
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
7575
varSelector.setComponentID('featureData');
7676
varSelector.addClass('vp-state vp-input');
7777
varSelector.setValue(this.state.featureData);
7878
$(page).find('#featureData').replaceWith(varSelector.toTagString());
7979

8080
// target data
81-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'List', 'string']);
81+
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
8282
varSelector.setComponentID('targetData');
8383
varSelector.addClass('vp-state vp-input');
8484
varSelector.setValue(this.state.featureData);

‎js/m_ml/modelSelection.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ define([
112112
// render option page
113113
$(page).find('.vp-model-option-box').html(this.templateForOption(this.state.model));
114114

115-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'List', 'string']);
115+
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
116116
varSelector.setComponentID('featureData');
117117
varSelector.addClass('vp-state vp-input');
118118
varSelector.setValue(this.state.featureData);
119119
$(page).find('#featureData').replaceWith(varSelector.toTagString());
120120

121-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'List', 'string']);
121+
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
122122
varSelector.setComponentID('targetData');
123123
varSelector.addClass('vp-state vp-input');
124124
varSelector.setValue(this.state.targetData);

‎js/m_ml/prediction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ define([
7070
});
7171

7272
// feature data
73-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'List', 'string']);
73+
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
7474
varSelector.setComponentID('featureData');
7575
varSelector.addClass('vp-state vp-input');
7676
varSelector.setValue(this.state.featureData);

‎js/m_ml/transformation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ define([
7070
});
7171

7272
// feature data
73-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'List', 'string']);
73+
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
7474
varSelector.setComponentID('featureData');
7575
varSelector.addClass('vp-state vp-input');
7676
varSelector.setValue(this.state.featureData);

‎python/variableCommand.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def _vp_get_type(var=None):
4141
return str(type(var).__name__)
4242

4343

44-
def _vp_get_variables_list(types):
44+
def _vp_get_variables_list(types, exclude_types=[]):
4545
"""
4646
Get Variable list in types
4747
"""
@@ -51,9 +51,9 @@ def _vp_get_variables_list(types):
5151
varList = []
5252
searchList = globals()
5353
if (type(types) == list) and (len(types) > 0):
54-
varList = [{'varName': v, 'varType': type(eval(v)).__name__} for v in searchList if (not v.startswith('_')) & (v not in _VP_NOT_USING_VAR) & (type(eval(v)).__name__ in types)]
54+
varList = [{'varName': v, 'varType': type(eval(v)).__name__} for v in searchList if (not v.startswith('_')) & (v not in _VP_NOT_USING_VAR) & (type(eval(v)).__name__ not in exclude_types) & (type(eval(v)).__name__ in types)]
5555
else:
56-
varList = [{'varName': v, 'varType': type(eval(v)).__name__} for v in searchList if (not v.startswith('_')) & (v not in _VP_NOT_USING_VAR) & (type(eval(v)).__name__ not in _VP_NOT_USING_TYPES)]
56+
varList = [{'varName': v, 'varType': type(eval(v)).__name__} for v in searchList if (not v.startswith('_')) & (v not in _VP_NOT_USING_VAR) & (type(eval(v)).__name__ not in exclude_types) & (type(eval(v)).__name__ not in _VP_NOT_USING_TYPES)]
5757

5858
return varList
5959

0 commit comments

Comments
 (0)