Skip to content

Merge condition check codes in compose() method #6983

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

Merged
mergify merged 5 commits into from
Oct 1, 2021
Merged

Merge condition check codes in compose() method #6983

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf06d66
Merge condition check codes in compose() method
QianJianhua1 Sep 6, 2021
1cc9df3
change comment
QianJianhua1 Sep 10, 2021
d153807
format comment
QianJianhua1 Sep 16, 2021
3d99143
Merge branch 'main' into compose
mergify[bot] Oct 1, 2021
5bc1226
Merge branch 'main' into compose
kdk Oct 1, 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
5 changes: 1 addition & 4 deletions qiskit/circuit/quantumcircuit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,15 +861,12 @@ def compose(

if front:
dest._data = mapped_instrs + dest._data
else:
dest._data += mapped_instrs

if front:
dest._parameter_table.clear()
for instr, _, _ in dest._data:
dest._update_parameter_table(instr)
else:
# just append new parameters
dest._data += mapped_instrs
for instr, _, _ in mapped_instrs:
dest._update_parameter_table(instr)

Expand Down