summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1821 from SanketDG/testadderror-message-eccentricityDan Schult2015-10-311-2/+5
|\ | | | | add test for error message in eccentricity function
| * add test for error message in eccentricity functionSanketDG2015-10-301-2/+5
| |
* | Clarifies error message in eccentricityjfinkels2015-10-301-2/+7
|/ | | | Changes the error message when an infinite path length is encountered so that it is different based on whether the graph is directed or not.
* Merge pull request #1817 from networkx/RTD-custom-sphinxDan Schult2015-10-291-1/+1
|\ | | | | Use sphinx stable branch via github on ReadTheDocs
| * Use sphinx stable branch via github on ReadTheDocsDan Schult2015-10-291-1/+1
|/ | | | The stable branch of sphinx has the one-line fix for autosummary. So even though the release on pipy doesn't have it, we can get it from github.
* Merge pull request #1814 from jfinkels/format-in-nbunchDan Schult2015-10-281-0/+13
|\ | | | | Adds unit test for new use of string.format().
| * Adds unit test for new use of string.format().Jeffrey Finkelstein2015-10-281-0/+13
|/
* Merge pull request #1813 from mazieres/patch-1Dan Schult2015-10-271-1/+1
|\ | | | | Use format() instead of modulus for node formatting in error message to treat tuples correctly.
| * Fix, now raise NetworkXError instead of TypeErrorAntoine Mazières2015-10-271-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of : ``` 'dict' objects are unhashableTraceback (most recent call last): File "<builtin>/app_main.py", line 75, in run_toplevel File "mk_graph_file.py", line 34, in <module> if d['weight'] > 3]) File "/usr/local/lib/pypy2.7/dist-packages/networkx/classes/graph.py", line 1488, in subgraph for n in bunch: File "/usr/local/lib/pypy2.7/dist-packages/networkx/classes/graph.py", line 1815, in bunch_iter "Node %s in the sequence nbunch is not a valid node."%n) TypeError: not all arguments converted during string formatting ``` You get: ``` 'dict' objects are unhashableTraceback (most recent call last): File "<builtin>/app_main.py", line 75, in run_toplevel File "mk_graph_file.py", line 34, in <module> if d['weight'] > 3]) File "/usr/local/lib/pypy2.7/dist-packages/networkx/classes/graph.py", line 1488, in subgraph for n in bunch: File "/usr/local/lib/pypy2.7/dist-packages/networkx/classes/graph.py", line 1815, in bunch_iter "Node {} in the sequence nbunch is not a valid node.".format(n)) NetworkXError: Node ('java', 'performance', {'weight': 5}) in the sequence nbunch is not a valid node. ```
* Merge pull request #1805 from wuhaochen/reciprocityDan Schult2015-10-212-0/+102
|\ | | | | Implement reciprocity for directed graphs.
| * fix typo, add definition and silent the error for isolated nodes.Haochen Wu2015-10-181-9/+32
| |
| * Merge branch 'master' into reciprocityHaochen Wu2015-10-181-1/+1
| |\ | |/ |/|
* | Merge pull request #1806 from wuhaochen/patch-numpy-compatiblechebee7i2015-10-181-1/+1
|\ \ | | | | | | fix compatible issue with new numpy
| * | fix type issueHaochen Wu2015-10-171-1/+1
|/ /
| * remove unused importHaochen Wu2015-10-171-3/+0
| |
| * cast number typesHaochen Wu2015-10-171-2/+2
| |
| * Implement reciprocity for directed graph.Haochen Wu2015-10-172-0/+82
|/
* Merge pull request #1795 from dschult/fix-sphinx-errorsDan Schult2015-10-0439-139/+163
|\ | | | | Fix some sphinx formatting errors
| * Two more doc formating changes.Dan Schult2015-10-042-17/+2
| |
| * Fix some sphinx formatting errorsDan Schult2015-10-0438-122/+161
| | | | | | | | | | | | | | | | | | make all doc_strings raw format r''' ''' correct underline lengths for headings fix latex issue in harmonic_centrality replace :ticket:, :url:, :doi:, :arxiv: with links to webpages fix spacing with commas before colons so sphinx can parse well add "methods" heading in graph class rst files
* | Merge pull request #1794 from dschult/fix-examplesDan Schult2015-10-0410-20/+20
|\ \ | |/ |/| Update examples for iterator edges and nodes methods
| * Update examples for iterator edges and nodes methodsDan Schult2015-10-0410-20/+20
|/ | | | | This will help with readthedocs make_gallery #1667 These are solely due to the switch to our 2.0 API
* Merge pull request #1767 from dschult/fix-flow-docsDan Schult2015-10-031-9/+13
|\ | | | | Make sure __all__ variables loaded in flow __init__.py
| * Add flow functions from utils to __all__Dan Schult2015-10-031-0/+1
| |
| * Make sure __all__ variables loaded in flow __init__.pyDan Schult2015-09-141-9/+12
| |
* | Merge pull request #1792 from dschult/count-fringeDan Schult2015-10-031-1/+3
|\ \ | | | | | | Change comments about fringe tuples in dijkstra
| * | Change comments about fringe tuples in dijkstraDan Schult2015-10-031-1/+3
| | |
* | | Merge pull request #1791 from dschult/dschult-installDan Schult2015-10-031-12/+9
|\ \ \ | |/ / |/| | Update install.rst
| * | Update install.rstDan Schult2015-10-031-12/+9
| | | | | | | | | | | | | | | Update language for installing with pip. Change min python version to 2.7 or 3.3 (removing 3.2)
* | | Merge pull request #1790 from networkx/dschult-patch-3Dan Schult2015-10-031-19/+11
|\ \ \ | |/ / |/| | Rewrite harmonic_centrality to better use iterator
| * | Rewrite harmonic_centrality to better use iteratorDan Schult2015-10-021-19/+11
| | | | | | | | | | | | Better use iterator functionality of path functions, but still returns a dict. So is not an iterator itself (yet -- should it be?).
* | | Merge pull request #1753 from MridulS/installdocDan Schult2015-10-021-2/+20
|\ \ \ | | | | | | | | Update install documentation
| * | | Update install documentationMridul Seth2015-09-101-2/+20
| | | |
* | | | Merge pull request #1788 from networkx/dschult-patch-1Dan Schult2015-10-021-26/+23
|\ \ \ \ | |_|/ / |/| | | Clarify docstring and return code for _djikstra()
| * | | Clarify docstring and return code for _djikstra()Dan Schult2015-10-021-26/+23
|/ / /
* | | Merge pull request #1777 from MridulS/weighted_shortestDan Schult2015-10-026-46/+46
|\ \ \ | | | | | | | | Update all_pairs_dijkstra_path_length and single_source_dijkstra_path_length to be generators.
| * | | Update all_pairs_dijkstra_path_length and single_source_dijkstra_path_lengthMridul Seth2015-09-276-46/+46
| | | |
* | | | Merge pull request #1781 from wasade/issue1780Dan Schult2015-10-022-1/+85
|\ \ \ \ | | | | | | | | | | Allow GML read and write of _ characters
| * | | | BUG(ish): allow '_' in keys to support cytoscapeDaniel McDonald2015-09-291-1/+1
| | | | |
| * | | | TST: test that creates the bugDaniel McDonald2015-09-291-0/+84
| |/ / /
* | | | Merge pull request #1778 from MridulS/coverageDan Schult2015-10-022-2/+2
|\ \ \ \ | |/ / / |/| | | Add coverage for python 3.5 and drop for 3.2
| * | | Update nx_shp for Python 3.5Mridul Seth2015-10-021-1/+1
| | | |
| * | | Add coverage for python 3.5Mridul Seth2015-09-271-0/+1
| | | |
| * | | Drop coverage for python 3.2Mridul Seth2015-09-271-1/+0
|/ / /
* | | Merge pull request #1772 from jfinkels/stochastic-multigraphchebee7i2015-09-192-59/+88
|\ \ \ | |_|/ |/| | Makes stochastic_graph work for multigraphs.
| * | Makes stochastic_graph work for multigraphs.Jeffrey Finkelstein2015-09-162-59/+88
|/ / | | | | | | | | This commit allows the `stochastic_graph` generator to operate on `MultiDiGraph` instances. It also adds some missing unit tests.
* | Merge pull request #1756 from MisterSheik/topo-fixedDan Schult2015-09-016-152/+208
|\ \ | | | | | | rewrite topolgical_sort, add lexicographical_topological_sort
| * | Fixed old tests and re-added them.Neil2015-08-311-3/+16
| | |
| * | Update misc.pyNeil2015-08-311-2/+0
| | |
| * | topolgical_sort, lexicographical_topological_sortNeil2015-08-311-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote topolgical_sort as a generator: * It no longer accepts reverse or nbunch arguments * It is slightly faster. Added lexicographical_topological_sort, which accepts a key. Some tests for topological sort were removed because they relied on CPython's particular dict element ordering. Added utils from more_itertools: * These were necessary for working with the new generators. * "pairwise" is equavalent to zip(some_list, some_list[1:]) -- for generators. * "consume" consumes an iterator.
View Lorry Controller Status