diff --git a/__pycache__/run.cpython-37.pyc b/__pycache__/run.cpython-37.pyc
index 976f33c83..1213b18f3 100644
Binary files a/__pycache__/run.cpython-37.pyc and b/__pycache__/run.cpython-37.pyc differ
diff --git a/frontend/src/components/Main.vue b/frontend/src/components/Main.vue
index 1d97b352b..f90779836 100755
--- a/frontend/src/components/Main.vue
+++ b/frontend/src/components/Main.vue
@@ -407,6 +407,7 @@ export default Vue.extend({
this.OverSelLength = 0
EventBus.$emit('resetViews')
} else {
+ console.log(this.keyNow)
this.OverSelLength = this.ClassifierIDsList.length
const path = `http://127.0.0.1:5000/data/ServerRequestSelPoin`
const postData = {
@@ -438,9 +439,8 @@ export default Vue.extend({
},
RemoveFromStackModels () {
const path = `http://127.0.0.1:5000/data/ServerRemoveFromStack`
- console.log(this.ClassifierIDsList)
const postData = {
- ClassifiersList: this.ClassifierIDsList
+ ClassifiersList: this.ClassifierIDsList,
}
const axiosConfig = {
headers: {
@@ -454,8 +454,8 @@ export default Vue.extend({
.then(response => {
console.log('Sent the selected points to the server (scatterplot)!')
EventBus.$emit('updateFlagForFinalResults', 0)
- this.getFinalResults()
this.updatePredictionsSpace()
+ this.getFinalResults()
})
.catch(error => {
console.log(error)
diff --git a/frontend/src/components/Provenance.vue b/frontend/src/components/Provenance.vue
index 80ad5f482..80ae46394 100644
--- a/frontend/src/components/Provenance.vue
+++ b/frontend/src/components/Provenance.vue
@@ -3,7 +3,7 @@
@@ -63,9 +63,9 @@ export default {
} else {
$('.dynamic_buttons').remove();
this.platform.clear();
+ var svg = d3.select("#performanceCapture");
+ svg.selectAll("*").remove();
}
- var svg = d3.select("#performanceCapture");
- svg.selectAll("*").remove();
},
clean(obj) {
var propNames = Object.getOwnPropertyNames(obj);
@@ -78,7 +78,7 @@ export default {
},
provenance () {
var canvas = document.getElementById("main-canvas");
- var width = this.WH[0]*3.5 // interactive visualization
+ var width = this.WH[0]*6.52 // interactive visualization
var height = this.WH[1]*0.375 // interactive visualization
var flagKNN = 0
@@ -336,9 +336,6 @@ export default {
}
const stringStep = "Stacking Ensemble "
var myButton = ' '
- var svgs = ''
- this.firstInside = this.counter
- $("#performanceCapture").append(svgs);
$("#dynamic-buttons").append(myButton);
EventBus.$emit('requestProven',this.counter-1)
@@ -366,14 +363,23 @@ export default {
);
},
RadialPerf () {
+ this.firstInside++
+ var svgs = ''
+ $("#performanceCapture").append(svgs);
+
var width = 160;
var arcSize = (6 * width / 100);
var innerRadius = arcSize * 3;
- this.Stack_scoresMean.push((JSON.parse(this.FinalResultsProv[8])*100).toFixed(0))
- this.Stack_scoresMean2.push((JSON.parse(this.FinalResultsProv[10])*100).toFixed(0))
- this.Stack_scoresMean3.push((JSON.parse(this.FinalResultsProv[12])*100).toFixed(0))
- this.Stack_scoresMean4.push((JSON.parse(this.FinalResultsProv[14])*100).toFixed(0))
+ this.Stack_scoresMean = []
+ this.Stack_scoresMean2 = []
+ this.Stack_scoresMean3 = []
+ this.Stack_scoresMean4 = []
+
+ this.Stack_scoresMean.push((JSON.parse(this.FinalResultsProv[0])*100).toFixed(0))
+ this.Stack_scoresMean2.push((JSON.parse(this.FinalResultsProv[2])*100).toFixed(0))
+ this.Stack_scoresMean3.push((JSON.parse(this.FinalResultsProv[4])*100).toFixed(0))
+ this.Stack_scoresMean4.push((JSON.parse(this.FinalResultsProv[6])*100).toFixed(0))
const colorsSingle = ['#fc9272','#fb6a4a','#ef3b2c','#cb181d','#a50f15','#67000d']
@@ -388,8 +394,8 @@ export default {
{value: this.Stack_scoresMean3, label: "Recall", color: scaleColor(this.Stack_scoresMean3)},
{value: this.Stack_scoresMean4, label: "F1 Score", color: scaleColor(this.Stack_scoresMean4)}
];
-
- var svg = d3.select('#svg'+this.firstInside).attr('width', width).attr('height', width).style('margin-right', '20px');
+
+ var svg = d3.select('#svg'+this.firstInside).attr('width', width).attr('height', width).style('margin-right', '25px');
var arcs = data.map(function (obj, i) {
return d3.svg.arc().innerRadius(i * arcSize + innerRadius).outerRadius((i + 1) * arcSize - (width / 100) + innerRadius);
diff --git a/run.py b/run.py
index 0484741bf..77db7db26 100644
--- a/run.py
+++ b/run.py
@@ -1688,6 +1688,7 @@ def RetrieveSelClassifiersID():
global keySpec
keySpec = ClassifierIDCleaned['keyNow']
+ print(keySpec)
EnsembleModel(ClassifierIDsList, 1)
return 'Everything Okay'
@@ -2608,6 +2609,7 @@ def EnsembleModel(Models, keyRetrieved):
meta_classifier=lr,
random_state=RANDOM_SEED,
n_jobs = -1)
+ print('mpike')
if (keySpec == 0):
sclfStack = sclf
elif (keyRetrieved == 2):