Skip to content

Commit 94a2ad9

Browse files
author
minjk-bl
committed
Update evaluation changes
1 parent 68f55ad commit 94a2ad9

2 files changed

Lines changed: 87 additions & 27 deletions

File tree

‎html/m_ml/evaluation.html‎

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
<body>
22
<div class="vp-grid-box">
3-
<div class="vp-grid-border-box vp-grid-col-95">
4-
<label for="modelType" class="vp-orange-text">Model Type</label>
5-
<select id="modelType" class="vp-select vp-state">
6-
<option value="rgs">Regression</option>
7-
<option value="clf">Classfication</option>
8-
<option value="cls">Clustering</option>
9-
</select>
10-
<label for="targetData" class="vp-orange-text">Target Data</label>
11-
<input type="text" class="vp-input vp-state" id="targetData" placeholder="Input target data" value="y_test"/>
12-
<label for="predictData" class="vp-orange-text">Predict Data</label>
13-
<input type="text" class="vp-input vp-state" id="predictData" placeholder="Input predict data" value="pred"/>
14-
<label for="model" class="vp-ev-model vp-orange-text">Model</label>
15-
<select id="model" class="vp-ev-model vp-select vp-state">
16-
<!-- Auto create -->
17-
</select>
3+
<div class="vp-grid-border-box">
4+
<div class="vp-grid-col-95">
5+
<label for="modelType" class="vp-orange-text">Model Type</label>
6+
<select id="modelType" class="vp-select vp-state">
7+
<option value="rgs">Regression</option>
8+
<option value="clf">Classfication</option>
9+
<option value="cls">Clustering</option>
10+
</select>
11+
</div>
12+
<div class="vp-grid-col-95 vp-upper-box rgs clf">
13+
<label for="targetData" class="vp-orange-text">Target Data</label>
14+
<input type="text" class="vp-input vp-state" id="targetData" placeholder="Input target data" value="y_test"/>
15+
</div>
16+
<div class="vp-grid-col-95 vp-upper-box rgs clf">
17+
<label for="predictData" class="vp-orange-text">Predict Data</label>
18+
<input type="text" class="vp-input vp-state" id="predictData" placeholder="Input predict data" value="pred"/>
19+
</div>
20+
<div class="vp-grid-col-95 vp-upper-box cls">
21+
<label for="clusteredIndex" class="vp-orange-text">Clustered Index</label>
22+
<input type="text" class="vp-input vp-state" id="clusteredIndex" placeholder="Input predict data" value="clusters"/>
23+
</div>
1824
</div>
1925
<div class="vp-grid-border-box">
2026
<label for="featureData" class="vp-orange-text">Evaluation Metrics</label>
@@ -33,13 +39,29 @@
3339
<label><input type="checkbox" id="precision" class="vp-state"><span>Precision</span></label>
3440
<label><input type="checkbox" id="recall" class="vp-state"><span>Recall</span></label>
3541
<label><input type="checkbox" id="f1_score" class="vp-state"><span>F1-scorev</label>
42+
<hr style="margin: 5px;"/>
3643
<label><input type="checkbox" id="roc_curve" class="vp-eval-check vp-state"><span>ROC Curve</span></label>
3744
<label><input type="checkbox" id="auc" class="vp-eval-check vp-state"><span>AUC</span></label>
45+
<div class="vp-ev-model vp-grid-col-95">
46+
<label for="model" class="vp-orange-text">Model</label>
47+
<select id="model" class="vp-select vp-state">
48+
<!-- Auto create -->
49+
</select>
50+
</div>
3851
</div>
3952
<div class="vp-grid-box vp-eval-box vp-eval-cls">
4053
<label><input type="checkbox" id="silhouetteScore" class="vp-state" checked><span>Silhouette score</span></label>
41-
<label><input type="checkbox" id="ari" class="vp-state"><span>ARI</span></label>
42-
<label><input type="checkbox" id="nm" class="vp-state"><span>NM</span></label>
54+
<div class="vp-ev-model vp-grid-col-95">
55+
<label for="featureData2">Feature Data</label>
56+
<input type="text" class="vp-input vp-state" id="featureData2" placeholder="Input feature data" value="X"/>
57+
</div>
58+
<hr style="margin: 5px;"/>
59+
<label><input type="checkbox" id="ari" class="vp-state"><span>ARI (Adjusted Random Score)</span></label>
60+
<label><input type="checkbox" id="nmi" class="vp-state"><span>NMI (Normalized Mutual Information)</span></label>
61+
<div class="vp-ev-model vp-grid-col-95">
62+
<label for="targetData2">Target Data</label>
63+
<input type="text" class="vp-input vp-state" id="targetData2" placeholder="Input target data" value="y"/>
64+
</div>
4365
</div>
4466
</div>
4567
</div>

‎js/m_ml/evaluation.js‎

