Add stree default to analysis

add experiment to report_mysql
fix crosval experiment to get the best "gridsearch" parameters
This commit is contained in:
2021-03-26 00:06:48 +01:00
parent 66bceff179
commit 7f75115fa9
4 changed files with 46 additions and 22 deletions

View File

@@ -8,6 +8,7 @@ from experimentation.Database import MySQL
report_csv = "report.csv"
models_tree = [
"stree",
"stree_default",
"wodt",
"j48svm",
"oc1",
@@ -18,7 +19,7 @@ models_ensemble = ["odte", "adaBoost", "bagging", "TBRaF", "TBRoF", "TBRRoF"]
description = ["samp", "var", "cls"]
complexity = ["nodes", "leaves", "depth"]
title = "Best model results"
lengths = (30, 4, 3, 3, 3, 3, 3, 12, 12, 12, 12, 12, 12)
lengths = [30, 4, 3, 3, 3, 3, 3, 12, 12, 12, 12, 12, 12, 12]
def parse_arguments() -> Tuple[str, str, str, bool, bool]:
@@ -46,8 +47,15 @@ def parse_arguments() -> Tuple[str, str, str, bool, bool]:
required=False,
default=False,
)
ap.add_argument(
"-o",
"--compare",
type=bool,
required=False,
default=False,
)
args = ap.parse_args()
return (args.experiment, args.model, args.csv_output)
return (args.experiment, args.model, args.csv_output, args.compare)
def report_header_content(title, experiment, model_type):
@@ -102,7 +110,7 @@ def report_footer(agg):
)
(experiment, model_type, csv_output) = parse_arguments()
(experiment, model_type, csv_output, compare) = parse_arguments()
dbh = MySQL()
database = dbh.get_connection()
dt = Datasets(False, False, "tanveer")
@@ -115,6 +123,10 @@ fields = (
"Lea",
"Dep",
)
if not compare:
# remove stree_default from fields list and lengths
models_tree.pop(1)
lengths.pop(7)
models = models_tree if model_type == "tree" else models_ensemble
for item in models:
fields += (f"{item}",)