summaryrefslogtreecommitdiff
path: root/networkx
Commit message (Expand)AuthorAgeFilesLines
* Revert "fix compatible issue with new numpy"revert-1806-patch-numpy-compatiblechebee7i2015-10-181-1/+1
* fix type issueHaochen Wu2015-10-171-1/+1
* Two more doc formating changes.Dan Schult2015-10-042-17/+2
* Fix some sphinx formatting errorsDan Schult2015-10-0425-87/+94
* Merge pull request #1767 from dschult/fix-flow-docsDan Schult2015-10-031-9/+13
|\
| * 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
* | Change comments about fringe tuples in dijkstraDan Schult2015-10-031-1/+3
* | Merge pull request #1790 from networkx/dschult-patch-3Dan Schult2015-10-031-19/+11
|\ \
| * | Rewrite harmonic_centrality to better use iteratorDan Schult2015-10-021-19/+11
* | | 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_lengthMridul Seth2015-09-276-46/+46
* | | Merge pull request #1781 from wasade/issue1780Dan Schult2015-10-022-1/+85
|\ \ \
| * | | BUG(ish): allow '_' in keys to support cytoscapeDaniel McDonald2015-09-291-1/+1
| * | | TST: test that creates the bugDaniel McDonald2015-09-291-0/+84
| |/ /
* | | Update nx_shp for Python 3.5Mridul Seth2015-10-021-1/+1
|/ /
* | Makes stochastic_graph work for multigraphs.Jeffrey Finkelstein2015-09-162-59/+88
|/
* Merge pull request #1756 from MisterSheik/topo-fixedDan Schult2015-09-015-151/+207
|\
| * 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
| * .Neil2015-08-311-20/+19
| * topolgical_sort, lexicographical_topological_sortNeil2015-08-315-152/+199
* | Merge pull request #1734 from aureooms/faster-maximal-matchingDan Schult2015-08-311-4/+4
|\ \
| * | constant factor improvement for maximal_matchingaureooms2015-08-121-4/+4
* | | Merge pull request #1735 from aureooms/weight-parameter-for-max-weight-matchingDan Schult2015-08-312-42/+54
|\ \ \ | |_|/ |/| |
| * | update notes in max_weight_matchingaureooms2015-08-311-1/+1
| * | test for weight parameter in max_weight_matchingaureooms2015-08-121-36/+43
| * | update docstring of max_weight_matchingaureooms2015-08-121-1/+6
| * | add weight attribute param in max_weight_matchingaureooms2015-08-121-4/+4
| |/
* | Merge pull request #1722 from chrisnatali/masterDan Schult2015-08-292-29/+118
|\ \
| * | adding MultiLineString support to read_shpchrisnatali2015-08-072-29/+118
* | | dag: add more information to exception message when cycle detectedEden G. Adogla2015-08-251-2/+2
* | | Update random graph generator with iter changesMridul Seth2015-08-192-15/+15
* | | Change file permissionMridul Seth2015-08-191-0/+0
* | | Update documentation of shortest_path_lengthMridul Seth2015-08-172-15/+18
* | | Solve merge conflictsMridul Seth2015-08-1353-1410/+1886
|\ \ \
| * \ \ Merge pull request #1714 from stsouko/masterDan Schult2015-08-132-5/+11
| |\ \ \ | | |_|/ | |/| |
| | * | merge data of G and H instead replace.Ramil Nugmanov2015-08-072-2/+11
| | * | merge data of G and H instead replaceRamil Nugmanov2015-08-061-5/+2
| * | | Merge pull request #1730 from jfinkels/test-cuts-set-indexingAric Hagberg2015-08-111-10/+9
| |\ \ \
| | * | | Don't use indexing to access elements of a setJeffrey Finkelstein2015-08-101-10/+9
| * | | | Eigenvector_centrality power method shifted to A+IDan Schult2015-08-102-7/+13
| |/ / /
| * | | Merge pull request #1719 from dschult/minor_doc_changesAric Hagberg2015-08-084-56/+56
| |\ \ \
| | * | | minor changes related to _iter removalDan Schult2015-08-074-56/+56
| | | |/ | | |/|
| * | | to_networkx_graph needs .update() instead of new dictDan Schult2015-08-072-4/+13
| |/ /
| * | Merge branch 'merged_master_into_iter_refactor' into masterDan Schult2015-08-07161-1883/+1519
| |\ \
| | * | Merge master into iter_refactorDan Schult2015-08-0743-1328/+1784
| * | | Merge pull request #1710 from jfinkels/refactor-link-predictionchebee7i2015-08-061-57/+46
| |\ \ \ | | |_|/ | |/| |