summaryrefslogtreecommitdiff
path: root/networkx/classes
Commit message (Collapse)AuthorAgeFilesLines
* "Warning" is not a numpydoc sectionAric Hagberg2015-06-133-12/+6
|
* Spelling fixesAric Hagberg2015-06-131-3/+1
|
* Merge branch 'master' of github.com:networkx/networkxchebee7i2015-04-291-6/+5
|\ | | | | | | | | Conflicts: doc/source/reference/api_2.0.rst
| * Speed up non_edges for dense and complete graphsRaf Guns2015-04-281-2/+4
| |
| * Simplify and speed up nx.non_edgesRaf Guns2015-04-281-6/+3
| |
* | Simplify content of is_empty() functionThodoris Sotiropoulos2015-04-291-4/+2
| |
* | Fix doc example errorsThodoris Sotiropoulos2015-04-291-2/+2
| |
* | Add is_empty() and update is_weighted() to cover empty graph.chebee7i2015-04-292-0/+39
| |
* | Rename to is_negatively_weighted, minor docstring edits.chebee7i2015-04-292-56/+77
| | | | | | | | Also add unit tests for corner cases.
* | Remove unnecessary elseThodoris Sotiropoulos2015-04-281-2/+1
| |
* | Code simplificationThodoris Sotiropoulos2015-04-281-8/+2
| |
* | Simplify return statement and remove variableThodoris Sotiropoulos2015-04-281-6/+2
| |
* | Some code fixesThodoris Sotiropoulos2015-04-272-22/+20
| | | | | | | | | | | | | | | | List of changes: - Rename function to is_weighted() - Remove unnecessary variable - Fix code allignment on documentation - Remove unnecessary else statement
* | Merge branch 'master' into checking-weightsThodoris Sotiropoulos2015-04-222-2/+2
|\ \ | |/
| * Fix copyrightsJGab2015-04-212-2/+2
| |
* | Merge branch 'checking-weights' of https://github.com/Overriders/networkx ↵Konstantinos Karakatsanis2015-04-161-1/+1
|\ \ | | | | | | | | | into checking-weights
| * | Fix typo error.Thodoris Sotiropoulos2015-04-161-1/+1
| | |
* | | Add useful return statementKonstantinos Karakatsanis2015-04-161-1/+1
| | |
* | | Fix typo errorKonstantinos Karakatsanis2015-04-161-1/+1
|/ /
* | Simplify code and remove unnecessary call of weighted_edges functionKonstantinos Karakatsanis2015-04-161-4/+3
| |
* | Style changesKonstantinos Karakatsanis2015-04-162-2/+1
| |
* | Add weight parameter to negative_weights functionKonstantinos Karakatsanis2015-04-151-3/+7
| |
* | Add negative_weights function in _all_ listKonstantinos Karakatsanis2015-04-151-1/+1
| |
* | Add weight parameter to weighted_edges functionThodoris Sotiropoulos2015-04-151-3/+8
| | | | | | | | Edge data key corresponding to the edge weight.
* | Add negative_weights functionKonstantinos Karakatsanis2015-04-152-0/+76
| |
* | Add weight_edges functionThodoris Sotiropoulos2015-04-112-1/+68
|/ | | | A function to check the existence of weighted edges in a graph.
* Fixing failed merge.chebee7i2015-04-091-6/+0
|
* Merge remote-tracking branch 'pebenito/master' into pebenito-sysfixchebee7i2015-04-091-0/+4
|\ | | | | | | | | Conflicts: networkx/classes/graph.py
| * Remove sys.stdout.write() in Graph.nbunch_iter()/bunch_iter()Chris PeBenito2015-03-251-2/+0
| |
* | pep8 for multigraphGoran Cetusic2015-03-262-112/+107
| |
* | pep8 for multidigraphGoran Cetusic2015-03-261-116/+113
| |
* | Merge branch 'master' into pep8Goran Cetusic2015-03-264-7/+69
|\ \ | |/ | | | | | | Conflicts: networkx/classes/graph.py
| * Correct add_nodes_from use of adjlist_dict_factoryDan Schult2015-03-061-2/+2
| | | | | | | | Fixes #1394
| * Remove compatibility code for Python 2.6.chebee7i2015-02-162-40/+21
| |
| * Remove unnecessary (and debatable) comment.chebee7i2015-02-161-2/+0
| |
| * Add smoke tests for ordered graph variants.chebee7i2015-02-161-0/+26
| |
| * Add ordered variants of default graph classes.chebee7i2015-02-162-5/+62
| |
* | pep8 fix for base graph clases and methodsGoran Cetusic2015-03-261-119/+104
|/
* Expand data keyword in G.edges and add default dataDan Schult2015-01-175-87/+172
| | | | | | | | | | | | | | | When data=True, the whole data dictionary is returned for each edge. When data=False, no data is returned. Otherwise data is used as the attribute name of the edge data to return. >>> [ (u,v,edata['weight']) for u,v,edata in G.edges(data=True) ] becomes >>> G.edges(data='weight') >>> for n,nbrs in G.adjacency_iter(): ... for nbr,ddict in nbrs.items(): ... print (n,nbr,ddict.get('weight',1)) becomes >>> G.edges(data='weight', default=1)
* Merge pull request #1329 from dschult/no-travis-timingAric Hagberg2015-01-101-9/+11
|\ | | | | Comment out timing nosetests due to variation in travis test times.
| * Comment out timing nosetests due to travis variation.Dan Schult2015-01-101-9/+11
| | | | | | | | | | Uncomment to use locally with nosetests. Or run the test script manually.
* | Address ironpython issues from #1327Dan Schult2015-01-092-15/+17
|/
* Make timing test ratio a bit more forgiving for TravisCI.chebee7i2015-01-061-4/+4
|
* Improve reporting of errors for timing tests.Dan Schult2015-01-061-15/+16
|
* Remove timingtest of numpy_matrix and add test G.copy()Dan Schult2015-01-061-1/+2
|
* Add timing tests and baseline classes to compare to.Dan Schult2015-01-062-0/+4996
| | | | | | | | | | | This style of testing works with nose and compares to previous code (v1.9) so it gives long term baseline. We can't overload this or tests will take too long. As currently config'd it adds about 5 seconds. The code runs on its own and produces a timing report. python test_timing.py
* Meld special classes with base classes.Dan Schult2015-01-027-1793/+427
| | | | | This provides the ability to use OrderedGraph or ThinGraph by simple subclassing of Graph.
* Better proposed structure for OrderedGraph and co.Dan Schult2015-01-013-0/+1828
| | | | | | | | | | | | | | | | | | | | | | | | | | This supercedes #1268 as a proposed structure for OrderedGraph and ThinGraph class structures. It is based on discussion from #980 and has also been discussed in #1181, #1244, #1267, #1267 This implementation includes examples (in docs and in tests) for 1) ordered nodes, 2) ordered nodes and edges and 3) thin (low RAM) graphs that don't need edge attributes [not related to ordered nodes]. In this proposal, the dict-like arguments are assigned in a new class structure rather than assigning them to an instance of the SpecialGraph class. Something similar to: class OrderedGraph(SpecialGraph): node_dict_factory=OrderedDict G=OrderedGraph() If all goes well with this version (including reasonable speed) it might be reasonable to include it in the base classes Graph, etc. I think @ysitu prefers a more flexible base class than adding yet more graph classes, and all else equal (or almost equal) I agree. This pull request may be useful for people who wish OrderedGraph or ThinGraph and don't want to wait for 2.0
* Correct terminology in function.pyysitu2014-11-071-2/+2
| | | | Fixes #1273.
* Make add_nodes_from compatible with IronPythonysitu2014-07-032-36/+32
|
View Lorry Controller Status