From 46e9cd4c97baa54759bf32133f3fa91ac573f55a Mon Sep 17 00:00:00 2001 From: Miha Jenko Date: Thu, 5 Oct 2023 14:08:37 +0200 Subject: [PATCH 1/4] Bugfix: use list instead of unsupported set --- outrank/core_ranking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/outrank/core_ranking.py b/outrank/core_ranking.py index 8f1d552..b0a9af6 100644 --- a/outrank/core_ranking.py +++ b/outrank/core_ranking.py @@ -488,7 +488,7 @@ def compute_batch_ranking( focus_set.add(args.label_column) focus_set = {x for x in focus_set if x in input_dataframe.columns} - input_dataframe = input_dataframe[focus_set] + input_dataframe = input_dataframe[list(focus_set)] if args.transformers != 'none': pbar.set_description('Adding transformations') From 1287881abf87b5357a3cb32d9d0d046c6c475163 Mon Sep 17 00:00:00 2001 From: Miha Jenko Date: Thu, 5 Oct 2023 14:10:40 +0200 Subject: [PATCH 2/4] Add `label` after new set overwrites `focus_set` --- outrank/core_ranking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/outrank/core_ranking.py b/outrank/core_ranking.py index b0a9af6..defaf06 100644 --- a/outrank/core_ranking.py +++ b/outrank/core_ranking.py @@ -486,8 +486,8 @@ def compute_batch_ranking( else: focus_set = set(args.feature_set_focus.split(',')) - focus_set.add(args.label_column) focus_set = {x for x in focus_set if x in input_dataframe.columns} + focus_set.add(args.label_column) input_dataframe = input_dataframe[list(focus_set)] if args.transformers != 'none': From 89660658c90fe4c8abbffd17ec0c7dda15ac6056 Mon Sep 17 00:00:00 2001 From: Miha Jenko Date: Thu, 5 Oct 2023 14:57:21 +0200 Subject: [PATCH 3/4] Bump minor version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0e3a137..c54fa2a 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ def _read_description(): packages = [x for x in setuptools.find_packages() if x != 'test'] setuptools.setup( name='outrank', - version='0.94', + version='0.94.1', description='OutRank: Feature ranking for massive sparse data sets.', long_description=_read_description(), long_description_content_type='text/markdown', From 82f178fb6ec3d1998eab957ce7c4ababc4ed82f7 Mon Sep 17 00:00:00 2001 From: Miha Jenko Date: Thu, 5 Oct 2023 15:01:31 +0200 Subject: [PATCH 4/4] Revert "Add `label` after new set overwrites `focus_set`" This reverts commit 1287881abf87b5357a3cb32d9d0d046c6c475163. --- outrank/core_ranking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/outrank/core_ranking.py b/outrank/core_ranking.py index defaf06..b0a9af6 100644 --- a/outrank/core_ranking.py +++ b/outrank/core_ranking.py @@ -486,8 +486,8 @@ def compute_batch_ranking( else: focus_set = set(args.feature_set_focus.split(',')) - focus_set = {x for x in focus_set if x in input_dataframe.columns} focus_set.add(args.label_column) + focus_set = {x for x in focus_set if x in input_dataframe.columns} input_dataframe = input_dataframe[list(focus_set)] if args.transformers != 'none':