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
6 changes: 2 additions & 4 deletions src/pygraph/pygraph.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,6 @@ def adj_list(self, node: Node | NodeId) -> dict[Node, Edge]:

def spring_solve(
self,
scale_factor: int = 1000,
pos: dict[int, tuple[float, float]] | None = None,
fixed: set[int] | None = None,
k: float | None = None,
Expand All @@ -354,7 +353,6 @@ def spring_solve(
speed up rendering time for complex graphs.

Args:
scale_factor: Scale the position (`0->1`) with this factor (default: `1000`)
*args: [See Here](https://www.rustworkx.org/apiref/rustworkx.digraph_spring_layout.html)
"""

Expand All @@ -365,8 +363,8 @@ def spring_solve(
for node_id in self.node_map.values():
x, y = layout[node_id]
node = self.graph[node_id]
node['x'] = int(x * scale_factor)
node['y'] = int(y * scale_factor)
node['x'] = int(x)
node['y'] = int(y)

# Dunder Overrides

Expand Down
5 changes: 4 additions & 1 deletion src/pygraph/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ def shortest_paths(nx: Network, fr: Node | NodeId, to: Node | NodeId, *, directe
shortest = rx.digraph_all_shortest_paths(
nx.graph, fr, to, as_undirected=not directed
)
return [[nx[edge] for edge in itertools.pairwise(path)] for path in shortest]
try:
return [[nx.graph.get_edge_data(*edge) for edge in itertools.pairwise(path)] for path in shortest]
except rx.NoEdgeBetweenNodes:
return []


def style_edges(edges: Iterable[Edge], **options: Unpack[EdgeOptions]) -> list[Edge]:
Expand Down