Skip to content

Commit 2c5a6b6

Browse files
author
minjk-bl
committed
Fit/predict & Model info completion
1 parent caac6b4 commit 2c5a6b6

File tree

6 files changed

+280
-180
lines changed

6 files changed

+280
-180
lines changed

‎css/m_ml/fitPredict.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
.vp-model-select-box {
2+
grid-column-gap: 5px;
3+
}
14
.vp-ins-select-title {
25
font-weight: bold;
36
color: var(--font-hightlight);

‎html/m_ml/fitPredict.html

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
<body>
22
<div class="vp-grid-box vp-model-box" data-type="selection">
3-
<div class="vp-grid-border-box vp-grid-col-110">
4-
<label for="model" class="vp-orange-text">Model</label>
5-
<select id="model" class="vp-select vp-state" style="width: 200px;">
6-
<!-- Auto Create -->
7-
</select>
3+
<div class="vp-grid-border-box">
4+
<div class="vp-multilang vp-ins-select-title">Model</div>
5+
<!-- <select id="model" class="vp-select vp-state" style="width: 200px;">
6+
</select> -->
7+
<div class="vp-grid-col-p50 vp-model-select-box">
8+
<!-- Model Categories -->
9+
<div class="vp-ins-select-box category">
10+
<ul class="vp-ins-select-list category vp-scrollbar" style="height:80px">
11+
<!-- Auto Create -->
12+
</ul>
13+
</div>
14+
<!-- Model -->
15+
<div class="vp-ins-select-box model">
16+
<ul class="vp-ins-select-list model vp-scrollbar" style="height:80px">
17+
<!-- Auto Create -->
18+
</ul>
19+
</div>
20+
</div>
821
</div>
922
<div class="vp-grid-border-box">
1023
<input type="hidden" id="modelEditorType" class="vp-state" value="">

‎html/m_ml/modelInfo.html

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
<body>
22
<div class="vp-grid-box vp-model-box" data-type="selection">
3-
<div class="vp-grid-border-box vp-grid-col-110">
4-
<label for="model" class="vp-orange-text">Model</label>
5-
<select id="model" class="vp-select vp-state" style="width: 200px;">
6-
<!-- Auto Create -->
7-
</select>
3+
<div class="vp-grid-border-box">
4+
<div class="vp-multilang vp-ins-select-title">Model</div>
5+
<!-- <select id="model" class="vp-select vp-state" style="width: 200px;">
6+
</select> -->
7+
<div class="vp-grid-col-p50 vp-model-select-box">
8+
<!-- Model Categories -->
9+
<div class="vp-ins-select-box category">
10+
<ul class="vp-ins-select-list category vp-scrollbar" style="height:80px">
11+
<!-- Auto Create -->
12+
</ul>
13+
</div>
14+
<!-- Model -->
15+
<div class="vp-ins-select-box model">
16+
<ul class="vp-ins-select-list model vp-scrollbar" style="height:80px">
17+
<!-- Auto Create -->
18+
</ul>
19+
</div>
20+
</div>
821
</div>
922
<div class="vp-grid-border-box">
1023
<input type="hidden" id="modelEditorType" class="vp-state" value="">

‎js/com/com_Config.js

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,10 @@ define([
448448
return Config.ML_DATA_TYPES;
449449
}
450450

451+
getMLCategories() {
452+
return Object.keys(Config.ML_DATA_DICT);
453+
}
454+
451455
}
452456

453457
//========================================================================
@@ -482,38 +486,38 @@ define([
482486
* Data types using for searching model variables
483487
*/
484488
Config.ML_DATA_DICT = {
489+
'Data Preparation': [
490+
/** Encoding */
491+
'OneHotEncoder', 'LabelEncoder', 'OrdinalEncoder', 'TargetEncoder', 'SMOTE',
492+
/** Scaling */
493+
'StandardScaler', 'RobustScaler', 'MinMaxScaler', 'Normalizer', 'FunctionTransformer', 'PolynomialFeatures', 'KBinsDiscretizer',
494+
/** ETC */
495+
'ColumnTransformer'
496+
],
485497
'Regression': [
486498
'LinearRegression', 'Ridge', 'Lasso', 'ElasticNet', 'SVR', 'DecisionTreeRegressor', 'RandomForestRegressor', 'GradientBoostingRegressor', 'XGBRegressor', 'LGBMRegressor', 'CatBoostRegressor',
487499
],
488500
'Classification': [
489501
'LogisticRegression', 'BernoulliNB', 'MultinomialNB', 'GaussianNB', 'SVC', 'DecisionTreeClassifier', 'RandomForestClassifier', 'GradientBoostingClassifier', 'XGBClassifier', 'LGBMClassifier', 'CatBoostClassifier',
490502
],
491-
'Auto ML': [
492-
'AutoSklearnRegressor', 'AutoSklearnClassifier', 'TPOTRegressor', 'TPOTClassifier'
493-
],
494503
'Clustering': [
495504
'KMeans', 'AgglomerativeClustering', 'GaussianMixture', 'DBSCAN',
496505
],
497506
'Dimension Reduction': [
498507
'PCA', 'LinearDiscriminantAnalysis', 'TruncatedSVD', 'NMF', 'TSNE'
499508
],
500-
'Data Preparation': [
501-
/** Encoding */
502-
'OneHotEncoder', 'LabelEncoder', 'OrdinalEncoder', 'TargetEncoder', 'SMOTE',
503-
/** Scaling */
504-
'StandardScaler', 'RobustScaler', 'MinMaxScaler', 'Normalizer', 'FunctionTransformer', 'PolynomialFeatures', 'KBinsDiscretizer',
505-
/** ETC */
506-
'ColumnTransformer'
509+
'Auto ML': [
510+
'AutoSklearnRegressor', 'AutoSklearnClassifier', 'TPOTRegressor', 'TPOTClassifier'
507511
]
508512
};
509513

510514
Config.ML_DATA_TYPES = [
515+
...Config.ML_DATA_DICT['Data Preparation'],
511516
...Config.ML_DATA_DICT['Regression'],
512517
...Config.ML_DATA_DICT['Classification'],
513-
...Config.ML_DATA_DICT['Auto ML'],
514518
...Config.ML_DATA_DICT['Clustering'],
515519
...Config.ML_DATA_DICT['Dimension Reduction'],
516-
...Config.ML_DATA_DICT['Data Preparation']
520+
...Config.ML_DATA_DICT['Auto ML']
517521
];
518522

519523
return Config;

0 commit comments

Comments
 (0)