From 8397650dd4760b220b658fcfc69e5b3dff09149c Mon Sep 17 00:00:00 2001 From: Angelos Chatzimparmpas Date: Mon, 25 Jan 2021 15:32:23 +0100 Subject: [PATCH] new --- __pycache__/run.cpython-38.pyc | Bin 38598 -> 38630 bytes frontend/src/components/DataSpace.vue | 8 ++++---- .../src/components/FeatureSpaceDetail.vue | 2 +- .../src/components/FeatureSpaceOverview.vue | 2 +- frontend/src/components/Main.vue | 6 +++--- run.py | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/__pycache__/run.cpython-38.pyc b/__pycache__/run.cpython-38.pyc index 91acbed9098838b2c9a636ad20e3210fc3aff819..d246dc1265f7c9d3951467613b8144873eeb6c20 100644 GIT binary patch delta 5523 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 P7H4nRKw1UAan*kSI_FTv delta 5502 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 diff --git a/frontend/src/components/DataSpace.vue b/frontend/src/components/DataSpace.vue index b8f73d4..07914b3 100644 --- a/frontend/src/components/DataSpace.vue +++ b/frontend/src/components/DataSpace.vue @@ -3,7 +3,7 @@
-
+
@@ -32,7 +32,7 @@ export default { var tooltip = d3.select("#tooltip") var width = 2525 - var height = 225 + var height = 250 var rectWidth = 20 var rectHeight = 10 @@ -226,7 +226,7 @@ export default { svg.selectAll("*").remove(); var width = 2525 - var height = 225 + var height = 250 var xScaleOp = d3.scale.linear() .domain([0, width-50]) @@ -388,7 +388,7 @@ export default { svg.selectAll("*").remove(); var width = 2525 - var height = 225 + var height = 250 var svgLines = d3.select('#TextLabels').append('svg'); svgLines.attr('width', width); diff --git a/frontend/src/components/FeatureSpaceDetail.vue b/frontend/src/components/FeatureSpaceDetail.vue index 9b39243..1a8fdbe 100644 --- a/frontend/src/components/FeatureSpaceDetail.vue +++ b/frontend/src/components/FeatureSpaceDetail.vue @@ -833,7 +833,7 @@ export default { var MIVar = JSON.parse(this.dataFS[28+this.quadrantNumber]) MIVar = MIVar.concat(this.MIRemaining) //var colorCateg = d3.scaleOrdinal(d3.schemeDark2) - var colorCateg = d3.scaleOrdinal().domain([0, 1, 2, 4]).range(['#808000','#7570b3','#1b9e77','#d95f02']) + var colorCateg = d3.scaleOrdinal().domain([0, 1, 2, 4]).range(['#808000','#7570b3','#d95f02','#1b9e77']) var corrTargetFormatted = [] for (let i = 0; i < Object.keys(corrTarget).length; i++) { diff --git a/frontend/src/components/FeatureSpaceOverview.vue b/frontend/src/components/FeatureSpaceOverview.vue index bd73b66..3127837 100644 --- a/frontend/src/components/FeatureSpaceOverview.vue +++ b/frontend/src/components/FeatureSpaceOverview.vue @@ -1186,7 +1186,7 @@ export default { var legendRectSize = 14; var legendSpacing = 3; var labelsData = JSON.parse(this.overallData[1]) - var color = d3v5.scaleOrdinal().domain(labelsData).range(['#808000','#7570b3','#1b9e77','#d95f02']) + var color = d3v5.scaleOrdinal().domain(labelsData).range(['#808000','#7570b3','#d95f02','#1b9e77']) var svgLegend = d3v5.select('#legendTarget').append('svg') .attr('width', 130) diff --git a/frontend/src/components/Main.vue b/frontend/src/components/Main.vue index ca26e97..8573750 100755 --- a/frontend/src/components/Main.vue +++ b/frontend/src/components/Main.vue @@ -8,7 +8,7 @@ - + @@ -149,7 +149,7 @@ export default Vue.extend({ DataResults: '', keyNow: 1, instancesImportance: '', - RetrieveValueFile: 'IrisC', // this is for the default data set + RetrieveValueFile: 'HeartC', // this is for the default data set SelectedFeaturesPerClassifier: '', FinalResults: 0, selectedAlgorithm: '', @@ -862,7 +862,7 @@ body { top: 0px; bottom: 0px; margin-top: -4px !important; - //overflow: hidden !important; # remove scrolling + overflow: hidden !important; // remove scrolling } .modal-backdrop { diff --git a/run.py b/run.py index 5df6387..70e205c 100644 --- a/run.py +++ b/run.py @@ -502,11 +502,11 @@ def dataSetSelection(): def create_global_function(): global estimator - def estimator(n_estimators, eta, max_depth): + def estimator(n_estimators, eta, max_depth, subsample, colsample_bytree): # initialize model n_estimators = int(n_estimators) max_depth = int(max_depth) - model = XGBClassifier(n_estimators=n_estimators, eta=eta, max_depth=max_depth, n_jobs=-1, random_state=RANDOM_SEED, silent=True, verbosity = 0, use_label_encoder=False) + model = XGBClassifier(n_estimators=n_estimators, eta=eta, max_depth=max_depth, subsample=subsample, colsample_bytree=colsample_bytree, n_jobs=-1, random_state=RANDOM_SEED, silent=True, verbosity = 0, use_label_encoder=False) # set in cross-validation result = cross_validate(model, XData, yData, cv=crossValidation, scoring='accuracy') # result is mean of test_score @@ -568,11 +568,11 @@ def executeModel(exeCall, flagEx, nodeTransfName): # Bayesian Optimization CHANGE INIT_POINTS! if (keyFirstTime): create_global_function() - params = {"n_estimators": (5, 200), "eta": (0.05, 0.3), "max_depth": (6,12)} + params = {"n_estimators": (5, 200), "eta": (0.05, 0.3), "max_depth": (6,12), "subsample": (0.8,1), "colsample_bytree": (0.8,1)} bayesopt = BayesianOptimization(estimator, params, random_state=RANDOM_SEED) - bayesopt.maximize(init_points=10, n_iter=5, acq='ucb') # 35 and 15 + bayesopt.maximize(init_points=35, n_iter=15, acq='ucb') # 35 and 15 bestParams = bayesopt.max['params'] - estimator = XGBClassifier(n_estimators=int(bestParams.get('n_estimators')), eta=bestParams.get('eta'), max_depth=int(bestParams.get('max_depth')), probability=True, random_state=RANDOM_SEED, silent=True, verbosity = 0, use_label_encoder=False) + estimator = XGBClassifier(n_estimators=int(bestParams.get('n_estimators')), eta=bestParams.get('eta'), max_depth=int(bestParams.get('max_depth')), subsample=bestParams.get('subsample'), colsample_bytree=bestParams.get('colsample_bytree'), probability=True, random_state=RANDOM_SEED, silent=True, verbosity = 0, use_label_encoder=False) columnsNewGen = OrignList if (len(exeCall) != 0):