diff options
| author | Jarrod Millman <jarrod.millman@gmail.com> | 2021-05-19 14:43:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-19 14:43:33 -0700 |
| commit | d04265658e17ad40fb928677fc220675ef8bf09f (patch) | |
| tree | 2f18f3445e8a3877a9cface916630981fed0a630 | |
| parent | ffa35b86a4865bbfe6dfb5edb23151c63640d2a9 (diff) | |
| download | networkx-d04265658e17ad40fb928677fc220675ef8bf09f.tar.gz | |
Fix Sphinx errors (#4817)
| -rw-r--r-- | networkx/algorithms/approximation/traveling_salesman.py | 3 | ||||
| -rw-r--r-- | networkx/algorithms/graphical.py | 3 | ||||
| -rw-r--r-- | networkx/algorithms/summarization.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/networkx/algorithms/approximation/traveling_salesman.py b/networkx/algorithms/approximation/traveling_salesman.py index 3779588f..86481ccc 100644 --- a/networkx/algorithms/approximation/traveling_salesman.py +++ b/networkx/algorithms/approximation/traveling_salesman.py @@ -206,6 +206,7 @@ def traveling_salesman_problem(G, weight="weight", nodes=None, cycle=True, metho Second, an algorithm (default: `christofides`) is used to approximate the minimal Hamiltonian cycle on this new graph. The available algorithms are: + - christofides - greedy_tsp - simulated_annealing_tsp @@ -468,6 +469,7 @@ def simulated_annealing_tsp( move : "1-1" or "1-0" or function, optional (default="1-1") Indicator of what move to use when finding new trial solutions. Strings indicate two special built-in moves: + - "1-1": 1-1 exchange which transposes the position of two elements of the current solution. The function called is :func:`swap_two_nodes`. @@ -675,6 +677,7 @@ def threshold_accepting_tsp( move : "1-1" or "1-0" or function, optional (default="1-1") Indicator of what move to use when finding new trial solutions. Strings indicate two special built-in moves: + - "1-1": 1-1 exchange which transposes the position of two elements of the current solution. The function called is :func:`swap_two_nodes`. diff --git a/networkx/algorithms/graphical.py b/networkx/algorithms/graphical.py index 842afdb9..15043ed6 100644 --- a/networkx/algorithms/graphical.py +++ b/networkx/algorithms/graphical.py @@ -209,8 +209,7 @@ def is_valid_degree_sequence_erdos_gallai(deg_sequence): Discrete Mathematics, 265, pp. 417-420 (2003). .. [2] I.E. Zverovich and V.E. Zverovich. "Contributions to the theory of graphic sequences", Discrete Mathematics, 105, pp. 292-303 (1992). - - [EG1960]_, [choudum1986]_ + .. [EG1960] Erdős and Gallai, Mat. Lapok 11 264, 1960. """ try: dmax, dmin, dsum, n, num_degs = _basic_graphical_tests(deg_sequence) diff --git a/networkx/algorithms/summarization.py b/networkx/algorithms/summarization.py index 13d7508a..25c024ee 100644 --- a/networkx/algorithms/summarization.py +++ b/networkx/algorithms/summarization.py @@ -472,7 +472,7 @@ def snap_aggregation( -------- SNAP aggregation takes a graph and summarizes it in the context of user-provided node and edge attributes such that a viewer can more easily extract and - analyze the information represented by the graph:: + analyze the information represented by the graph >>> nodes = { ... "A": dict(color="Red"), |