Skip to content

Commit 084735e

Browse files
author
minjk-bl
committed
VarSelector searching data types bug fixed
1 parent 5bb2e25 commit 084735e

10 files changed

+26
-22
lines changed

‎js/com/component/VarSelector2.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ define([
88
* @constructor
99
*/
1010
class VarSelector extends Component{
11-
constructor(parentTag, dataTypes=[], defaultType='', showOthers=true, showFilterbox=true) {
11+
constructor(parentTag, dataTypes=['DataFrame', 'Series', 'ndarray', 'list', 'dict'], defaultType='', showOthers=true, showFilterbox=true) {
1212
super(null, {parentTag: parentTag, dataTypes: dataTypes, defaultType: defaultType, showOthers: showOthers, showFilterbox: showFilterbox});
1313
}
1414

@@ -234,8 +234,12 @@ define([
234234
}
235235

236236
}
237+
} else {
238+
dataTypes = [];
237239
}
238240

241+
vpLog.display(VP_LOG_TYPE.DEVELOP, 'VarSelector2 - reload ', dataTypes, excludeTypes);
242+
239243
return new Promise(function(resolve, reject) {
240244
vpKernel.getDataList(dataTypes, excludeTypes).then(function (resultObj) {
241245
try {

‎js/m_ml/AutoML.js

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

141-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
141+
let varSelector = new VarSelector2(this.wrapSelector());
142142
varSelector.setComponentID('featureData');
143143
varSelector.addClass('vp-state vp-input');
144144
varSelector.setValue(this.state.featureData);
145145
$(page).find('#featureData').replaceWith(varSelector.toTagString());
146146

147-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
147+
varSelector = new VarSelector2(this.wrapSelector());
148148
varSelector.setComponentID('targetData');
149149
varSelector.addClass('vp-state vp-input');
150150
varSelector.setValue(this.state.targetData);

‎js/m_ml/Classification.js

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

141-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
141+
let varSelector = new VarSelector2(this.wrapSelector());
142142
varSelector.setComponentID('featureData');
143143
varSelector.addClass('vp-state vp-input');
144144
varSelector.setValue(this.state.featureData);
145145
$(page).find('#featureData').replaceWith(varSelector.toTagString());
146146

147-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
147+
varSelector = new VarSelector2(this.wrapSelector());
148148
varSelector.setComponentID('targetData');
149149
varSelector.addClass('vp-state vp-input');
150150
varSelector.setValue(this.state.targetData);

‎js/m_ml/Clustering.js

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

144-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
144+
let varSelector = new VarSelector2(this.wrapSelector());
145145
varSelector.setComponentID('featureData');
146146
varSelector.addClass('vp-state vp-input');
147147
varSelector.setValue(this.state.featureData);
148148
$(page).find('#featureData').replaceWith(varSelector.toTagString());
149149

150-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
150+
varSelector = new VarSelector2(this.wrapSelector());
151151
varSelector.setComponentID('targetData');
152152
varSelector.addClass('vp-state vp-input');
153153
varSelector.setValue(this.state.targetData);

‎js/m_ml/DataPrep.js

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

200-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
200+
let varSelector = new VarSelector2(this.wrapSelector());
201201
varSelector.setComponentID('featureData');
202202
varSelector.addClass('vp-state vp-input');
203203
varSelector.setValue(this.state.featureData);
204204
$(page).find('#featureData').replaceWith(varSelector.toTagString());
205205

206-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
206+
varSelector = new VarSelector2(this.wrapSelector());
207207
varSelector.setComponentID('targetData');
208208
varSelector.addClass('vp-state vp-input');
209209
varSelector.setValue(this.state.targetData);

‎js/m_ml/DimensionReduction.js

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

140-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
140+
let varSelector = new VarSelector2(this.wrapSelector());
141141
varSelector.setComponentID('featureData');
142142
varSelector.addClass('vp-state vp-input');
143143
varSelector.setValue(this.state.featureData);
144144
$(page).find('#featureData').replaceWith(varSelector.toTagString());
145145

146-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
146+
varSelector = new VarSelector2(this.wrapSelector());
147147
varSelector.setComponentID('targetData');
148148
varSelector.addClass('vp-state vp-input');
149149
varSelector.setValue(this.state.targetData);

‎js/m_ml/Regression.js

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

141-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
141+
let varSelector = new VarSelector2(this.wrapSelector());
142142
varSelector.setComponentID('featureData');
143143
varSelector.addClass('vp-state vp-input');
144144
varSelector.setValue(this.state.featureData);
145145
$(page).find('#featureData').replaceWith(varSelector.toTagString());
146146

147-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
147+
varSelector = new VarSelector2(this.wrapSelector());
148148
varSelector.setComponentID('targetData');
149149
varSelector.addClass('vp-state vp-input');
150150
varSelector.setValue(this.state.targetData);

‎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', 'str']);
105+
let varSelector = new VarSelector2(this.wrapSelector());
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', 'str']);
112+
varSelector = new VarSelector2(this.wrapSelector());
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', 'str']);
119+
varSelector = new VarSelector2(this.wrapSelector());
120120
varSelector.setComponentID('stratify');
121121
varSelector.addClass('vp-state vp-input');
122122
varSelector.setValue(this.state.stratify);

‎js/m_ml/evaluation.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,32 +131,32 @@ define([
131131
$(page).find('.vp-eval-'+this.state.modelType).show();
132132

133133
// varselector
134-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
134+
let varSelector = new VarSelector2(this.wrapSelector());
135135
varSelector.setComponentID('predictData');
136136
varSelector.addClass('vp-state vp-input');
137137
varSelector.setValue(this.state.predictData);
138138
$(page).find('#predictData').replaceWith(varSelector.toTagString());
139139

140-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
140+
varSelector = new VarSelector2(this.wrapSelector());
141141
varSelector.setComponentID('targetData');
142142
varSelector.addClass('vp-state vp-input');
143143
varSelector.setValue(this.state.targetData);
144144
$(page).find('#targetData').replaceWith(varSelector.toTagString());
145145

146146
// Clustering - data selection
147-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
147+
varSelector = new VarSelector2(this.wrapSelector());
148148
varSelector.setComponentID('clusteredIndex');
149149
varSelector.addClass('vp-state vp-input');
150150
varSelector.setValue(this.state.clusteredIndex);
151151
$(page).find('#clusteredIndex').replaceWith(varSelector.toTagString());
152152

153-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
153+
varSelector = new VarSelector2(this.wrapSelector());
154154
varSelector.setComponentID('featureData2');
155155
varSelector.addClass('vp-state vp-input vp-ev-model silhouette');
156156
varSelector.setValue(this.state.featureData2);
157157
$(page).find('#featureData2').replaceWith(varSelector.toTagString());
158158

159-
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
159+
varSelector = new VarSelector2(this.wrapSelector());
160160
varSelector.setComponentID('targetData2');
161161
varSelector.addClass('vp-state vp-input vp-ev-model ari-nmi');
162162
varSelector.setValue(this.state.targetData2);

‎js/m_visualize/Seaborn.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ define([
232232
$(page).find('#chartType').html(chartTypeTag.toString());
233233

234234
// chart variable
235-
let varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'Series', 'list']);
235+
let varSelector = new VarSelector2(this.wrapSelector());
236236
varSelector.setComponentID('data');
237237
varSelector.addClass('vp-state vp-input');
238238
varSelector.setValue(this.state.data);

0 commit comments

Comments
 (0)