Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
7dac219
ae codes
Cryoris Dec 10, 2020
4c1325c
add tests
Cryoris Dec 10, 2020
9abb514
Merge branch 'master' into ae
Cryoris Dec 11, 2020
d5d9ef1
update docstrings in result objects
Cryoris Dec 14, 2020
b843a5d
add reno
Cryoris Dec 14, 2020
3aaa0fb
Merge branch 'master' into ae
Cryoris Dec 14, 2020
dc901cc
Merge branch 'ae' of github.com:Cryoris/qiskit-terra into ae
Cryoris Dec 14, 2020
da5886b
fix old aqua dependencies
Cryoris Dec 14, 2020
d0571c8
fix cyclic imports
Cryoris Dec 14, 2020
a1409f9
try fixing windows tests no. 1
Cryoris Dec 15, 2020
ef99ebd
fix test
Cryoris Dec 15, 2020
24a1954
Merge branch 'master' into ae
Cryoris Dec 15, 2020
ee9f9a3
Merge branch 'master' into ae
mtreinish Dec 15, 2020
dd51d0e
try fixing windows attempt #2
Cryoris Dec 16, 2020
f7ce292
Merge branch 'ae' of github.com:Cryoris/qiskit-terra into ae
Cryoris Dec 16, 2020
0a666cb
Merge branch 'master' into ae
Cryoris Dec 16, 2020
d625216
Merge branch 'master' into ae
Cryoris Dec 17, 2020
eea60d8
stefan's first comments
Cryoris Dec 17, 2020
de33dae
Merge branch 'ae' of github.com:Cryoris/qiskit-terra into ae
Cryoris Dec 17, 2020
d697e06
stefans comments pt. 2
Cryoris Dec 18, 2020
9fe47ab
fix lint & indent
Cryoris Dec 18, 2020
a4e0337
Merge branch 'master' into ae
Cryoris Dec 20, 2020
6284918
add faster ae + bernoulli tests
Cryoris Dec 23, 2020
5559b31
fix > 1 qubit case
Cryoris Dec 23, 2020
8cea176
add comments
Cryoris Dec 23, 2020
fba77c8
add FAE specific tests
Cryoris Dec 23, 2020
561b5ab
Merge branch 'master' into ae
Cryoris Dec 30, 2020
7dced51
Merge branch 'master' into faster-ae
Cryoris Dec 30, 2020
1be7ca6
raise error for rescale on custom q operator
Cryoris Dec 30, 2020
cef280b
play with the oracles
Cryoris Jan 4, 2021
6f0537a
fix classicalregister > 1
Cryoris Jan 6, 2021
6306d28
use correct reflection and rm X gates around oracle
Cryoris Jan 6, 2021
f64d73f
fix construction of rescaled est. problem
Cryoris Jan 6, 2021
525daf8
fix phase in grover op
Cryoris Jan 6, 2021
9f3d21e
Merge branch 'master' into ae
Cryoris Jan 6, 2021
ca3ff07
adjust result objects
Cryoris Jan 6, 2021
2dad55d
Merge branch 'ae' of github.com:Cryoris/qiskit-terra into ae
Cryoris Jan 6, 2021
b27c22d
Merge branch 'ae' into faster-ae
Cryoris Jan 6, 2021
12a24f5
adjust fae result object
Cryoris Jan 6, 2021
3b6b05d
fix minus sign and lint
Cryoris Jan 6, 2021
15c7814
rm trailing whitespaces
Cryoris Jan 6, 2021
ea5e77f
Merge branch 'ae' into faster-ae
Cryoris Jan 6, 2021
cb79da4
fix tests
Cryoris Jan 6, 2021
9f0b6c3
Merge branch 'master' into ae
Cryoris Jan 7, 2021
e41869d
Merge branch 'ae' into faster-ae
Cryoris Jan 7, 2021
dbb84ec
fix lint
Cryoris Jan 7, 2021
7d78770
rm utf8 header
Cryoris Jan 7, 2021
c4d097c
move rescale to problem, add evalschedule to MLAE
Cryoris Jan 12, 2021
ad5d7d3
Merge branch 'master' into ae
Cryoris Jan 12, 2021
d3c647b
code review suggestions
Cryoris Jan 12, 2021
6e2406a
Merge branch 'master' into ae
Cryoris Jan 12, 2021
cb3ddda
fix doc build (hopefully)
Cryoris Jan 12, 2021
57dc5f3
add result classes to docs
Cryoris Jan 12, 2021
be4360f
Merge branch 'ae' of github.com:Cryoris/qiskit-terra into ae
Cryoris Jan 12, 2021
71abe9e
make grover op optional in setter
Cryoris Jan 12, 2021
4ac3265
Merge branch 'master' into ae
Cryoris Jan 12, 2021
0bb7c22
Merge branch 'master' into ae
Cryoris Jan 12, 2021
cbd6a0c
Merge branch 'master' into ae
Cryoris Jan 12, 2021
91f0398
Merge branch 'master' into ae
mergify[bot] Jan 13, 2021
1d817f1
Merge branch 'master' into ae
mergify[bot] Jan 13, 2021
c514272
Merge branch 'master' into ae
Cryoris Jan 13, 2021
80203ef
rm reno -- there will be a global one
Cryoris Jan 13, 2021
52dd6a2
Merge branch 'ae' of github.com:Cryoris/qiskit-terra into ae
Cryoris Jan 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions qiskit/algorithms/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,25 @@
Grover
GroverResult

