From 2c12f6305993feadb91e5dc3e0a8b2453756ed45 Mon Sep 17 00:00:00 2001 From: Radomir Stevanovic Date: Wed, 23 Oct 2024 14:13:13 -0700 Subject: [PATCH] Fix doctests for new repr of numpy2 scalars See: https://numpy.org/devdocs/release/2.0.0-notes.html#representation-of-numpy-scalars-changed --- dwave/embedding/transforms.py | 4 ++-- dwave/system/composites/cutoffcomposite.py | 8 +++++--- dwave/system/composites/embedding.py | 2 +- dwave/system/samplers/dwave_sampler.py | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dwave/embedding/transforms.py b/dwave/embedding/transforms.py index 235cfd8d..3f31b0ee 100644 --- a/dwave/embedding/transforms.py +++ b/dwave/embedding/transforms.py @@ -356,8 +356,8 @@ def embed_bqm(source_bqm, embedding=None, target_adjacency=None, >>> embedding = {'a': {0}, 'b': {1}, 'c': {2, 3}} >>> # Embed and show the chain strength >>> target_bqm = dwave.embedding.embed_bqm(bqm, embedding, target) - >>> target_bqm.quadratic[(2, 3)] - -1.9996979771955565 + >>> print(target_bqm.quadratic[(2, 3)]) + -1.999... >>> print(target_bqm.quadratic) # doctest: +SKIP {(0, 1): 1.0, (0, 3): 1.0, (1, 2): 1.0, (2, 3): -1.9996979771955565} diff --git a/dwave/system/composites/cutoffcomposite.py b/dwave/system/composites/cutoffcomposite.py index 54d7c511..201aebf0 100644 --- a/dwave/system/composites/cutoffcomposite.py +++ b/dwave/system/composites/cutoffcomposite.py @@ -67,8 +67,9 @@ class CutOffComposite(dimod.ComposedSampler): ... {'ab': 0.8, 'ac': 0.7, 'bc': -1}, ... 0, ... dimod.SPIN) - >>> CutOffComposite(AutoEmbeddingComposite(sampler), 0.75).sample(bqm, - ... num_reads=1000).first.energy + >>> samples = CutOffComposite( + ... AutoEmbeddingComposite(sampler), 0.75).sample(bqm, num_reads=1000) + >>> print(samples.first.energy) -5.5 """ @@ -238,7 +239,8 @@ class PolyCutOffComposite(dimod.ComposedPolySampler): >>> import dimod >>> sampler = dimod.HigherOrderComposite(dimod.ExactSolver()) >>> poly = dimod.BinaryPolynomial({'a': 3, 'abc':-4, 'ac': 0.2}, dimod.SPIN) - >>> PolyCutOffComposite(sampler, 1).sample_poly(poly).first.sample['a'] + >>> samples = PolyCutOffComposite(sampler, 1).sample_poly(poly) + >>> print(samples.first.sample['a']) -1 """ diff --git a/dwave/system/composites/embedding.py b/dwave/system/composites/embedding.py index 3ef5936b..619e6698 100644 --- a/dwave/system/composites/embedding.py +++ b/dwave/system/composites/embedding.py @@ -81,7 +81,7 @@ class EmbeddingComposite(dimod.ComposedSampler): >>> h = {'a': -1., 'b': 2} >>> J = {('a', 'b'): 1.5} >>> sampleset = sampler.sample_ising(h, J, num_reads=100) - >>> sampleset.first.energy + >>> print(sampleset.first.energy) -4.5 diff --git a/dwave/system/samplers/dwave_sampler.py b/dwave/system/samplers/dwave_sampler.py index 1a6d04e5..bbcf64a5 100644 --- a/dwave/system/samplers/dwave_sampler.py +++ b/dwave/system/samplers/dwave_sampler.py @@ -155,7 +155,7 @@ class DWaveSampler(dimod.Sampler, dimod.Structured): >>> sampleset = sampler.sample_ising({qubit_a: -1, qubit_b: 1}, ... {}, ... num_reads=100) - >>> sampleset.first.sample[qubit_a] == 1 and sampleset.first.sample[qubit_b] == -1 + >>> print(sampleset.first.sample[qubit_a] == 1 and sampleset.first.sample[qubit_b] == -1) True See `Ocean Glossary `_ @@ -396,7 +396,7 @@ def sample(self, bqm, warnings=None, **kwargs): >>> sampleset = sampler.sample_ising({qubit_a: -1, qubit_b: 1}, ... {}, ... num_reads=100) - >>> sampleset.first.sample[qubit_a] == 1 and sampleset.first.sample[qubit_b] == -1 + >>> print(sampleset.first.sample[qubit_a] == 1 and sampleset.first.sample[qubit_b] == -1) True See `Ocean Glossary `_