Skip to content

Fix GroverOptimizer's rotation_count (backport #132)#135

Closed
mergify[bot] wants to merge 2 commits intostable/0.1from
mergify/bp/stable/0.1/pr-132
Closed

Fix GroverOptimizer's rotation_count (backport #132)#135
mergify[bot] wants to merge 2 commits intostable/0.1from
mergify/bp/stable/0.1/pr-132

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 15, 2021

This is an automatic backport of pull request #132 done by Mergify.
Cherry-pick of b0d411a has failed:

On branch mergify/bp/stable/0.1/pr-132
Your branch is up to date with 'origin/stable/0.1'.

You are currently cherry-picking commit b0d411a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   releasenotes/notes/fix-grover-rotation-count-853baefc6b7e8476.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   qiskit_optimization/algorithms/grover_optimizer.py
	both modified:   test/algorithms/test_grover_optimizer.py

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* Fix rotation_count in GroverOptimizer

* Simpify GroverOptimizer._measure

* Simplify unit tests of GroverOptimizer

(cherry picked from commit b0d411a)

# Conflicts:
#	qiskit_optimization/algorithms/grover_optimizer.py
#	test/algorithms/test_grover_optimizer.py
@t-imamichi
Copy link
Copy Markdown
Collaborator

I close this because #137 is merged.

@t-imamichi t-imamichi closed this May 17, 2021
@t-imamichi t-imamichi deleted the mergify/bp/stable/0.1/pr-132 branch May 17, 2021 01:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant