Skip to content

Commit 4cbb72e

Browse files
author
minjk-bl
committed
Add some models
1 parent d77e645 commit 4cbb72e

6 files changed

Lines changed: 77 additions & 29 deletions

File tree

‎data/m_ml/mlLibrary.js‎

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,14 @@ define([
228228

229229
]
230230
},
231+
'prep-poly-feat': {
232+
name: 'Polynomial Features',
233+
import: 'from sklearn.preprocessing import PolynomialFeatures',
234+
code: 'PolynomialFeatures(${etc})',
235+
options: [
236+
237+
]
238+
},
231239
/** Regression */
232240
'ln-rgs': {
233241
name: 'LinearRegression',
@@ -237,6 +245,30 @@ define([
237245
{ name: 'fit_intercept', component: ['bool_select'], default: 'True', usePair: true }
238246
]
239247
},
248+
'ridge': {
249+
name: 'Ridge',
250+
import: 'from sklearn.linear_model import Ridge',
251+
code: 'Ridge(${etc})',
252+
options: [
253+
//TODO:
254+
]
255+
},
256+
'lasso': {
257+
name: 'Lasso',
258+
import: 'from sklearn.linear_model import Lasso',
259+
code: 'Lasso(${etc})',
260+
options: [
261+
//TODO:
262+
]
263+
},
264+
'elasticnet': {
265+
name: 'ElasticNet',
266+
import: 'from sklearn.linear_model import ElasticNet',
267+
code: 'ElasticNet(${etc})',
268+
options: [
269+
//TODO:
270+
]
271+
},
240272
'sv-rgs': {
241273
name: 'SVR',
242274
import: 'from sklearn.svm import SVR',
@@ -344,6 +376,30 @@ define([
344376
{ name: 'random_state', component: ['input_number'], placeholder: '123', usePair: true }
345377
]
346378
},
379+
'bern-nb': {
380+
name: 'BernoulliNB',
381+
import: 'from sklearn.naive_bayes import BernoulliNB',
382+
code: 'BernoulliNB(${etc})',
383+
options: [
384+
//TODO:
385+
]
386+
},
387+
'mulnom-nb': {
388+
name: 'MultinomialNB',
389+
import: 'from sklearn.naive_bayes import MultinomialNB',
390+
code: 'MultinomialNB(${etc})',
391+
options: [
392+
//TODO:
393+
]
394+
},
395+
'gaus-nb': {
396+
name: 'GaussianNB',
397+
import: 'from sklearn.naive_bayes import GaussianNB',
398+
code: 'GaussianNB(${etc})',
399+
options: [
400+
//TODO:
401+
]
402+
},
347403
'sv-clf': {
348404
name: 'SupportVectorClassifier',
349405
import: 'from sklearn.svm import SVC',
@@ -524,7 +580,7 @@ define([
524580
},
525581
/** Dimension Reduction */
526582
'pca': {
527-
name: 'Principal Component Analysis',
583+
name: 'PCA(Principal Component Analysis)',
528584
import: 'from sklearn.decomposition import PCA',
529585
code: 'PCA(${n_components}${random_state}${etc})',
530586
options: [
@@ -533,7 +589,7 @@ define([
533589
]
534590
},
535591
'lda': {
536-
name: 'Linear Discriminant Analysis',
592+
name: 'LDA(Linear Discriminant Analysis)',
537593
import: 'from sklearn.discriminant_analysis import LinearDiscriminantAnalysis',
538594
code: 'LinearDiscriminantAnalysis(${n_components}${etc})',
539595
options: [
@@ -550,13 +606,23 @@ define([
550606
]
551607
},
552608
'nmf': {
553-
name: 'Non-Negative Matrix Factorization',
609+
name: 'NMF(Non-Negative Matrix Factorization)',
554610
import: 'from sklearn.decomposition import NMF',
555611
code: 'NMF(${n_components}${random_state}${etc})',
556612
options: [
557613
{ name: 'n_components', component: ['input_number'], placeholder: 'None', usePair: true },
558614
{ name: 'random_state', component: ['input_number'], placeholder: '123', usePair: true }
559615
]
616+
},
617+
'tsne': {
618+
name: 'TSNE(T-distributed Stochastic Neighbor Embedding)',
619+
import: 'from sklearn.manifold import TSNE',
620+
code: 'TSNE(${n_components}${learning_rate}${random_state}${etc})',
621+
options: [
622+
{ name: 'n_components', component: ['input_number'], placeholder: 'None', usePair: true },
623+
{ name: 'learning_rate', component: ['input_number'], default: 200.0, usePair: true },
624+
{ name: 'random_state', component: ['input_number'], placeholder: '123', usePair: true }
625+
]
560626
}
561627
}
562628

‎js/com/com_Config.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -483,10 +483,10 @@ define([
483483
*/
484484
Config.ML_DATA_DICT = {
485485
'Regression': [
486-
'LinearRegression', 'SVR', 'DecisionTreeRegressor', 'RandomForestRegressor', 'GradientBoostingRegressor', 'XGBRegressor', 'LGBMRegressor', 'CatBoostRegressor',
486+
'LinearRegression', 'Ridge', 'Lasso', 'ElasticNet', 'SVR', 'DecisionTreeRegressor', 'RandomForestRegressor', 'GradientBoostingRegressor', 'XGBRegressor', 'LGBMRegressor', 'CatBoostRegressor',
487487
],
488488
'Classification': [
489-
'LogisticRegression', 'SVC', 'DecisionTreeClassifier', 'RandomForestClassifier', 'GradientBoostingClassifier', 'XGBClassifier', 'LGBMClassifier', 'CatBoostClassifier',
489+
'LogisticRegression', 'BernoulliNB', 'MultinomialNB', 'GaussianNB', 'SVC', 'DecisionTreeClassifier', 'RandomForestClassifier', 'GradientBoostingClassifier', 'XGBClassifier', 'LGBMClassifier', 'CatBoostClassifier',
490490
],
491491
'Auto ML': [
492492
'AutoSklearnRegressor', 'AutoSklearnClassifier', 'TPOTRegression', 'TPOTClassifier'
@@ -495,13 +495,13 @@ define([
495495
'KMeans', 'AgglomerativeClustering', 'GaussianMixture', 'DBSCAN',
496496
],
497497
'Dimension Reduction': [
498-
'PCA', 'LinearDiscriminantAnalysis', 'TruncatedSVD', 'NMF'
498+
'PCA', 'LinearDiscriminantAnalysis', 'TruncatedSVD', 'NMF', 'TSNE'
499499
],
500500
'Data Preparation': [
501501
/** Encoding */
502502
'OneHotEncoder', 'LabelEncoder', 'OrdinalEncoder', 'TargetEncoder', 'SMOTE',
503503
/** Scaling */
504-
'StandardScaler', 'RobustScaler', 'MinMaxScaler', 'Normalizer', 'FunctionTransformer'
504+
'StandardScaler', 'RobustScaler', 'MinMaxScaler', 'Normalizer', 'FunctionTransformer', 'PolynomialFeatures'
505505
]
506506
};
507507

‎js/m_ml/Classification.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ define([
5050
this.modelConfig = ML_LIBRARIES;
5151

5252
this.modelTypeList = {
53-
// 'Regression': ['ln-rgs', 'sv-rgs', 'dt-rgs', 'rf-rgs', 'gbm-rgs', 'xgb-rgs', 'lgbm-rgs', 'cb-rgs'],
54-
'Classfication': ['lg-rgs', 'sv-clf', 'dt-clf', 'rf-clf', 'gbm-clf', 'xgb-clf', 'lgbm-clf', 'cb-clf'],
55-
// 'Auto ML': ['tpot-rgs', 'tpot-clf'],
56-
// 'Clustering': ['k-means', 'agg-cls', 'gaus-mix', 'dbscan'],
57-
// 'Dimension Reduction': ['pca', 'lda', 'svd', 'nmf']
53+
'Classfication': ['lg-rgs', 'bern-nb', 'mulnom-nb', 'gaus-nb', 'sv-clf', 'dt-clf', 'rf-clf', 'gbm-clf', 'xgb-clf', 'lgbm-clf', 'cb-clf'],
5854
}
5955

6056

‎js/m_ml/DataPrep.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,7 @@ define([
5252

5353
this.modelTypeList = {
5454
'Encoding': ['prep-onehot', 'prep-label', 'prep-ordinal', 'prep-target', 'prep-smote'],
55-
'Scaling': ['prep-standard', 'prep-robust', 'prep-minmax', 'prep-normalizer', 'prep-func-trsfrm-log', 'prep-func-trsfrm-exp']
56-
57-
// 'Regression': ['ln-rgs', 'sv-rgs', 'dt-rgs', 'rf-rgs', 'gbm-rgs', 'xgb-rgs', 'lgbm-rgs', 'cb-rgs'],
58-
// 'Classfication': ['lg-rgs', 'sv-clf', 'dt-clf', 'rf-clf', 'gbm-clf', 'xgb-clf', 'lgbm-clf', 'cb-clf'],
59-
// 'Auto ML': ['tpot-rgs', 'tpot-clf'],
60-
// 'Clustering': ['k-means', 'agg-cls', 'gaus-mix', 'dbscan'],
61-
// 'Dimension Reduction': ['pca', 'lda', 'svd', 'nmf']
55+
'Scaling': ['prep-standard', 'prep-robust', 'prep-minmax', 'prep-normalizer', 'prep-func-trsfrm-log', 'prep-func-trsfrm-exp', 'prep-poly-feat']
6256
}
6357

6458

‎js/m_ml/DimensionReduction.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ define([
5050
this.modelConfig = ML_LIBRARIES;
5151

5252
this.modelTypeList = {
53-
// 'Regression': ['ln-rgs', 'sv-rgs', 'dt-rgs', 'rf-rgs', 'gbm-rgs', 'xgb-rgs', 'lgbm-rgs', 'cb-rgs'],
54-
// 'Classfication': ['lg-rgs', 'sv-clf', 'dt-clf', 'rf-clf', 'gbm-clf', 'xgb-clf', 'lgbm-clf', 'cb-clf'],
55-
// 'Auto ML': ['tpot-rgs', 'tpot-clf'],
56-
// 'Clustering': ['k-means', 'agg-cls', 'gaus-mix', 'dbscan'],
57-
'Dimension Reduction': ['pca', 'lda', 'svd', 'nmf']
53+
'Dimension Reduction': ['pca', 'lda', 'svd', 'nmf', 'tsne']
5854
}
5955

6056

‎js/m_ml/Regression.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ define([
5050
this.modelConfig = ML_LIBRARIES;
5151

5252
this.modelTypeList = {
53-
'Regression': ['ln-rgs', 'sv-rgs', 'dt-rgs', 'rf-rgs', 'gbm-rgs', 'xgb-rgs', 'lgbm-rgs', 'cb-rgs'],
54-
// 'Classfication': ['lg-rgs', 'sv-clf', 'dt-clf', 'rf-clf', 'gbm-clf', 'xgb-clf', 'lgbm-clf', 'cb-clf'],
55-
// 'Auto ML': ['tpot-rgs', 'tpot-clf'],
56-
// 'Clustering': ['k-means', 'agg-cls', 'gaus-mix', 'dbscan'],
57-
// 'Dimension Reduction': ['pca', 'lda', 'svd', 'nmf']
53+
'Regression': ['ln-rgs', 'ridge', 'lasso', 'elasticnet', 'sv-rgs', 'dt-rgs', 'rf-rgs', 'gbm-rgs', 'xgb-rgs', 'lgbm-rgs', 'cb-rgs'],
5854
}
5955

6056

0 commit comments

Comments
 (0)