A community-maintained Python framework for creating mathematical animations.
Follow-up to graph layout cleanup: improvements for tests and typing (#3728)
Benjamin Hackl0f268e6f9ca3
diff --git a/manim/mobject/graph.py b/manim/mobject/graph.pyindex dda52de77..9723e704c 100644--- a/manim/mobject/graph.py+++ b/manim/mobject/graph.py@@ -9,11 +9,17 @@ __all__ = [import itertools as itfrom copy import copy-from typing import Any, Hashable, Iterable, Literal, Protocol, Union, cast+from typing import TYPE_CHECKING, Any, Hashable, Iterable, Literal, Protocol, castimport networkx as nximport numpy as np-from typing_extensions import TypeAlias++if TYPE_CHECKING:+ from typing_extensions import TypeAlias++ from manim.typing import Point3D++ NxGraph: TypeAlias = nx.classes.graph.Graph | nx.classes.digraph.DiGraphfrom manim.animation.composition import AnimationGroupfrom manim.animation.creation import Create, Uncreate@@ -24,11 +30,8 @@ from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGLfrom manim.mobject.opengl.opengl_mobject import OpenGLMobjectfrom manim.mobject.text.tex_mobject import MathTexfrom manim.mobject.types.vectorized_mobject import VMobject-from manim.typing import Point3Dfrom manim.utils.color import BLACK-NxGraph: TypeAlias = Union[nx.classes.graph.Graph, nx.classes.digraph.DiGraph]-class LayoutFunction(Protocol):"""A protocol for automatic layout functions that compute a layout for a graph to be used in :meth:`~.Graph.change_layout`.@@ -53,8 +56,8 @@ class LayoutFunction(Protocol):graph: nx.Graph,scale: float | tuple[float, float, float] = 2,n: int | None = None,- *args: tuple[Any, ...],- **kwargs: dict[str, Any],+ *args: Any,+ **kwargs: Any,):nodes = sorted(list(graph))height = len(nodes) // n@@ -256,8 +259,8 @@ class LayoutFunction(Protocol):self,graph: NxGraph,scale: float | tuple[float, float, float] = 2,- *args: tuple[Any, ...],- **kwargs: dict[str, Any],+ *args: Any,+ **kwargs: Any,) -> dict[Hashable, Point3D]:"""Given a graph and a scale, return a dictionary of coordinates.@@ -280,7 +283,7 @@ def _partite_layout(nx_graph: NxGraph,scale: float = 2,partitions: list[list[Hashable]] | None = None,- **kwargs: dict[str, Any],+ **kwargs: Any,) -> dict[Hashable, Point3D]:if partitions is None or len(partitions) == 0:raise ValueError(@@ -302,7 +305,7 @@ def _partite_layout(return nx.layout.multipartite_layout(nx_graph, scale=scale, **kwargs)-def _random_layout(nx_graph: NxGraph, scale: float = 2, **kwargs: dict[str, Any]):+def _random_layout(nx_graph: NxGraph, scale: float = 2, **kwargs: Any):# the random layout places coordinates in [0, 1)# we need to rescale manually afterwards...auto_layout = nx.layout.random_layout(nx_graph, **kwargs)diff --git a/tests/module/mobject/test_graph.py b/tests/module/mobject/test_graph.pyindex d5d0efe08..b23ccff62 100644--- a/tests/module/mobject/test_graph.py+++ b/tests/module/mobject/test_graph.py@@ -116,9 +116,7 @@ def test_custom_graph_layout_dict():def test_graph_layouts():- for layout in (- layout for layout in _layouts if layout != "tree" and layout != "partite"- ):+ for layout in (layout for layout in _layouts if layout not in ["tree", "partite"]):G = Graph([1, 2, 3], [(1, 2), (2, 3)], layout=layout)assert str(G) == "Undirected graph on 3 vertices and 2 edges"@@ -164,9 +162,7 @@ def test_custom_graph_layout_function_with_kwargs():def test_graph_change_layout():- for layout in (- layout for layout in _layouts if layout != "tree" and layout != "partite"- ):+ for layout in (layout for layout in _layouts if layout not in ["tree", "partite"]):G = Graph([1, 2, 3], [(1, 2), (2, 3)])G.change_layout(layout=layout)assert str(G) == "Undirected graph on 3 vertices and 2 edges"