Skip to content

Commit

Permalink
Merge branch 'main' into clean-some-deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
pavoljuhas authored Feb 16, 2024
2 parents f6254ff + a8bd9a5 commit dee4217
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 9 deletions.
6 changes: 1 addition & 5 deletions cirq-core/cirq/protocols/has_stabilizer_effect_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,7 @@ def _strat_has_stabilizer_effect_from_unitary(val: Any) -> Optional[bool]:


def _strat_has_stabilizer_effect_from_decompose(val: Any) -> Optional[bool]:
qid_shape = qid_shape_protocol.qid_shape(val, default=None)
if qid_shape is None or len(qid_shape) <= 3:
return None

decomposition = decompose_protocol.decompose_once(val, default=None)
decomposition, _, _ = decompose_protocol._try_decompose_into_operations_and_qubits(val)
if decomposition is None:
return None
for op in decomposition:
Expand Down
17 changes: 13 additions & 4 deletions cirq-core/cirq/protocols/has_stabilizer_effect_protocol_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ def _has_stabilizer_effect_(self):
return True


q = cirq.LineQubit(0)


class EmptyOp(cirq.Operation):
"""A trivial operation."""

def __init__(self, q: cirq.Qid = cirq.LineQubit(0)):
self.q = q

@property
def qubits(self):
return (q,)
return (self.q,)

def with_qubits(self, *new_qubits): # pragma: no cover
return self
Expand Down Expand Up @@ -97,6 +97,14 @@ def qubits(self):
return cirq.LineQubit.range(self.unitary.shape[0].bit_length() - 1)


class GateDecomposes(cirq.Gate):
def _num_qubits_(self):
return 1

def _decompose_(self, qubits):
yield YesOp(*qubits)


def test_inconclusive():
assert not cirq.has_stabilizer_effect(object())
assert not cirq.has_stabilizer_effect('boo')
Expand Down Expand Up @@ -146,3 +154,4 @@ def test_via_decompose():
assert not cirq.has_stabilizer_effect(
OpWithUnitary(cirq.unitary(cirq.Circuit(cirq.T.on_each(cirq.LineQubit.range(4)))))
)
assert cirq.has_stabilizer_effect(GateDecomposes())
14 changes: 14 additions & 0 deletions cirq-core/cirq/study/result.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,18 @@ def _keyed_repeated_bitstrings(vals: Mapping[str, np.ndarray]) -> str:
return '\n'.join(keyed_bitstrings)


def _keyed_repeated_records(vals: Mapping[str, np.ndarray]) -> str:
keyed_bitstrings = []
for key in sorted(vals.keys()):
reps = vals[key]
n = reps.shape[2]
num_records = reps.shape[1]
for j in range(num_records):
all_bits = ', '.join(_bitstring(reps[:, j, i]) for i in range(n))
keyed_bitstrings.append(f'{key}={all_bits}')
return '\n'.join(keyed_bitstrings)


def _key_to_str(key: TMeasurementKey) -> str:
if isinstance(key, str):
return key
Expand Down Expand Up @@ -388,6 +400,8 @@ def _repr_pretty_(self, p: Any, cycle: bool) -> None:
p.text(str(self))

def __str__(self) -> str:
if self._records:
return _keyed_repeated_records(self.records)
return _keyed_repeated_bitstrings(self.measurements)

def _json_dict_(self):
Expand Down
6 changes: 6 additions & 0 deletions cirq-core/cirq/study/result_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@ def test_str():
)
assert str(result) == 'ab=13579, 2 4 6 8 10\nc=01234'

result = cirq.ResultDict(records={'c': np.array([[[True], [True]]])})
assert str(result) == 'c=1\nc=1'

result = cirq.ResultDict(records={'c': np.array([[[True, False], [False, True]]])})
assert str(result) == 'c=1, 0\nc=0, 1'


def test_df():
result = cirq.ResultDict(
Expand Down

0 comments on commit dee4217

Please sign in to comment.