Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 20 additions & 10 deletions grand/backends/_dataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,17 @@ def all_nodes_as_iterable(self, include_metadata: bool = False):
]

else:
nodes = pd.unique(
pd.concat(
[
self._edge_df[self._edge_df_source_column],
self._edge_df[self._edge_df_target_column],
],
ignore_index=True,
)
)
return [
(node_id, {}) if include_metadata else node_id
for node_id in self._edge_df[self._edge_df_source_column]
] + [
(node_id, {}) if include_metadata else node_id
for node_id in self._edge_df[self._edge_df_target_column]
(node_id, {}) if include_metadata else node_id for node_id in nodes
]

def has_node(self, u: Hashable) -> bool:
Expand All @@ -167,8 +172,8 @@ def has_node(self, u: Hashable) -> bool:
if self._node_df is not None:
return u in self._node_df.index

return u in (self._edge_df[self._edge_df_source_column]) or u in (
self._edge_df[self._edge_df_target_column]
return u in self._edge_df[self._edge_df_source_column].values or u in (
self._edge_df[self._edge_df_target_column].values
)

def add_edge(self, u: Hashable, v: Hashable, metadata: dict):
Expand Down Expand Up @@ -469,10 +474,15 @@ def get_node_count(self) -> int:
"""
if self._node_df is not None:
return len(self._node_df)
# Return number of unique sources intersected with number of unique targets
return len(
set(self._edge_df[self._edge_df_source_column]).intersection(
set(self._edge_df[self._edge_df_target_column])
pd.unique(
pd.concat(
[
self._edge_df[self._edge_df_source_column],
self._edge_df[self._edge_df_target_column],
],
ignore_index=True,
)
)
)

Expand Down
24 changes: 24 additions & 0 deletions grand/backends/test_backends.py
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,30 @@ def test_can_create_from_int_dataframes(self):
assert b.get_edge_count() == 5
assert b.get_node_count() == 5

def test_edge_only_nodes_are_unique_members_and_counted_from_union(self):
edges = pd.DataFrame(
{
"source": ["A", "B", "A"],
"target": ["B", "C", "B"],
}
)
backend = DataFrameBackend(
edge_df=edges,
edge_df_source_column="source",
edge_df_target_column="target",
)

assert backend.all_nodes_as_iterable() == ["A", "B", "C"]
assert backend.all_nodes_as_iterable(include_metadata=True) == [
("A", {}),
("B", {}),
("C", {}),
]
assert backend.has_node("A")
assert backend.has_node("C")
assert not backend.has_node("missing")
assert backend.get_node_count() == 3


def test_networkx_can_ingest_edgelist_dataframe():
backend = NetworkXBackend(directed=True)
Expand Down
Loading