diff --git a/__pycache__/run.cpython-37.pyc b/__pycache__/run.cpython-37.pyc
index 0d0359d..c474586 100644
Binary files a/__pycache__/run.cpython-37.pyc and b/__pycache__/run.cpython-37.pyc differ
diff --git a/cachedir/joblib/run/randomSearch/15c1a1c6505bfd383b2231a984466199/output.pkl b/cachedir/joblib/run/randomSearch/15c1a1c6505bfd383b2231a984466199/output.pkl
new file mode 100644
index 0000000..b7cea4b
Binary files /dev/null and b/cachedir/joblib/run/randomSearch/15c1a1c6505bfd383b2231a984466199/output.pkl differ
diff --git a/cachedir/joblib/run/randomSearch/9d85ea1f37edb91533a828737a6caa01/metadata.json b/cachedir/joblib/run/randomSearch/9d85ea1f37edb91533a828737a6caa01/metadata.json
new file mode 100644
index 0000000..c8b395d
--- /dev/null
+++ b/cachedir/joblib/run/randomSearch/9d85ea1f37edb91533a828737a6caa01/metadata.json
@@ -0,0 +1 @@
+{"duration": 12.543240070343018, "input_args": {"XData": " sepal_l sepal_w petal_l petal_w\n0 6.3 3.3 6.0 2.5\n1 7.1 3.0 5.9 2.1\n2 5.8 2.7 5.1 1.9\n3 6.3 2.9 5.6 1.8\n4 7.6 3.0 6.6 2.1\n.. ... ... ... ...\n145 5.1 3.8 1.6 0.2\n146 5.0 3.5 1.6 0.6\n147 5.1 3.4 1.5 0.2\n148 4.6 3.2 1.4 0.2\n149 4.8 3.0 1.4 0.3\n\n[150 rows x 4 columns]", "yData": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]", "clf": "KNeighborsClassifier(algorithm='ball_tree', leaf_size=30, metric='minkowski',\n metric_params=None, n_jobs=None, n_neighbors=82, p=2,\n weights='uniform')", "params": "{'n_neighbors': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99], 'metric': ['chebyshev', 'manhattan', 'euclidean', 'minkowski'], 'algorithm': ['brute', 'kd_tree', 'ball_tree'], 'weights': ['uniform', 'distance']}", "eachAlgor": "'KNN'", "AlgorithmsIDsEnd": "0"}}
\ No newline at end of file
diff --git a/cachedir/joblib/run/randomSearch/b05bc4dd718bb370a35dbc60bdff86aa/output.pkl b/cachedir/joblib/run/randomSearch/b05bc4dd718bb370a35dbc60bdff86aa/output.pkl
new file mode 100644
index 0000000..3fef668
Binary files /dev/null and b/cachedir/joblib/run/randomSearch/b05bc4dd718bb370a35dbc60bdff86aa/output.pkl differ
diff --git a/cachedir/joblib/run/randomSearch/eb45ad56de8e367dade6cb77617a3d36/metadata.json b/cachedir/joblib/run/randomSearch/eb45ad56de8e367dade6cb77617a3d36/metadata.json
new file mode 100644
index 0000000..5cc0868
--- /dev/null
+++ b/cachedir/joblib/run/randomSearch/eb45ad56de8e367dade6cb77617a3d36/metadata.json
@@ -0,0 +1 @@
+{"duration": 19.771310806274414, "input_args": {"XData": " sepal_l sepal_w petal_l petal_w\n0 6.3 3.3 6.0 2.5\n1 7.1 3.0 5.9 2.1\n2 5.8 2.7 5.1 1.9\n3 6.3 2.9 5.6 1.8\n4 7.6 3.0 6.6 2.1\n.. ... ... ... ...\n145 5.1 3.8 1.6 0.2\n146 5.0 3.5 1.6 0.6\n147 5.1 3.4 1.5 0.2\n148 4.6 3.2 1.4 0.2\n149 4.8 3.0 1.4 0.3\n\n[150 rows x 4 columns]", "yData": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]", "clf": "LogisticRegression(C=64, class_weight=None, dual=False, fit_intercept=True,\n intercept_scaling=1, l1_ratio=None, max_iter=300,\n multi_class='auto', n_jobs=None, penalty='none',\n random_state=42, solver='newton-cg', tol=0.0001, verbose=0,\n warm_start=False)", "params": "{'C': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99], 'max_iter': [50, 100, 150, 200, 250, 300, 350, 400, 450], 'solver': ['lbfgs', 'newton-cg', 'sag', 'saga'], 'penalty': ['l2', 'none']}", "eachAlgor": "'LR'", "AlgorithmsIDsEnd": "100"}}
\ No newline at end of file
diff --git a/frontend/src/components/CrossoverMutationSpace.vue b/frontend/src/components/Ensemble.vue
similarity index 88%
rename from frontend/src/components/CrossoverMutationSpace.vue
rename to frontend/src/components/Ensemble.vue
index 3d5d43e..a6e2fc0 100644
--- a/frontend/src/components/CrossoverMutationSpace.vue
+++ b/frontend/src/components/Ensemble.vue
@@ -10,7 +10,7 @@
Action:
@@ -28,13 +28,14 @@ import { EventBus } from '../main.js'
const d3 = Object.assign(d3Base)
export default {
- name: 'CrossoverMutationSpace',
+ name: 'Ensemble',
data () {
return {
- CrossoverMutateText: 'Unselected points\' crossover & mutation',
+ CrossoverMutateText: 'Remove unselected points from ensemble',
WH: [],
ScatterPlotResults: '',
representationDef: 'mdsCM',
+ storeEnsembleLoc: [],
}
},
methods: {
@@ -66,6 +67,21 @@ export default {
var TSNEData = JSON.parse(this.ScatterPlotResults[10])
var UMAPData = JSON.parse(this.ScatterPlotResults[11])
+ var mergedStoreEnsembleLoc = [].concat.apply([], this.storeEnsembleLoc)
+ var mergedStoreEnsembleLocFormatted = []
+ for (let i = 0; i < mergedStoreEnsembleLoc.length; i++) {
+ mergedStoreEnsembleLocFormatted.push(parseInt(mergedStoreEnsembleLoc[i].replace(/\D/g,'')))
+ }
+
+ modelId = mergedStoreEnsembleLocFormatted.map((item) => modelId[item])
+ colorsforScatterPlot = mergedStoreEnsembleLocFormatted.map((item) => colorsforScatterPlot[item])
+ parameters = mergedStoreEnsembleLocFormatted.map((item) => parameters[item])
+ MDSData[0] = mergedStoreEnsembleLocFormatted.map((item) => MDSData[0][item])
+ MDSData[1] = mergedStoreEnsembleLocFormatted.map((item) => MDSData[1][item])
+ TSNEData = mergedStoreEnsembleLocFormatted.map((item) => TSNEData[item])
+ UMAPData[0] = mergedStoreEnsembleLocFormatted.map((item) => UMAPData[0][item])
+ UMAPData[1] = mergedStoreEnsembleLocFormatted.map((item) => UMAPData[1][item])
+
EventBus.$emit('sendPointsNumberCM', modelId.length)
var stringParameters = []
@@ -295,6 +311,8 @@ export default {
},
},
mounted() {
+ EventBus.$on('SendStoredEnsemble', data => { this.storeEnsembleLoc = data })
+
EventBus.$on('emittedEventCallingCrossoverMutation', data => {
this.ScatterPlotResults = data})
EventBus.$on('emittedEventCallingCrossoverMutation', this.ScatterPlotView)
diff --git a/frontend/src/components/HyperParameterSpace.vue b/frontend/src/components/HyperParameterSpace.vue
index 0c598de..8659a71 100644
--- a/frontend/src/components/HyperParameterSpace.vue
+++ b/frontend/src/components/HyperParameterSpace.vue
@@ -31,7 +31,7 @@ export default {
name: 'HyperParameterSpace',
data () {
return {
- CrossoverMutateText: 'Unselected points\' crossover & mutation',
+ CrossoverMutateText: 'Crossover and mutate unselected points',
WH: [],
ScatterPlotResults: '',
representationDef: 'mds',
@@ -287,9 +287,9 @@ export default {
pushModelsRemainingTemp.push(allModels[i])
}
}
- EventBus.$emit('RemainingPoints', pushModelsRemainingTemp)
- EventBus.$emit('SendSelectedPointsUpdateIndicator', ClassifierIDsList)
- EventBus.$emit('SendSelectedPointsToServerEvent', ClassifierIDsList)
+ EventBus.$emit('RemainingPoints', pushModelsRemainingTemp)
+ EventBus.$emit('SendSelectedPointsUpdateIndicator', ClassifierIDsList)
+ EventBus.$emit('SendSelectedPointsToServerEvent', ClassifierIDsList)
}
})
},
diff --git a/frontend/src/components/Main.vue b/frontend/src/components/Main.vue
index 49889c2..43d33c5 100755
--- a/frontend/src/components/Main.vue
+++ b/frontend/src/components/Main.vue
@@ -26,7 +26,7 @@
- Majority Voting Results
+ Majority-Voting Results
@@ -118,33 +118,33 @@
- Hyper-parameters' Space
+ Hyper-Parameters' Space
[Sel: {{OverSelLength}} / All: {{OverAllLength}}]
-
-
-
-
-
-
-
-
-
-
- Crossover and Mutation
- [Sel: {{OverSelLengthCM}} / All: {{OverAllLengthCM}}]
-
+
+
+
+ Majority-Voting Ensemble
+ [Sel: {{OverSelLengthCM}} / All: {{OverAllLengthCM}}]
+
+
+
+
+
+
+
+
-
+
- Predictions' Space
+ Hyper-Parameters Predictions
@@ -153,9 +153,18 @@
+
+
+ Majority-Voting Ensemble Predictions
+
+
+
+
+
+
+
+
-
-