Skip to content

Commit

Permalink
little changes regarding comments
Browse files Browse the repository at this point in the history
  • Loading branch information
zuliani99 committed Jul 30, 2021
1 parent 72f8246 commit 438ab13
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
2 changes: 2 additions & 0 deletions app/utils/result_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ def populate_row(df_name, leader, res_as, res_t, res_h, res_mj, res_ag, s):

return new_row_1, new_row_2, new_row_pipelines, new_row_options_end


# Function for adding the 'date' column in each dataframe
def add_date(dfs, date):
for df in dfs:
df.insert(0, 'date', date)
Expand Down
10 changes: 5 additions & 5 deletions app/webapp/frontend.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Definition of the sidebar
sidebar = html.Div(
[
html.H2("AutoML BenchMark", className="display-4"),
html.H2("AutoML Benchmark", className="display-4"),
html.Hr(),
html.P(
"Choose an Options", className="lead"
Expand All @@ -29,10 +29,10 @@
[
dbc.NavLink("Home", href="/", active="exact"),
dbc.NavLink("OpenML Benchmark", href="/openml", active="exact"),
dbc.NavLink("Kaggle BenchMark", href="/kaggle", active="exact"),
dbc.NavLink("Test BenchMark", href="/test", active="exact"),
dbc.NavLink("Past Results OpenML", href="/results-openml", active="exact"),
dbc.NavLink("Past Results Kaggle", href="/results-kaggle", active="exact"),
dbc.NavLink("Kaggle Benchmark", href="/kaggle", active="exact"),
dbc.NavLink("Test Benchmark", href="/test", active="exact"),
dbc.NavLink("Past OpenML Benchmark", href="/results-openml", active="exact"),
dbc.NavLink("Past Kaggle Benchmark", href="/results-kaggle", active="exact"),
],
vertical=True,
pills=True,
Expand Down
6 changes: 4 additions & 2 deletions app/webapp/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def get_dfs_from_timestamp(timestamp, type_bench): # Return a list of lists of d
df.append(pd.read_csv('./results/'+ type_bench +'/'+ts+'/options_start.csv'))
dfs.append(df)

return dfs # da 0 a 8
return dfs


# Function for managing the display of tables and graphs of the benchmarks
Expand Down Expand Up @@ -166,11 +166,13 @@ def get_dfs_to_compare(dfs_class, dfs_reg, options_start, type, all_list):
else: reg = [None]
time_limit = (pd.read_csv('./results/'+ type +'/'+past_bench+'/options_start.csv')).iloc[0].to_list()

# Check if the benchmark is comparable to the one selected initially

#if collections.Counter(cls) == collections.Counter(dfs_class) and collections.Counter(reg) == collections.Counter(dfs_reg) and collections.Counter(pip) != collections.Counter(options_end):

# Ora ho messo che posso comparare dei benchmark aventi gli stessi dataframe ma con start time limit diiferenti, conmfronti effettuati tutti sul primo benchmark scelto
# Devo decidere se implementare il confronto tra tutti quelli selezionati

# Check if the benchmark is comparable to the one selected initially
if collections.Counter(cls) == collections.Counter(dfs_class) and collections.Counter(reg) == collections.Counter(dfs_reg) and collections.Counter(time_limit) != collections.Counter(options_start):
dfs_comapre.append({'label': past_bench, 'value': past_bench})
return dfs_comapre
Expand Down
1 change: 0 additions & 1 deletion makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
install:
pip3 install -Ur requirements.txt
pip3 install -q -U git+https://github.com/mljar/mljar-supervised.git@master
pip3 uninstall bokeh -y

remove:
pip3 uninstall -r requirements.txt
Expand Down

0 comments on commit 438ab13

Please sign in to comment.