Lines changed: 48 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@ define([
4141
confusion_matrix: true, report: true,
4242
accuracy: false, precision: false, recall: false, f1_score: false,
4343
roc_curve: false, auc: false,
44+
model: '',
4445
// clustering
45-
silhouetteScore: true, ari: false, nm: false,
46+
clusteredIndex: 'clusters',
47+
silhouetteScore: true, ari: false, nmi: false,
48+
featureData2: 'X',
49+
targetData2: 'y',
4650
...this.state
4751
}
4852
}
@@ -62,14 +66,23 @@ define([
6266
let modelType = $(this).val();
6367
that.state.modelType = modelType;
6468

69+
$(that.wrapSelector('.vp-upper-box')).hide();
70+
$(that.wrapSelector('.vp-upper-box.' + modelType)).show();
71+
6572
$(that.wrapSelector('.vp-eval-box')).hide();
6673
$(that.wrapSelector('.vp-eval-'+modelType)).show();
6774

68-
if (modelType == 'clf') {
75+
if (modelType == 'rgs') {
76+
// Regression
77+
78+
} else if (modelType == 'clf') {
6979
// Classification - model selection
7080
if (that.checkToShowModel() == true) {
7181
$(that.wrapSelector('.vp-ev-model')).show();
7282
}
83+
} else {
84+
// Clustering
85+
7386
}
7487
});
7588

@@ -118,6 +131,25 @@ define([
118131
varSelector.setValue(this.state.targetData);
119132
$(page).find('#targetData').replaceWith(varSelector.toTagString());
120133

134+
// Clustering - data selection
135+
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
136+
varSelector.setComponentID('clusteredIndex');
137+
varSelector.addClass('vp-state vp-input');
138+
varSelector.setValue(this.state.clusteredIndex);
139+
$(page).find('#clusteredIndex').replaceWith(varSelector.toTagString());
140+
141+
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
142+
varSelector.setComponentID('featureData2');
143+
varSelector.addClass('vp-state vp-input');
144+
varSelector.setValue(this.state.featureData2);
145+
$(page).find('#featureData2').replaceWith(varSelector.toTagString());
146+
147+
varSelector = new VarSelector2(this.wrapSelector(), ['DataFrame', 'list', 'str']);
148+
varSelector.setComponentID('targetData2');
149+
varSelector.addClass('vp-state vp-input');
150+
varSelector.setValue(this.state.targetData2);
151+
$(page).find('#targetData2').replaceWith(varSelector.toTagString());
152+
121153
// model
122154
// set model list
123155
let modelOptionTag = new com_String();
@@ -169,7 +201,12 @@ define([
169201
}
170202
});
171203

172-
if (this.state.modelType == 'clf') {
204+
$(page).find('.vp-upper-box').hide();
205+
$(page).find('.vp-upper-box.' + this.state.modelType).show();
206+
207+
if (this.state.modelType == 'rgs') {
208+
209+
} else if (this.state.modelType == 'clf') {
173210
if (this.state.roc_curve == true || this.state.auc == true) {
174211
$(page).find('.vp-ev-model').show();
175212
} else {
@@ -197,7 +234,8 @@ define([
197234
// regression
198235
coefficient, intercept, r_squared, mae, mape, rmse, scatter_plot,
199236
// clustering
200-
sizeOfClusters, silhouetteScore, ari, nm
237+
sizeOfClusters, silhouetteScore, ari, nmi,
238+
clusteredIndex, featureData2, targetData2
201239
} = this.state;
202240

203241
//====================================================================
@@ -317,19 +355,19 @@ define([
317355
if (silhouetteScore) {
318356
code = new com_String();
319357
code.appendLine("# Silhouette score");
320-
code.appendFormat("print(f'Silhouette score: {metrics.cluster.silhouette_score({0}, {1})}')", targetData, predictData);
358+
code.appendFormat("print(f'Silhouette score: {metrics.cluster.silhouette_score({0}, {1})}')", featureData2, clusteredIndex);
321359
codeCells.push(code.toString());
322360
}
323361
if (ari) {
324362
code = new com_String();
325-
code.appendLine("# ARI");
326-
code.appendFormat("print(f'ARI: {metrics.cluster.adjusted_rand_score({0}, {1})}')", targetData, predictData);
363+
code.appendLine("# ARI(Adjusted Rand score)");
364+
code.appendFormat("print(f'ARI: {metrics.cluster.adjusted_rand_score({0}, {1})}')", targetData2, clusteredIndex);
327365
codeCells.push(code.toString());
328366
}
329-
if (nm) {
367+
if (nmi) {
330368
code = new com_String();
331-
code.appendLine("# NM");
332-
code.appendFormat("print(f'NM: {metrics.cluster.normalized_mutual_info_score({0}, {1})}')", targetData, predictData);
369+
code.appendLine("# NMI(Normalized Mutual Info Score)");
370+
code.appendFormat("print(f'NM: {metrics.cluster.normalized_mutual_info_score({0}, {1})}')", targetData2, clusteredIndex);
333371
codeCells.push(code.toString());
334372
}
335373
}

0 commit comments

Comments
 (0)