Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrate QRAO into Qiskit Optimization #487

Merged
merged 89 commits into from
Sep 8, 2023
Merged

Integrate QRAO into Qiskit Optimization #487

merged 89 commits into from
Sep 8, 2023

Commits on Mar 24, 2023

  1. add qrao files

    @a-matsuo
    a-matsuo committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    14b75fa View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. support primitives and remove opflow

    @a-matsuo
    a-matsuo committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    837326b View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2023

  1. update qrao

    @a-matsuo
    a-matsuo committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    6e914ce View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. update qrao

    @a-matsuo
    a-matsuo committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    32acacb View commit details
    Browse the repository at this point in the history

  2. add expecation_values getter

    @a-matsuo
    a-matsuo committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    31507c1 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    b210cb0 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. inherit OptimizationAlgorithm

    @a-matsuo
    a-matsuo committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    11a5e40 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed May 8, 2023
    Configuration menu
    Copy the full SHA
    ba244a2 View commit details
    Browse the repository at this point in the history

  2. add unittests for encoding

    @a-matsuo
    a-matsuo committed May 8, 2023
    Configuration menu
    Copy the full SHA
    6a67943 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. add unittests for optimizer

    @a-matsuo
    a-matsuo committed May 9, 2023
    Configuration menu
    Copy the full SHA
    41f86eb View commit details
    Browse the repository at this point in the history

  2. add unittests for optimizer 

    Co-authored-by: Jim Garrison <garrison@ibm.com>
