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.

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

Curve Analysis class #46

Merged
merged 85 commits into from
Jun 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
ab027ce
wip curve fit analysis
nkanazawa1989 May 10, 2021
6b35027
wip curve fit analysis
nkanazawa1989 May 10, 2021
d0e171f
curve_fit complete
nkanazawa1989 May 11, 2021
b34da0d
- unittest
nkanazawa1989 May 11, 2021
94859af
black
nkanazawa1989 May 11, 2021
37d3c1d
removed redundant code
nkanazawa1989 May 11, 2021
2f49726
fix unittest
nkanazawa1989 May 11, 2021
78fbd7a
fix docstring
nkanazawa1989 May 11, 2021
89aad76
fix docstring
nkanazawa1989 May 11, 2021
1639af6
wording fix
nkanazawa1989 May 12, 2021
52c99ea
Update qiskit_experiments/analysis/curve_analysis.py
nkanazawa1989 May 13, 2021
0420d1d
Update qiskit_experiments/analysis/curve_analysis.py
nkanazawa1989 May 13, 2021
a3dd099
Feedback from eggerdj
nkanazawa1989 May 13, 2021
9b5e631
Merge branch 'feature/curve_analysis' of github.com:nkanazawa1989/qis…
nkanazawa1989 May 13, 2021
1c4913c
readd 52c99ea and 0420d1d
nkanazawa1989 May 13, 2021
d944a29
Merge branch 'main' of github.com:Qiskit/qiskit-experiments into feat…
nkanazawa1989 May 13, 2021
eb29087
add fit functions
nkanazawa1989 May 13, 2021
c3ced56
lint
nkanazawa1989 May 13, 2021
1a56ee9
review by eggerdj r2
nkanazawa1989 May 13, 2021
8de5e37
add data processor keys in metadata
nkanazawa1989 May 13, 2021
54653bf
Merge branch 'main' of github.com:Qiskit/qiskit-experiments into feat…
nkanazawa1989 May 13, 2021
fc67de7
conform to #41
nkanazawa1989 May 13, 2021
2e771cb
feedback from chris1
nkanazawa1989 May 14, 2021
b1fc3f3
feedback from chris2
nkanazawa1989 May 14, 2021
a7ec055
feedback from chris3
nkanazawa1989 May 14, 2021
4ade742
lint
nkanazawa1989 May 14, 2021
8163c25
add fit option validation
nkanazawa1989 May 14, 2021
5f81337
add unittest and integration test
nkanazawa1989 May 14, 2021
bd6c80c
black & lint
nkanazawa1989 May 14, 2021
3ef1727
simplify the analysis class
nkanazawa1989 May 14, 2021
1f64b42
misc
nkanazawa1989 May 14, 2021
511b41f
add default figure generation
nkanazawa1989 May 18, 2021
656e8c7
lint
nkanazawa1989 May 18, 2021
588b8fa
add default value
nkanazawa1989 May 18, 2021
bc61385
fix docstring typo
nkanazawa1989 May 19, 2021
8fb16d2
Merge branch 'main' of github.com:Qiskit/qiskit-experiments into feat…
nkanazawa1989 May 19, 2021
a687529
remove outcome from default processing options
nkanazawa1989 May 19, 2021
39b4555
black and lint
nkanazawa1989 May 19, 2021
66c70c5
add processor training check
nkanazawa1989 May 19, 2021
63704f4
fix pre processing routine
nkanazawa1989 May 20, 2021
0d477fd
update rb analysis as an example
nkanazawa1989 May 23, 2021
e7e85e2
post process error handling when fit failed
nkanazawa1989 May 23, 2021
b6975e3
add axis label
nkanazawa1989 May 23, 2021
97a0f91
update axis formatting
nkanazawa1989 May 23, 2021
982b217
Merge branch 'main' of github.com:Qiskit/qiskit-experiments into feat…
nkanazawa1989 May 27, 2021
076d535
more integration with new options
nkanazawa1989 May 27, 2021
62ff987
update irb
nkanazawa1989 May 27, 2021
e967f1a
move class attributes to options
nkanazawa1989 May 27, 2021
93d30c3
review comment from Chris
nkanazawa1989 Jun 2, 2021
b765225
fix bug causes list indices must be ...
nkanazawa1989 Jun 2, 2021
00519d0
Analysis result formatting
nkanazawa1989 Jun 2, 2021
9f29971
Merge branch 'main' of github.com:Qiskit/qiskit-experiments into feat…
nkanazawa1989 Jun 2, 2021
add1253
update error docstring
nkanazawa1989 Jun 2, 2021
03ddadf
lint
nkanazawa1989 Jun 2, 2021
a7ddf5b
bug fix
nkanazawa1989 Jun 2, 2021
2cd9133
lint
nkanazawa1989 Jun 2, 2021
48e196b
Merge branch 'main' of github.com:Qiskit/qiskit-experiments into feat…
nkanazawa1989 Jun 2, 2021
0f37775
fix spect analysis
nkanazawa1989 Jun 2, 2021
dac51d8
fix composite analysis to use instance's analysis option
nkanazawa1989 Jun 3, 2021
bb50618
adjust curve figure appearance
nkanazawa1989 Jun 3, 2021
d71eaf1
black
nkanazawa1989 Jun 3, 2021
b1f5d19
Merge branch 'main' into feature/curve_analysis
chriseclectic Jun 3, 2021
7687c13
update data and option handling
nkanazawa1989 Jun 4, 2021
f2ce842
- private -> protected member
nkanazawa1989 Jun 4, 2021
0028669
update spectroscopy
nkanazawa1989 Jun 4, 2021
f9cb139
black & lint
nkanazawa1989 Jun 4, 2021
8c74427
rerun rb notebook
nkanazawa1989 Jun 4, 2021
c9e4361
Merge branch 'feature/curve_analysis' of github.com:nkanazawa1989/qis…
nkanazawa1989 Jun 4, 2021
9bcab0d
Merge branch 'main' into feature/curve_analysis
nkanazawa1989 Jun 4, 2021
a1be597
Update qiskit_experiments/analysis/curve_analysis.py
nkanazawa1989 Jun 7, 2021
1bbc199
Update qiskit_experiments/analysis/curve_analysis.py
nkanazawa1989 Jun 7, 2021
9f294b0
Update qiskit_experiments/analysis/curve_analysis.py
nkanazawa1989 Jun 7, 2021
8449161
Update qiskit_experiments/analysis/curve_analysis.py
nkanazawa1989 Jun 7, 2021
0729d6c
Update qiskit_experiments/analysis/curve_analysis.py
nkanazawa1989 Jun 7, 2021
e3bb022
- more docstring
nkanazawa1989 Jun 7, 2021
abe5ea4
black
nkanazawa1989 Jun 7, 2021
0e9e89f
add TODO comment
nkanazawa1989 Jun 7, 2021
bc060d7
add analysis class information to result data
nkanazawa1989 Jun 7, 2021
03bc71b
fix unittest
nkanazawa1989 Jun 7, 2021
b416c80
update spect analysis docstring
nkanazawa1989 Jun 7, 2021
aea9e26
Update qiskit_experiments/analysis/curve_analysis.py
nkanazawa1989 Jun 7, 2021
8f20f55
rb analysis class docstring
nkanazawa1989 Jun 8, 2021
03dafd4
format docstring
nkanazawa1989 Jun 8, 2021
871bfbb
Update qiskit_experiments/analysis/curve_analysis.py
nkanazawa1989 Jun 8, 2021
0da07b1
Merge branch 'main' into feature/curve_analysis
chriseclectic Jun 8, 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
224 changes: 103 additions & 121 deletions docs/tutorials/rb_example.ipynb

Large diffs are not rendered by default.

31 changes: 30 additions & 1 deletion qiskit_experiments/analysis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
process_curve_data
process_multi_curve_data


Plotting
========
.. autosummary::
Expand All @@ -38,7 +39,35 @@
plot_curve_fit
plot_errorbar
plot_scatter


Fit Functions
=============
.. autosummary::
:toctree: ../stubs/

fit_function.cos
fit_function.exponential_decay
fit_function.gaussian
fit_function.sin


Utility
=======
.. autosummary::
:toctree: ../stubs/

get_opt_error
get_opt_value
"""
from .curve_analysis import CurveAnalysis, SeriesDef

from .curve_fitting import curve_fit, multi_curve_fit, process_curve_data, process_multi_curve_data
from .curve_fitting import (
CurveAnalysisResult,
curve_fit,
multi_curve_fit,
process_curve_data,
process_multi_curve_data,
)
from .plotting import plot_curve_fit, plot_errorbar, plot_scatter
from .utils import get_opt_error, get_opt_value
Loading