Amplitude Estimators
++++++++++++++++++++

.. autosummary::
:toctree: ../stubs/
:nosignatures:

AmplitudeEstimator
AmplitudeEstimatorResult
AmplitudeEstimation
AmplitudeEstimationResult
EstimationProblem
FasterAmplitudeEstimation
FasterAmplitudeEstimationResult
IterativeAmplitudeEstimation
IterativeAmplitudeEstimationResult
MaximumLikelihoodAmplitudeEstimation
MaximumLikelihoodAmplitudeEstimationResult

Eigensolvers
++++++++++++
Algorithms to find eigenvalues of an operator. For chemistry these can be used to find excited
Expand Down Expand Up @@ -109,6 +128,14 @@
from .algorithm_result import AlgorithmResult
from .variational_algorithm import VariationalAlgorithm, VariationalResult
from .amplitude_amplifiers import Grover, GroverResult
from .amplitude_estimators import (
Comment thread
Cryoris marked this conversation as resolved.
AmplitudeEstimator, AmplitudeEstimatorResult,
AmplitudeEstimation, AmplitudeEstimationResult,
FasterAmplitudeEstimation, FasterAmplitudeEstimationResult,
IterativeAmplitudeEstimation, IterativeAmplitudeEstimationResult,
MaximumLikelihoodAmplitudeEstimation, MaximumLikelihoodAmplitudeEstimationResult,
EstimationProblem
)
from .eigen_solvers import NumPyEigensolver, Eigensolver, EigensolverResult
from .factorizers import Shor, ShorResult
from .minimum_eigen_solvers import (VQE, VQEResult, QAOA,
Expand All @@ -122,6 +149,17 @@
'VariationalResult',
'Grover',
'GroverResult',
'AmplitudeEstimator',
'AmplitudeEstimatorResult',
'AmplitudeEstimation',
'AmplitudeEstimationResult',
'FasterAmplitudeEstimation',
'FasterAmplitudeEstimationResult',
'IterativeAmplitudeEstimation',
'IterativeAmplitudeEstimationResult',
'MaximumLikelihoodAmplitudeEstimation',
'MaximumLikelihoodAmplitudeEstimationResult',
'EstimationProblem',
'NumPyEigensolver',
'Eigensolver',
'EigensolverResult',
Expand Down
34 changes: 34 additions & 0 deletions qiskit/algorithms/amplitude_estimators/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# This code is part of Qiskit.
#
# (C) Copyright IBM 2020.
#
# This code is licensed under the Apache License, Version 2.0. You may
# obtain a copy of this license in the LICENSE.txt file in the root directory
# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
#
# Any modifications or derivative works of this code must retain this
# copyright notice, and modified files need to carry a notice indicating
# that they have been altered from the originals.

"""The Amplitude Estimators package."""

from .amplitude_estimator import AmplitudeEstimator, AmplitudeEstimatorResult
from .ae import AmplitudeEstimation, AmplitudeEstimationResult
from .fae import FasterAmplitudeEstimation, FasterAmplitudeEstimationResult
from .iae import IterativeAmplitudeEstimation, IterativeAmplitudeEstimationResult
from .mlae import MaximumLikelihoodAmplitudeEstimation, MaximumLikelihoodAmplitudeEstimationResult
from .estimation_problem import EstimationProblem

__all__ = [
'AmplitudeEstimator',
'AmplitudeEstimatorResult',
'AmplitudeEstimation',
'AmplitudeEstimationResult',
'FasterAmplitudeEstimation',
'FasterAmplitudeEstimationResult',
'IterativeAmplitudeEstimation',
'IterativeAmplitudeEstimationResult',
'MaximumLikelihoodAmplitudeEstimation',
'MaximumLikelihoodAmplitudeEstimationResult',
'EstimationProblem',
]
Loading