Co-authored-by: Bryce Fuller <Bryce.Fuller@ibm.com>
Co-authored-by: Jennifer Glick <Jennifer.R.Glick@ibm.com>
Co-authored-by: Caleb Johnson <calebj1524@outlook.com>
Co-authored-by: Takashi Imamichi <31178928+t-imamichi@users.noreply.github.com>
Co-authored-by: Toshinari Itoko <itoko@jp.ibm.com>
Co-authored-by: Areeq Hasan <areeq.i.hasan@gmail.com>
    @a-matsuo @garrison
    @BryceFuller @jenglick @caleb-johnson @t-imamichi @itoko @areeq-hasan
    8 people committed May 9, 2023
    Configuration menu
    Copy the full SHA
    b4277ad View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. add reno and unittests for magic rounding

    @a-matsuo
    a-matsuo committed May 10, 2023
    Configuration menu
    Copy the full SHA
    4408846 View commit details
    Browse the repository at this point in the history

  2. clean up

    @a-matsuo
    a-matsuo committed May 10, 2023
    Configuration menu
    Copy the full SHA
    efcb66d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed May 10, 2023
    Configuration menu
    Copy the full SHA
    30c8794 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. remove a unnecessary file

    @a-matsuo
    a-matsuo committed May 11, 2023
    Configuration menu
    Copy the full SHA
    2ae38b0 View commit details
    Browse the repository at this point in the history

  2. update the code

    @a-matsuo
    a-matsuo committed May 11, 2023
    Configuration menu
    Copy the full SHA
    fc4d379 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. add tutorial and update the code

    @a-matsuo
    a-matsuo committed May 12, 2023
    Configuration menu
    Copy the full SHA
    27ca8f1 View commit details
    Browse the repository at this point in the history

  2. update pylintdict

    @a-matsuo
    a-matsuo committed May 12, 2023
    Configuration menu
    Copy the full SHA
    668add2 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed May 12, 2023
    Configuration menu
    Copy the full SHA
    305a46e View commit details
    Browse the repository at this point in the history

  4. fix lint

    @a-matsuo
    a-matsuo committed May 12, 2023
    Configuration menu
    Copy the full SHA
    9c3ac42 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Update docs/tutorials/13_quantum_random_access_optimizer.ipynb 

    Co-authored-by: Takashi Imamichi <31178928+t-imamichi@users.noreply.github.com>
    @a-matsuo @t-imamichi
    a-matsuo and t-imamichi authored May 17, 2023
    Configuration menu
    Copy the full SHA
    872927d View commit details
    Browse the repository at this point in the history

  2. Update qiskit_optimization/algorithms/qrao/magic_rounding.py 

    Co-authored-by: Takashi Imamichi <31178928+t-imamichi@users.noreply.github.com>
    @a-matsuo @t-imamichi
    a-matsuo and t-imamichi authored May 17, 2023
    Configuration menu
    Copy the full SHA
    59ecdd6 View commit details
    Browse the repository at this point in the history

  3. Update releasenotes/notes/qrao-89d5ff1d2927de64.yaml 

    Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
    @a-matsuo @woodsp-ibm
    a-matsuo and woodsp-ibm authored May 17, 2023
    Configuration menu
    Copy the full SHA
    40ae277 View commit details
    Browse the repository at this point in the history

  4. update the code

    @a-matsuo
    a-matsuo committed May 17, 2023
    Configuration menu
    Copy the full SHA
    7fb0f40 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed May 17, 2023
    Configuration menu
    Copy the full SHA
    96784fa View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. add explanations and reflect comments

    @a-matsuo
    a-matsuo committed May 18, 2023
    Configuration menu
    Copy the full SHA
    d7513bb View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. update codes

    @a-matsuo
    a-matsuo committed May 19, 2023
    Configuration menu
    Copy the full SHA
    558ee28 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed May 19, 2023
    Configuration menu
    Copy the full SHA
    0c438d5 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. fix 

    Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
    @a-matsuo @woodsp-ibm
    a-matsuo and woodsp-ibm committed May 22, 2023
    Configuration menu
    Copy the full SHA
    02ec72a View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. update the code

    @a-matsuo
    a-matsuo committed May 23, 2023
    Configuration menu
    Copy the full SHA
    da34116 View commit details
    Browse the repository at this point in the history

  2. fix lint

    @a-matsuo
    a-matsuo committed May 23, 2023
    Configuration menu
    Copy the full SHA
    8c710d3 View commit details
    Browse the repository at this point in the history

  3. Fix docs so they build

    @woodsp-ibm
    woodsp-ibm committed May 23, 2023
    Configuration menu
    Copy the full SHA
    a9fed9c View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. fix lint

    @a-matsuo
    a-matsuo committed May 24, 2023
    Configuration menu
    Copy the full SHA
    f6c6e05 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed May 24, 2023
    Configuration menu
    Copy the full SHA
    9ecfd1c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'qrao' of github.com:a-matsuo/qiskit-optimization into qrao

    @a-matsuo
    a-matsuo committed May 24, 2023
    Configuration menu
    Copy the full SHA
    8610ca1 View commit details
    Browse the repository at this point in the history

  4. fix spell

    @a-matsuo
    a-matsuo committed May 24, 2023
    Configuration menu
    Copy the full SHA
    810dc45 View commit details
    Browse the repository at this point in the history

  5. fix spell

    @a-matsuo
    a-matsuo committed May 24, 2023
    Configuration menu
    Copy the full SHA
    6d62a05 View commit details
    Browse the repository at this point in the history

  6. fix spell

    @a-matsuo
    a-matsuo committed May 24, 2023
    Configuration menu
    Copy the full SHA
    373987e View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. test

    @a-matsuo
    a-matsuo committed May 29, 2023
    Configuration menu
    Copy the full SHA
    0e787fc View commit details
    Browse the repository at this point in the history

  2. test

    @a-matsuo
    a-matsuo committed May 29, 2023
    Configuration menu
    Copy the full SHA
    58973a3 View commit details
    Browse the repository at this point in the history

  3. update

    @a-matsuo
    a-matsuo committed May 29, 2023
    Configuration menu
    Copy the full SHA
    cc643ae View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed May 29, 2023
    Configuration menu
    Copy the full SHA
    5a87be2 View commit details
    Browse the repository at this point in the history

  5. fix lint

    @a-matsuo
    a-matsuo committed May 29, 2023
    Configuration menu
    Copy the full SHA
    133105a View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed May 29, 2023
    Configuration menu
    Copy the full SHA
    73de655 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed May 29, 2023
    Configuration menu
    Copy the full SHA
    ba59e95 View commit details
    Browse the repository at this point in the history

  8. use assertalmost equal in unittest

    @a-matsuo
    a-matsuo committed May 29, 2023
    Configuration menu
    Copy the full SHA
    424ea00 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. update

    @a-matsuo
    a-matsuo committed May 30, 2023
    Configuration menu
    Copy the full SHA
    7f4e5bd View commit details
    Browse the repository at this point in the history

  2. fix

    @a-matsuo
    a-matsuo committed May 30, 2023
    Configuration menu
    Copy the full SHA
    402b025 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. Merge branch 'main' into qrao

    @a-matsuo
    a-matsuo authored Jun 1, 2023
    Configuration menu
    Copy the full SHA
    863f73a View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. rerun tutorial

    @a-matsuo
    a-matsuo committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    f76c50b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    12809dd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'qrao' of github.com:a-matsuo/qiskit-optimization into qrao

    @a-matsuo
    a-matsuo committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    32c01a8 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. add unittests for max per qubit= 2 and 1

    @a-matsuo
    a-matsuo committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    02c0a7c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into qrao

    @woodsp-ibm
    woodsp-ibm authored Jun 5, 2023
    Configuration menu
    Copy the full SHA
    df37bd9 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Update docs/tutorials/13_quantum_random_access_optimizer.ipynb 

    Co-authored-by: Takashi Imamichi <31178928+t-imamichi@users.noreply.github.com>
    @a-matsuo @t-imamichi
    a-matsuo and t-imamichi authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    3523a44 View commit details
    Browse the repository at this point in the history

  2. Update docs/tutorials/13_quantum_random_access_optimizer.ipynb 

    Co-authored-by: Takashi Imamichi <31178928+t-imamichi@users.noreply.github.com>
    @a-matsuo @t-imamichi
    a-matsuo and t-imamichi authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    a8be7b4 View commit details
    Browse the repository at this point in the history

  3. Update docs/tutorials/13_quantum_random_access_optimizer.ipynb 

    Co-authored-by: Takashi Imamichi <31178928+t-imamichi@users.noreply.github.com>
    @a-matsuo @t-imamichi
    a-matsuo and t-imamichi authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    1e8bc6f View commit details
    Browse the repository at this point in the history

  4. fix docs

    @a-matsuo
    a-matsuo committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    dfde28b View commit details
    Browse the repository at this point in the history

  5. lint

    @a-matsuo
    a-matsuo committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    cdc675d View commit details
    Browse the repository at this point in the history

  6. add unittest quadratic objective

    @a-matsuo
    a-matsuo committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    948152d View commit details
    Browse the repository at this point in the history

  7. update optimizer unittest

    @a-matsuo
    a-matsuo committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    e71f660 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. replaces rustworkx with networkx 

    - updates type cast
    @t-imamichi
    t-imamichi committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    7b3c9e3 View commit details
    Browse the repository at this point in the history

  2. minor updates of explanation

    @t-imamichi
    t-imamichi committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    0d6e7ce View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into qrao

    @t-imamichi
    t-imamichi authored Jun 12, 2023
    Configuration menu
    Copy the full SHA
    d16fca9 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. fix docstrings

    @t-imamichi
    t-imamichi committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    da4142e View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. update an error message

    @t-imamichi
    t-imamichi committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    8b13f0c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into qrao

    @t-imamichi
    t-imamichi authored Jun 14, 2023
    Configuration menu
    Copy the full SHA
    d0dec2c View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. update error messages

    @t-imamichi
    t-imamichi committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    d458560 View commit details
    Browse the repository at this point in the history

  2. fix lint

    @t-imamichi
    t-imamichi committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    6380107 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Merge branch 'main' into qrao

    @woodsp-ibm
    woodsp-ibm authored Aug 29, 2023
    Configuration menu
    Copy the full SHA
    0fb1656 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. update tutorial and qiskit_algorithms

    @a-matsuo
    a-matsuo committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    ff8ee8e View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Merge branch 'main' into qrao

    @woodsp-ibm
    woodsp-ibm authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    a90bea3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into qrao

    @woodsp-ibm
    woodsp-ibm authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    57119a4 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. update

    @a-matsuo
    a-matsuo committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    caac634 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'qrao' of github.com:a-matsuo/qiskit-optimization into qrao

    @a-matsuo
    a-matsuo committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    27c6c73 View commit details
    Browse the repository at this point in the history

  3. fix lint

    @a-matsuo
    a-matsuo committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    0fa0025 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. fix

    @a-matsuo
    a-matsuo committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    8e0cb42 View commit details
    Browse the repository at this point in the history

  2. Update docs/tutorials/13_quantum_random_access_optimizer.ipynb 

    Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
    @a-matsuo @woodsp-ibm
    a-matsuo and woodsp-ibm authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    74dec95 View commit details
    Browse the repository at this point in the history

  3. Update docs/tutorials/13_quantum_random_access_optimizer.ipynb 

    Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
    @a-matsuo @woodsp-ibm
    a-matsuo and woodsp-ibm authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    a5ec643 View commit details
    Browse the repository at this point in the history

  4. fix

    @a-matsuo
    a-matsuo committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    c1c329d View commit details
    Browse the repository at this point in the history

  5. Update qiskit_optimization/algorithms/qrao/__init__.py 

    Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
    @a-matsuo @woodsp-ibm
    a-matsuo and woodsp-ibm authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    cbba4f8 View commit details
    Browse the repository at this point in the history

  6. Update releasenotes/notes/qrao-89d5ff1d2927de64.yaml 

    Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
    @a-matsuo @woodsp-ibm
    a-matsuo and woodsp-ibm authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    4b2ea88 View commit details
    Browse the repository at this point in the history

  7. Update test/algorithms/qrao/test_magic_rounding.py 

    Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
    @a-matsuo @woodsp-ibm
    a-matsuo and woodsp-ibm authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    9f61f4c View commit details
    Browse the repository at this point in the history

  8. Update test/algorithms/qrao/test_quantum_random_access_optimizer.py 

    Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
    @a-matsuo @woodsp-ibm
    a-matsuo and woodsp-ibm authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    bf16e25 View commit details
    Browse the repository at this point in the history

  9. fix mypy

    @a-matsuo
    a-matsuo committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    3b4570e View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'upstream/main' into qrao

    @a-matsuo
    a-matsuo committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    e494613 View commit details
    Browse the repository at this point in the history

  11. fix

    @a-matsuo
    a-matsuo committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    6e1f1c3 View commit details
    Browse the repository at this point in the history

  12. fix

    @a-matsuo
    a-matsuo committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    d5ffb28 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. change the index number

    @a-matsuo
    a-matsuo committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    208daad View commit details
    Browse the repository at this point in the history