← Back to branch summary

~ubuntu-branches/ubuntu/utopic/python-networkx/utopic

« back to all changes in this revision

Viewing changes to networkx/generators/hybrid.py

  • Committer: Bazaar Package Importer
  • Author(s): Sandro Tosi
  • Date: 2011-03-19 12:19:16 UTC
  • mfrom: (1.2.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20110319121916-xrhlpiwc9sa5e028
Tags: 1.4-1
http://bugs.debian.org/617677
http://bugs.debian.org/608780
* New upstream release; thanks to Yaroslav Halchenko for the report;
  Closes: #617677
* debian/rules
  - don't compress objects.inv; thanks to Michael Fladischer for the report;
    Closes: #608780
* debian/watch
  - updated to point to PyPi
* debian/control
  - bump python-sphinx versioned b-d-i to 1.0.1 minimum
  - added python-pygraphviz to b-d-i, needed for doc building
* debian/copyright
  - bump upstream and packaging copyright years
* debian/patches/{40_add_networkxcss, 50_boundary-test-fix.patch
                  60_remove_svn_refs.diff 70_set_matplotlib_ps_backend.patch}
  - removed since merged upstream
* debian/patches/{10_doc_relocation, 20_example_dirs_remove,
                  30_use_local_objects.inv}
  - refreshed/adapted to new upstream code

Show diffs side-by-side

added added

removed removed

Lines of Context:
networkx/generators/hybrid.py
59
59
                        G2.remove_edge(prev,w)
60
60
                        prev=w
61
61
#                path=shortest_path(G2,u,v,k) # ??? should "Cutoff" be k+1?
62
 
                path=nx.shortest_path(G2,u,v) # ??? should "Cutoff" be k+1?
 
62
                try:
 
63
                    path=nx.shortest_path(G2,u,v) # ??? should "Cutoff" be k+1?
 
64
                except nx.NetworkXNoPath:
 
65
                    path = False
63
66
            # No Other Paths
64
67
            if accept==0:
65
68
                H.remove_edge(u,v)
100
103
                    G2.remove_edge(prev,w)
101
104
                    prev=w
102
105
#            path=shortest_path(G2,u,v,k) # ??? should "Cutoff" be k+1?
103
 
            path=nx.shortest_path(G2,u,v) # ??? should "Cutoff" be k+1?
 
106
            try:
 
107
                path=nx.shortest_path(G2,u,v) # ??? should "Cutoff" be k+1?
 
108
            except nx.NetworkXNoPath:
 
109
                path = False
104
110
        # No Other Paths
105
111
        if accept==0:
106
112
            graphOK=False