add product of edge weight Hamiltonian and test #1209

anthayes92 · 2021-04-13T16:57:49Z

This Hamiltonian holds the edge weight information that is used in the cost function during optimisation to find the max weighted cycle in the directed graph of interest.

Add function to generate this Hamiltonian.

In the unconstrained QAOA approach penalty terms are added to this Hamiltonian
In the constrained QAOA approach, the penalty complexity is added to the accompanying mixer Hamiltonian

github-actions · 2021-04-13T16:58:06Z

Hello. You may have forgotten to update the changelog!
Please edit .github/CHANGELOG.md with:

A one-to-two sentence description of the change. You may include a small working example for new features.
A link back to this PR.
Your name (or GitHub username) in the contributors section.

codecov · 2021-04-13T17:05:29Z

Codecov Report

Merging #1209 (e6a8965) into master (164b409) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master    #1209   +/-   ##
=======================================
  Coverage   98.13%   98.14%           
=======================================
  Files         146      146           
  Lines       11017    11035   +18     
=======================================
+ Hits        10812    10830   +18     
  Misses        205      205

Impacted Files	Coverage Δ
pennylane/qaoa/cycle.py	`100.00% <100.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 164b409...e6a8965. Read the comment docs.

anthayes92 · 2021-04-14T15:23:12Z

pennylane/qaoa/cycle.py

+    if len(edges) != len(set(edges)):
+        raise ValueError("Graph contains parallel edges")


I think this can be removed as parallel edges are not allowed for nx.DiGraphs according to the documentation . A separate class nx.MultiDiGraph must be used to support parallel edges

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

trbromley

Thanks @anthayes92! 💯 Code looks great, but I think we can polish the docstrings a bit more.

pennylane/qaoa/cycle.py

tests/test_qaoa.py

… into qaoa_cycles_module

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

…onian

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

…onian

pennylane/qaoa/cycle.py

trbromley

Thanks @anthayes92! 🚀 Would be good to add the following line to the changelog so we keep track of the PRs:

  [(#1209)](https://github.com/PennyLaneAI/pennylane/pull/1209)

pennylane/qaoa/cycle.py

trbromley · 2021-04-21T11:50:05Z

pennylane/qaoa/cycle.py

+    >>> edge_weight_data = {edge: (i + 1) * 0.5 for i, edge in enumerate(g.edges)}
+    >>> for k, v in edge_weight_data.items():
+            g[k[0]][k[1]]["weight"] = v
+    >>>> h = loss_hamiltonian(g)


Nice! Would be good to also print it.

added here: 104ec3f

tests/test_qaoa.py

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

anthayes92 added 4 commits April 12, 2021 19:15

start qaoa cycles module, add mapping between edges and wires, add tests

1a06ed6

update formatting and imports

257ac33

update qaoa documentation, change cycles.py to cycle.py

a4548bf

add product of edge weight Hamiltonian and test

533e920

anthayes92 requested a review from trbromley April 13, 2021 16:58

anthayes92 added 3 commits April 13, 2021 19:16

reformat cycle.py and test

29d38d0

add test for incomplete graph

bb1b8fe

add unit tests for self loops and missing edge data

853fa6c

anthayes92 commented Apr 14, 2021

View reviewed changes

anthayes92 added 3 commits April 14, 2021 17:06

remove error for parallel edges

e1ab909

remove unused variable

a222a41

fix self loop test

27a1355

anthayes92 marked this pull request as ready for review April 14, 2021 16:50

trbromley and others added 9 commits April 15, 2021 16:15

Merge branch 'master' into qaoa_cycles_module

74d22dd

Update pennylane/qaoa/cycle.py

8e4b820

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update doc/code/qml_qaoa.rst

291d928

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update tests/test_qaoa.py

ed1407d

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update tests/test_qaoa.py

ced36ee

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update pennylane/qaoa/cycle.py

4c6977c

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update pennylane/qaoa/cycle.py

aeaf196

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update pennylane/qaoa/cycle.py

4e3b532

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update pennylane/qaoa/cycle.py

84f7fff

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

trbromley requested changes Apr 16, 2021

View reviewed changes

anthayes92 and others added 5 commits April 19, 2021 18:56

add unit tests for directed graphs

7cae0c9

Merge branch 'qaoa_cycles_module' of github.com:PennyLaneAI/pennylane…

0c1635b

… into qaoa_cycles_module

retrigger checks

5af4ebf

Merge branch 'master' into qaoa_cycles_module

64e067d

Update pennylane/qaoa/cycle.py

05737e8

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

anthayes92 and others added 19 commits April 20, 2021 12:38

Update tests/test_qaoa.py

03e64bc

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update tests/test_qaoa.py

201a541

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update pennylane/qaoa/cycle.py

fa3ba9d

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update pennylane/qaoa/cycle.py

33bc6d8

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update pennylane/qaoa/cycle.py

6646f31

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update pennylane/qaoa/cycle.py

407d613

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update pennylane/qaoa/cycle.py

39882c7

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Merge branch 'qaoa_cycles_module' into add_edge_weight_product_hamilt…

c464f43

…onian

Update pennylane/qaoa/cycle.py

be5a444

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update pennylane/qaoa/cycle.py

02a7090

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Merge branch 'master' into qaoa_cycles_module

ee41bba

Update pennylane/qaoa/cycle.py

2b30d15

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Update pennylane/qaoa/cycle.py

2e29384

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Apply black

9c619ca

Update pennylane/qaoa/cycle.py

610deb3

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Apply suggestions from code review

51cdcf1

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Merge branch 'qaoa_cycles_module' into add_edge_weight_product_hamilt…

7f53470

…onian

apply black

f3eacf9

rename edge_weight to loss_hamiltonian in unit tests

b6d459f

Base automatically changed from qaoa_cycles_module to master April 21, 2021 10:17

trbromley and others added 2 commits April 21, 2021 07:32

Merge branch 'master' into add_edge_weight_product_hamiltonian

82800a8

add example to loss_hamiltonian docstring

c70c29e

anthayes92 commented Apr 21, 2021

View reviewed changes

pennylane/qaoa/cycle.py Outdated Show resolved Hide resolved

fix docstring typo

723af67

trbromley approved these changes Apr 21, 2021

View reviewed changes

anthayes92 and others added 3 commits April 21, 2021 13:43

Apply suggestions from code review

93e853f

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

add print statement to loss_hamiltonian example

104ec3f

add PR to TBD in CHANGELOG.md

e6a8965

anthayes92 merged commit 35ab137 into master Apr 21, 2021

anthayes92 deleted the add_edge_weight_product_hamiltonian branch April 21, 2021 13:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add product of edge weight Hamiltonian and test #1209

add product of edge weight Hamiltonian and test #1209

anthayes92 commented Apr 13, 2021

github-actions bot commented Apr 13, 2021

codecov bot commented Apr 13, 2021 •

edited

Loading

anthayes92 Apr 14, 2021 •

edited

Loading

trbromley left a comment

trbromley left a comment

trbromley Apr 21, 2021

anthayes92 Apr 21, 2021

		if len(edges) != len(set(edges)):
		raise ValueError("Graph contains parallel edges")

add product of edge weight Hamiltonian and test #1209

add product of edge weight Hamiltonian and test #1209

Conversation

anthayes92 commented Apr 13, 2021

github-actions bot commented Apr 13, 2021

codecov bot commented Apr 13, 2021 • edited Loading

Codecov Report

anthayes92 Apr 14, 2021 • edited Loading

Choose a reason for hiding this comment

trbromley left a comment

Choose a reason for hiding this comment

trbromley left a comment

Choose a reason for hiding this comment

trbromley Apr 21, 2021

Choose a reason for hiding this comment

anthayes92 Apr 21, 2021

Choose a reason for hiding this comment

codecov bot commented Apr 13, 2021 •

edited

Loading

anthayes92 Apr 14, 2021 •

edited

Loading