Skip to content

Fix bit ordering and probabilities of samples in optimization_algorithm.py (backport #97)#129

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

Fix bit ordering and probabilities of samples in optimization_algorithm.py (backport #97)#129
mergify[bot] wants to merge 2 commits intostable/0.1from
mergify/bp/stable/0.1/pr-97

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 13, 2021

This is an automatic backport of pull request #97 done by Mergify.
Cherry-pick of 4bce259 has failed:

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

You are currently cherry-picking commit 4bce259.
  (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:
	modified:   .pylintdict
	modified:   qiskit_optimization/problems/quadratic_program.py
	new file:   releasenotes/notes/fix-bit-ordering-e807ec9f4b206ec3.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   qiskit_optimization/algorithms/grover_optimizer.py
	both modified:   qiskit_optimization/algorithms/optimization_algorithm.py
	both modified:   test/algorithms/test_grover_optimizer.py
	both modified:   test/algorithms/test_min_eigen_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/

…hm.py (#97)

* Fix bit ordering of `MinimumEigenOptimizer` with qasm_simulator.
* Fix probabilities of solution samples with qasm_simulator.

Co-authored-by: Takashi Imamichi <31178928+t-imamichi@users.noreply.github.com>
Co-authored-by: Takashi Imamichi <t.imamichi@gmail.com>
Co-authored-by: Manoel Marques <manoel.marques@ibm.com>
Co-authored-by: Takashi Imamichi <imamichi@jp.ibm.com>
(cherry picked from commit 4bce259)

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

t-imamichi commented May 13, 2021

This may need #130. I ask @a-matsuo to confirm it.

@t-imamichi
Copy link
Copy Markdown
Collaborator

This PR needs to merge #132

@mergify mergify Bot deleted the mergify/bp/stable/0.1/pr-97 branch May 15, 2021 02:09
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.

2 participants