From a04a75a28f483c858ca6234998655a8a8773c7c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Montan=CC=83ana?= Date: Tue, 26 Jan 2021 16:46:30 +0100 Subject: [PATCH] Update adaBoost model Update pbs template Experiment results from 2021-01-20 --- experimentation/Database.py | 5 +++-- experimentation/Models.py | 2 +- scripts/experiment.pbs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/experimentation/Database.py b/experimentation/Database.py index 8e2ada5..505b53b 100644 --- a/experimentation/Database.py +++ b/experimentation/Database.py @@ -49,13 +49,14 @@ class MySQL: if classifier == "any": command = ( f"select * from results r inner join reference e on " - f"r.dataset=e.dataset where r.dataset='{dataset}' " + f"r.dataset=e.dataset where r.dataset='{dataset}' and " + f"date>='2021-01-20'" ) else: command = ( f"select * from results r inner join reference e on " f"r.dataset=e.dataset where r.dataset='{dataset}' and " - f"classifier='{classifier}'" + f"classifier='{classifier}' and date>='2021-01-20'" ) command += ( " order by r.dataset, accuracy desc, classifier desc, " diff --git a/experimentation/Models.py b/experimentation/Models.py index 1024bc9..274db4e 100644 --- a/experimentation/Models.py +++ b/experimentation/Models.py @@ -157,7 +157,7 @@ class ModelAdaBoost(Ensemble): self._model_name = f"Adaboost_{self._base_model.__class__.__name__}" def get_parameters(self) -> List[dict]: - self._parameters = {"n_estimators": [50], "algorithm": ["SAMME"]} + self._parameters = {"n_estimators": [50, 100], "algorithm": ["SAMME"]} return super().get_parameters() diff --git a/scripts/experiment.pbs b/scripts/experiment.pbs index c8eefcc..675a567 100644 --- a/scripts/experiment.pbs +++ b/scripts/experiment.pbs @@ -17,4 +17,4 @@ ### Ejecutable con sus parametros cd -python experiment.py -H galgo -e -m -d -S tanveer -k -n 1 -t 5 \ No newline at end of file +python experiment.py -H galgo -e -m -d -S tanveer -k -n 1 -t 12 \ No newline at end of file