Merge pull request #14 from JoelPasvolsky/label

Add problem label

Author: vgoliber

BQM_Functionality/bqm_conversion.py

@@ -14,8 +14,8 @@
 
 # --------------------------------------------------------------------------#
 
-# This program demonstrates a basic Ocean program that runs an Ising problem 
-# (from a BQM) on the D-Wave QPU. 
+# This program demonstrates a basic Ocean program that runs an Ising problem
+# (from a BQM) on the D-Wave QPU.
 
 # --------------------------------------------------------------------------#
 
@@ -24,10 +24,10 @@
 from dimod import BinaryQuadraticModel
 
 # Define the problem as a Python dictionary and convert it to a BQM
-Q = {('B','B'): 1, 
- ('K','K'): 1, 
- ('A','C'): 2, 
- ('A','K'): -2, 
+Q = {('B','B'): 1,
+ ('K','K'): 1,
+ ('A','C'): 2,
+ ('A','K'): -2,
  ('B','C'): -2}
 
 bqm = BinaryQuadraticModel.from_qubo(Q)
@@ -40,8 +40,9 @@
 
 # Run the problem on the sampler and print the results
 sampleset = sampler.sample_ising(
- h = ising_model[0], 
- J = ising_model[1], 
- num_reads = 10)
- 
+ h = ising_model[0],
+ J = ising_model[1],
+ num_reads = 10,
+ label='Example - Simple Ocean Programs: Conversion')
+
 print(sampleset)

BQM_Functionality/bqm_offsets.py

@@ -15,7 +15,7 @@
 # --------------------------------------------------------------------------#
 
 # This program demonstrates a basic Ocean program that creates a
-# BinaryQuadraticModel with a non-zero offset to store a constant term. 
+# BinaryQuadraticModel with a non-zero offset to store a constant term.
 
 # --------------------------------------------------------------------------#
 
@@ -24,24 +24,28 @@
 from dimod import BinaryQuadraticModel
 
 # Define the problem as a Python dictionary and convert it to a BQM
-Q = {('B','B'): 1, 
- ('K','K'): 1, 
- ('A','C'): 2, 
- ('A','K'): -2, 
+Q = {('B','B'): 1,
+ ('K','K'): 1,
+ ('A','C'): 2,
+ ('A','K'): -2,
  ('B','C'): -2}
- 
+
 bqm = BinaryQuadraticModel.from_qubo(Q, offset=1.0)
 
 # Define the sampler that will be used to run the problem
 sampler = EmbeddingComposite(DWaveSampler())
 
 # Run the problem on the sampler and print the results
-sampleset = sampler.sample(bqm, num_reads = 10)
+sampleset = sampler.sample(bqm,
+ num_reads = 10,
+ label='Example - Simple Ocean Programs: Offsets')
 print("QUBO samples:")
 print(sampleset)
 
 # Convert the problem to an Ising model and run it on the sampler
 bqm.change_vartype('SPIN')
-sampleset = sampler.sample(bqm, num_reads = 10)
+sampleset = sampler.sample(bqm,
+ num_reads = 10,
+ label='Example - Simple Ocean Programs: Offsets')
 print("\nIsing samples:")
 print(sampleset)

BQM_Functionality/general_program_bqm.py

@@ -24,10 +24,10 @@
 from dimod import BinaryQuadraticModel
 
 # Define the problem as a Python dictionary and convert it to a BQM
-Q = {('B','B'): 1, 
- ('K','K'): 1, 
- ('A','C'): 2, 
- ('A','K'): -2, 
+Q = {('B','B'): 1,
+ ('K','K'): 1,
+ ('A','C'): 2,
+ ('A','K'): -2,
  ('B','C'): -2}
 
 # Convert the problem to a BQM
@@ -37,5 +37,7 @@
 sampler = EmbeddingComposite(DWaveSampler())
 
 # Run the problem on the sampler and print the results
-sampleset = sampler.sample(bqm, num_reads = 10)
+sampleset = sampler.sample(bqm,
+ num_reads = 10,
+ label='Example - Simple Ocean Programs: BQM')
 print(sampleset)

Basic_Programs/general_program_ising.py

@@ -14,24 +14,26 @@
 
 # --------------------------------------------------------------------------#
 
-# This program demonstrates a basic Ocean program that runs an Ising problem 
-# on the D-Wave QPU. 
+# This program demonstrates a basic Ocean program that runs an Ising problem
+# on the D-Wave QPU.
 
 # --------------------------------------------------------------------------#
 
 # Import the functions and packages that are used
 from dwave.system import EmbeddingComposite, DWaveSampler
 
-# Define the problem as two Python dictionaries: 
+# Define the problem as two Python dictionaries:
 # h for linear terms, J for quadratic terms
-h = {} 
-J = {('A','K'): -0.5, 
+h = {}
+J = {('A','K'): -0.5,
  ('B','C'): -0.5, 
- ('A','C'): 0.5} 
+ ('A','C'): 0.5}
 
 # Define the sampler that will be used to run the problem
 sampler = EmbeddingComposite(DWaveSampler())
 
 # Run the problem on the sampler and print the results
-sampleset = sampler.sample_ising(h, J, num_reads = 10)
+sampleset = sampler.sample_ising(h, J,
+ num_reads = 10,
+ label='Example - Simple Ocean Programs: Ising')
 print(sampleset)

Basic_Programs/general_program_qubo.py

@@ -15,23 +15,25 @@
 # --------------------------------------------------------------------------#
 
 # This program demonstrates a basic Ocean program that runs a QUBO problem on
-# the D-Wave QPU. 
+# the D-Wave QPU.
 
 # --------------------------------------------------------------------------#
 
 # Import the functions and packages that are used
 from dwave.system import EmbeddingComposite, DWaveSampler
 
 # Define the problem as a Python dictionary
-Q = {('B','B'): 1, 
- ('K','K'): 1, 
- ('A','C'): 2, 
- ('A','K'): -2, 
+Q = {('B','B'): 1,
+ ('K','K'): 1,
+ ('A','C'): 2,
+ ('A','K'): -2,
  ('B','C'): -2}
 
 # Define the sampler that will be used to run the problem
 sampler = EmbeddingComposite(DWaveSampler())
 
 # Run the problem on the sampler and print the results
-sampleset = sampler.sample_qubo(Q, num_reads = 10)
+sampleset = sampler.sample_qubo(Q,
+ num_reads = 10,
+ label='Example - Simple Ocean Programs: QUBO')
 print(sampleset)

requirements.txt

@@ -1,2 +1,2 @@
-dwave-ocean-sdk>=3.1.1
+dwave-ocean-sdk>=3.3.0
 matplotlib