From 433991f292c526668390c0bc2de637161ee61240 Mon Sep 17 00:00:00 2001
From: Yassin <aliyassin4@hotmail.com>
Date: Wed, 10 May 2023 01:55:29 +0200
Subject: [PATCH] Refactorings Code and Adding Node Filter
---
netbone/filters.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/netbone/filters.py b/netbone/filters.py
index 01e3c45..c82fcd0 100644
--- a/netbone/filters.py
+++ b/netbone/filters.py
@@ -24,7 +24,8 @@ def threshold_filter(backbone, value, narrate=True, secondary_property='weight',
ascending = backbone.ascending
if threshold_filter in backbone.compatible_filters():
- data = data.sort_values(by=[property_name, secondary_property], ascending=[ascending, secondary_property_ascending])
+ data = data.sort_values(by=[property_name, secondary_property],
+ ascending=[ascending, secondary_property_ascending])
if narrate:
backbone.narrate()
@@ -41,17 +42,17 @@ def threshold_filter(backbone, value, narrate=True, secondary_property='weight',
def fraction_filter(backbone, value, narrate=True, secondary_property='weight', secondary_property_ascending=False,
**kwargs):
data = backbone.to_dataframe()
- column = backbone.property_name
- ascending = backbone.ascending
+ filter_by = [backbone.property_name]
+ ascending = [backbone.ascending]
value = math.ceil(value * len(data))
- if backbone.filter_on == 'Nodes':
- secondary_property = None
- secondary_property_ascending = None
+ if backbone.filter_on == 'Edges':
+ filter_by.append(secondary_property)
+ ascending.append(secondary_property_ascending)
if fraction_filter in backbone.compatible_filters():
- data = data.sort_values(by=[column, secondary_property], ascending=[ascending, secondary_property_ascending])
+ data = data.sort_values(by=filter_by, ascending=ascending)
if narrate:
backbone.narrate()
--
GitLab