Skip to content

Add #737 #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PGijsbers merged 9 commits into from
Sep 2, 2019
Merged

Add #737 #772

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fcc2049
changes in list_evaluations_setups
sahithyaravi Aug 21, 2019
1921ed9
fixed some flake8 erros
sahithyaravi Aug 21, 2019
39f1627
PEP8 errors
sahithyaravi Aug 21, 2019
55be331
shorten line
sahithyaravi Aug 21, 2019
00d59f2
change equals check to isin
sahithyaravi Aug 21, 2019
5ea8904
review comments
sahithyaravi Aug 28, 2019
e317894
pep8 and mypy errors
sahithyaravi Aug 28, 2019
f825d59
change comment
sahithyaravi Aug 29, 2019
454f297
fix example fetch_evaluations
sahithyaravi Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PEP8 errors
  • Loading branch information
@sahithyaravi
sahithyaravi committed Aug 21, 2019
commit 39f1627508b656f4570cd8d9324da5932fd2b192
6 changes: 4 additions & 2 deletions openml/evaluations/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,9 +329,11 @@ def list_evaluations_setups(

if parameters_in_separate_columns:
if flow and len(flow) == 1:
df = pd.concat([df.drop('parameters', axis=1), df['parameters'].apply(pd.Series)], axis=1)
df = pd.concat([df.drop('parameters', axis=1), df['parameters'].apply(pd.Series)],
axis=1)
else:
raise ValueError("Can set parameters_in_separate_columns to true only for single flow_id")
raise ValueError("Can set parameters_in_separate_columns to true only "
Comment thread
PGijsbers marked this conversation as resolved.
Outdated
"for single flow_id")

if output_format == 'dataframe':
return df
Expand Down
15 changes: 7 additions & 8 deletions tests/test_evaluations/test_evaluation_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,14 @@ def test_list_evaluations_setups_filter_flow(self):
size = 100
evals_setups = self._check_list_evaluation_setups(size, flow=flow_id)
# check if parameters in separate columns works
evals_setups_separate_cols = openml.evaluations.list_evaluations_setups("predictive_accuracy",
flow=flow_id, size=size,
sort_order='desc',
output_format='dataframe',
parameters_in_separate_columns=True
)
columns = (list(evals_setups_separate_cols.columns))
evals_setups_cols = openml.evaluations.list_evaluations_setups("predictive_accuracy",
flow=flow_id, size=size,
sort_order='desc',
output_format='dataframe',
parameters_in_separate_columns=True
)
columns = (list(evals_setups_cols.columns))
keys = (list(evals_setups['parameters'].values[0].keys()))
# check if all keys in parameter_dict of evals_setups are present in evals_setups_separate_cols
self.assertTrue(all(elem in columns for elem in keys))

def test_list_evaluations_setups_filter_task(self):
Expand Down