Merge pull request #16 from dwavesystems/0.6.0

0.6.0

Author: arcondello

.gitignore

@@ -10,4 +10,8 @@ docs/reference/algorithms/generated/
 docs/reference/drawing/generated/
 
 htmlcov/
-.coverage
+.coverage
+
+# sublime stuff
+*.sublime-project
+*.sublime-workspace

docs/reference/generated/dwave_networkx.architectures.chimera_graph.rst

@@ -7,7 +7,7 @@ Graph generators
 
 Architectures
 -------------
-.. automodule:: dwave_networkx.architectures
+.. automodule:: dwave_networkx.generators
 .. autosummary::
    :toctree: generated/
 

docs/reference/generated/dwave_networkx.default_sampler.get_default_sampler.rst

@@ -3,29 +3,22 @@
 import sys
 _PY2 = sys.version_info[0] == 2
 
-import dwave_networkx.architectures
-from dwave_networkx.architectures import *
-
-try:
-    import dwave_networkx.x_architectures
-    from dwave_networkx.x_architectures import *
-except ImportError:
-    pass
+import dwave_networkx.generators
+from dwave_networkx.generators import *
 
 import dwave_networkx.algorithms
 from dwave_networkx.algorithms import *
 
 import dwave_networkx.utils
 from dwave_networkx.exceptions import *
 
-
 import dwave_networkx.default_sampler
 from dwave_networkx.default_sampler import *
 
 import dwave_networkx.drawing
 from dwave_networkx.drawing import *
 
-__version__ = '0.5.2'
+__version__ = '0.6.0'
 __author__ = 'D-Wave Systems Inc.'
 __authoremail__ = '[email protected]'
 __description__ = 'A NetworkX extension providing graphs and algorithms relevent to working with the D-Wave System'

docs/reference/generated/dwave_networkx.default_sampler.set_default_sampler.rst

@@ -1,4 +1,4 @@
-import dwave_networkx as dnx
+from dwave_networkx.algorithms.independent_set import maximum_independent_set
 from dwave_networkx.utils import binary_quadratic_model_sampler
 
 __all__ = ['min_vertex_cover', 'is_vertex_cover']
@@ -60,7 +60,7 @@ def min_vertex_cover(G, sampler=None, **sampler_args):
        Frontiers in Physics, Volume 2, Article 5.
 
     """
-    indep_nodes = set(dnx.maximum_independent_set(G, sampler, **sampler_args))
+    indep_nodes = set(maximum_independent_set(G, sampler, **sampler_args))
     return [v for v in G if v not in indep_nodes]