Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 19, 2015
  1. @jtorrents

    Merge pull request #1425 from jfinkels/complete-multipartite-graph

    jtorrents authored
    Adds generator for complete multipartite graph.
  2. @jfinkels
Commits on Apr 18, 2015
  1. @chebee7i

    Merge pull request #1463 from jfinkels/accumulate

    chebee7i authored
    Replaces cumulative_sum with accumulate.
  2. @jfinkels

    Replaces cumulative_sum with accumulate.

    jfinkels authored
    Python 3.2 introduces the `itertools.accumulate()`. Before, we were
    using less flexible custom code for performing the same task, in
    `networkx.utils.misc.cumulative_sum`. This commit replaces calls to
    `cumulative_sum` with calls to `itertools.accumulate()`.
    
    Since we currently still support Python 2.7, this commit adds a fallback
    equivalent definition of accumulate that matches the Python 3.2
    implementation. Once support for Python 2.7 is dropped, all of this code
    can be removed, and calls to `networkx.utils.accumulate()` can be
    replaced by calls to `itertools.accumulate()`.
Commits on Apr 17, 2015
  1. @chebee7i

    Merge pull request #1460 from jfinkels/patch-8

    chebee7i authored
    Records changes due to #1437.
  2. @chebee7i

    Merge pull request #1461 from jfinkels/patch-9

    chebee7i authored
    Fixes typo: linealg -> linalg
  3. @chebee7i

    Merge pull request #1447 from jtorrents/yen-sp

    chebee7i authored
    Add shortest_simple_paths function.
  4. @jfinkels

    Fixes typo: linealg -> linalg

    jfinkels authored
  5. @jfinkels

    Records changes due to #1437.

    jfinkels authored
  6. @jtorrents

    Added Andrey Paramonov to the Credits.

    jtorrents authored
    Thanks for you work @aparamon !
  7. @jtorrents
  8. @jtorrents

    Improve documentation and add more tests.

    jtorrents authored
    Added example of an efficient function to compute k shortest paths
    in the example section of shortest_simple_paths docstrings. Added
    more tests, I think all relevant code for this function is covered
    now.
  9. @jtorrents

    Improve shortest_simple_paths implementation and add more tests.

    jtorrents authored
    I've removed the asserts, fixed the inability to use an arbitrary
    edge attribute as a weight, and speeded it up by computing
    separatetly the length/cost of the root and then adding it
    to the newly found partial path instead of computing the
    lenth/cost of the whole path when we push it to PathBuffer.
  10. @jtorrents

    Add shortest_simple_paths function.

    jtorrents authored
    This function is based on Yen's algorithm for finding k shortest paths.
    It generates all simple paths between source and target starting from
    the shortest one. See #762 and #793 for prior work on this and discussion.
    
    This implementation is based on Andrey's work on #762. It generalizes his
    approach there to the weighted case, as in Greg's implementation posted
    on #793.
    
    Regarding the discussion on #762 about how to do the filtering of nodes
    and edges efficiently, this PR adds private modifications of the functions
    `bidirectional_shortest_path` and `bidirectional_dijkstra` (that accept
    containers with nodes and edges to exclude during the SP search) for its
    exclusive use.
    
    This still needs work, especially on documentation and tests. I'm pushing
    it so we can have the discussion with the code available.
    
    One thing to discuss is whether or not to include an one liner function
    to get the k shortest paths. Could be something like this:
    
    ```python
    from itertools import islice
    def k_shortest_paths(G, source, target, k, weight=None):
            return list(islice(nx.shortest_simple_paths(G, source, target, weight=weight), k))
    ```
    
    I think that, given that `all_simple_paths` is way faster in computing
    all paths, the principal use of `shortest_simple_paths` will be to get
    the k best/shortest paths. So it will be a more user friendly interface
    if we add it. However, we could also add this function as example in the
    `shortest_simple_paths` docstring. I'm ok either way. Thoughts?
Commits on Apr 16, 2015
  1. @chebee7i

    Merge pull request #1455 from jg-you/Directed_modularity

    chebee7i authored
    Directed modularity
  2. @jg-you
  3. @jg-you
  4. @jg-you

    Changelog

    jg-you authored
  5. @jg-you

    Scipy fixture

    jg-you authored
  6. @jg-you

    Hyphens

    jg-you authored
  7. @jg-you

    Merge conflicts

    jg-you authored
  8. @jg-you

    Avoiding merge issues

    jg-you authored
  9. @jg-you

    Avoiding merge issues

    jg-you authored
  10. @jg-you

    Fix example in doc

    jg-you authored
  11. @jg-you

    See also doc

    jg-you authored
  12. @jg-you

    Directed modularity and tests

    jg-you authored
Commits on Apr 15, 2015
  1. @chebee7i

    Merge pull request #1452 from MridulS/docbug

    chebee7i authored
    Fix link in api_2.0.rst
  2. @MridulS

    Fix link in api_2.0.rst

    MridulS authored
  3. @chebee7i

    Merge pull request #1437 from jfinkels/minors

    chebee7i authored
    Adds function for computing a quotient graph.
  4. @jfinkels

    Adds function for computing a quotient graph.

    jfinkels authored
    The quotient graph of a graph `G` with respect to an equivalence
    relation `R` on the nodes of `G` is the graph whose vertex set is the
    equivalence classes `R` and where there is an edge joining class `c` to
    class `d` if some vertex in `c` is adjacent to some vertex in `d`.
    
    This commit places that function in a new module,
    `networkx/algorithms/minors.py`, for functions related to graph minors.
Commits on Apr 14, 2015
  1. @chebee7i

    Fix docstest.

    chebee7i authored
  2. @chebee7i
  3. @chebee7i

    Clean up docstring example.

    chebee7i authored
  4. @lucjon

    Merge branch 'master' of github.com:lucjon/networkx into circulant

    lucjon authored
    Conflicts:
    	doc/source/reference/api_2.0.rst
  5. @lucjon
Something went wrong with that request. Please try again.