Merge pull request #37 from arcondello/bugfix_#36

Bugfix #36

Author: arcondello

dwave/system/package_info/package_info.py

@@ -1,6 +1,6 @@
 __all__ = ['__version__', '__author__', '__authoremail__', '__description__']
 
-__version__ = '0.2.2'
+__version__ = '0.2.3'
 __author__ = 'D-Wave Systems Inc.'
 __authoremail__ = '[email protected]'
 __description__ = 'All things D-Wave System.'

dwave/system/samplers/dwave_sampler.py

@@ -141,7 +141,7 @@ def sample_qubo(self, Q, **kwargs):
         info_keys = {'timing'}
 
         future = self.solver.sample_qubo(Q, **kwargs)
-        return dimod.Response.from_futures((future,), vartype=dimod.SPIN,
+        return dimod.Response.from_futures((future,), vartype=dimod.BINARY,
                                            num_variables=num_variables,
                                            data_vector_keys=data_vector_keys,
                                            active_variables=active_variables,

tests/test_dwave_sampler.py

@@ -3,6 +3,8 @@
 
 from concurrent.futures import Future
 
+import numpy as np
+
 import dimod
 import dwave_networkx as dnx
 
@@ -125,6 +127,9 @@ def test_sample_ising_variables(self):
 
         self.assertEqual(cols, 2)
 
+        self.assertFalse(np.any(response.samples_matrix == 0))
+        self.assertIs(response.vartype, dimod.SPIN)
+
         self.assertIn('num_occurrences', response.data_vectors)
         self.assertIn('timing', response.info)
 
@@ -144,5 +149,8 @@ def test_sample_qubo_variables(self):
 
         self.assertEqual(cols, 2)
 
+        self.assertTrue(np.all(response.samples_matrix >= 0))
+        self.assertIs(response.vartype, dimod.BINARY)
+
         self.assertIn('num_occurrences', response.data_vectors)
         self.assertIn('timing', response.info)

tests_integration/__init__.py

@@ -0,0 +1,29 @@
+import unittest
+
+import numpy as np
+import dimod
+
+from dwave.system.samplers import DWaveSampler
+
+try:
+    DWaveSampler()
+    _config_found = True
+except ValueError:
+    _config_found = False
+
+
+@unittest.skipUnless(_config_found, "no configuration found to connect to a system")
+class TestDWaveSamplerSystem(unittest.TestCase):
+    def test_typical_small(self):
+        h = [0, 0, 0, 0, 0]
+        J = {(0, 4): 1}
+        bqm = dimod.BinaryQuadraticModel.from_ising(h, J)
+
+        response = DWaveSampler().sample(bqm)
+
+        self.assertFalse(np.any(response.samples_matrix == 0))
+        self.assertIs(response.vartype, dimod.SPIN)
+
+        rows, cols = response.samples_matrix.shape
+
+        self.assertEqual(cols, 5)