cirq-core 1.5.0.dev20241228161200__py3-none-any.whl → 1.5.0.dev20250102012912__py3-none-any.whl

cirq/_version.py

@@ -28,4 +28,4 @@ if sys.version_info < (3, 10, 0):  # pragma: no cover
         'of cirq (e.g. "python -m pip install cirq==1.1.*")'
     )
 
-__version__ = "1.5.0.dev20241228161200"
+__version__ = "1.5.0.dev20250102012912"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version():
-    assert cirq.__version__ == "1.5.0.dev20241228161200"
+    assert cirq.__version__ == "1.5.0.dev20250102012912"

cirq/ops/classically_controlled_operation.py

@@ -169,15 +169,12 @@ class ClassicallyControlledOperation(raw_types.Operation):
                 + ', '.join(str(c) for c in self._conditions)
                 + '])',
             ) + wire_symbols[1:]
-        exponent_qubit_index = None
-        if sub_info.exponent_qubit_index is not None:
-            exponent_qubit_index = sub_info.exponent_qubit_index + control_label_count
-        elif sub_info.exponent is not None:
-            exponent_qubit_index = control_label_count
+        exp_index = sub_info.exponent_qubit_index
+        if exp_index is None:
+            # None means at bottom, which means the last of the original wire symbols
+            exp_index = len(sub_info.wire_symbols) - 1
         return protocols.CircuitDiagramInfo(
-            wire_symbols=wire_symbols,
-            exponent=sub_info.exponent,
-            exponent_qubit_index=exponent_qubit_index,
+            wire_symbols=wire_symbols, exponent=sub_info.exponent, exponent_qubit_index=exp_index
         )
 
     def _json_dict_(self) -> Dict[str, Any]:

cirq/ops/classically_controlled_operation_test.py

@@ -1033,3 +1033,64 @@ def test_moment_diagram():
   │
     """.strip()
     )
+
+
+def test_diagram_exponents():
+    q0, q1 = cirq.LineQubit.range(2)
+    circuit = cirq.Circuit(
+        cirq.measure(q0, key='m'), (cirq.X(q1) ** 0.5).with_classical_controls('m')
+    )
+    cirq.testing.assert_has_diagram(
+        circuit,
+        """
+0: ───M───────────
+      ║
+1: ───╫───X^0.5───
+      ║   ║
+m: ═══@═══^═══════
+""",
+    )
+
+
+def test_diagram_exponents_cx():
+    q0, q1, q2 = cirq.LineQubit.range(3)
+    circuit = cirq.Circuit(
+        cirq.measure(q0, key='m'), (cirq.CX(q2, q1) ** 0.5).with_classical_controls('m')
+    )
+    cirq.testing.assert_has_diagram(
+        circuit,
+        """
+0: ───M───────────
+      ║
+1: ───╫───X^0.5───
+      ║   ║
+2: ───╫───@───────
+      ║   ║
+m: ═══@═══^═══════
+""",
+    )
+
+
+def test_diagram_exponents_multiple_keys():
+    q0, q1, q2 = cirq.LineQubit.range(3)
+    circuit = cirq.Circuit(
+        cirq.measure(q0, key='m0'),
+        cirq.measure(q1, key='m1'),
+        (cirq.X(q2) ** 0.5).with_classical_controls('m0', 'm1'),
+    )
+    cirq.testing.assert_has_diagram(
+        circuit,
+        """
+       ┌──┐
+0: ─────M─────────────
+        ║
+1: ─────╫M────────────
+        ║║
+2: ─────╫╫────X^0.5───
+        ║║    ║
+m0: ════@╬════^═══════
+         ║    ║
+m1: ═════@════^═══════
+       └──┘
+""",
+    )

{cirq_core-1.5.0.dev20241228161200.dist-info → cirq_core-1.5.0.dev20250102012912.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cirq-core
-Version: 1.5.0.dev20241228161200
+Version: 1.5.0.dev20250102012912
 Summary: A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits.
 Home-page: http://github.com/quantumlib/cirq
 Author: The Cirq Developers

{cirq_core-1.5.0.dev20241228161200.dist-info → cirq_core-1.5.0.dev20250102012912.dist-info}/RECORD

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=Qq3ZcfgD-Nb81cEppQdJqhAyrVqXKtfXZYGXT0p-Wh0,34718
 cirq/_doc.py,sha256=yDyWUD_2JDS0gShfGRb-rdqRt9-WeL7DhkqX7np0Nko,2879
 cirq/_import.py,sha256=p9gMHJscbtDDkfHOaulvd3Aer0pwUF5AXpL89XR8dNw,8402
 cirq/_import_test.py,sha256=6K_v0riZJXOXUphHNkGA8MY-JcmGlezFaGmvrNhm3OQ,1015
-cirq/_version.py,sha256=bq4_wnvhtareggCDxhJ1t20XB0S_eBc_WAU7eSQbdFE,1206
-cirq/_version_test.py,sha256=Drw6_yHNQkQQ_5pTI2vYDMr7yQmMwHg7_FgEig-bco4,147
+cirq/_version.py,sha256=hjDNzZiwSD3oblkH7KQS5JtKGD16TXuAu3uVEJV87h8,1206
+cirq/_version_test.py,sha256=MglY2GxB6Y-NcvW-8KMSoXN1aa9DZMDsQlDxlbe1vZs,147
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=03MVo6Y-UYrzt9CKHmwpiBLN2ixL6uSU-OWnKZXfG7k,13302
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -268,8 +268,8 @@ cirq/ops/arithmetic_operation.py,sha256=PBqIwOfADRlsij11Lo1ao_OZM-O8PDlObgZBxGKs
 cirq/ops/arithmetic_operation_test.py,sha256=axy8xy9IvDb-ATUV-LE1HNWRqCEz06VyZWVrLNOtXXI,4942
 cirq/ops/boolean_hamiltonian.py,sha256=li003lNq6zS8pNPTobqzfzYJvyvaIpCVo3wkliI6Hzk,14930
 cirq/ops/boolean_hamiltonian_test.py,sha256=1ey5yfYZPKZDsfM3jpCPAOpbPs_y8i4K_WvDK2d5_4Y,8518
-cirq/ops/classically_controlled_operation.py,sha256=dppPudKJQppYH3YsIWIfzy2-kJZYM5x6JivcC9tB3K0,9173
-cirq/ops/classically_controlled_operation_test.py,sha256=MNU0Adff4kTosqsrQ3PUT3ARcZee_PkchT6u0xDl8Qg,48039
+cirq/ops/classically_controlled_operation.py,sha256=3YhnNQa7wNyDN0A45z23nkWzl5cI95KMYukUb4cQa2c,9082
+cirq/ops/classically_controlled_operation_test.py,sha256=aNyt2RFWlC_v0PX5TVYWiSkvXB_-z-rkVrHu6ZjJdVg,49679
 cirq/ops/clifford_gate.py,sha256=qAKS0wqqoHljOF63treyR95I6H0yWFZBiHQoM4sLgSc,39350
 cirq/ops/clifford_gate_test.py,sha256=NF_if1X8LCMA9hy0vBO7lxvVPdumlvMMnI2XRQ-RLpk,37472
 cirq/ops/common_channels.py,sha256=uqgocTUhtuJ4VZI_9_3L34gBRTf1A10mByhZY4Q1fB8,38283
@@ -1189,8 +1189,8 @@ cirq/work/sampler.py,sha256=bE5tmVkcR6cZZMLETxDfHehdsYUMbx2RvBeIBetehI4,19187
 cirq/work/sampler_test.py,sha256=hL2UWx3dz2ukZVNxWftiKVvJcQoLplLZdQm-k1QcA40,13282
 cirq/work/zeros_sampler.py,sha256=x1C7cup66a43n-3tm8QjhiqJa07qcJW10FxNp9jJ59Q,2356
 cirq/work/zeros_sampler_test.py,sha256=JIkpBBFPJe5Ba4142vzogyWyboG1Q1ZAm0UVGgOoZn8,3279
-cirq_core-1.5.0.dev20241228161200.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.5.0.dev20241228161200.dist-info/METADATA,sha256=2GGctYrgbEDBPDvPhtZFNPWIAtnfjAPH_EVtm5i9c-w,1992
-cirq_core-1.5.0.dev20241228161200.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cirq_core-1.5.0.dev20241228161200.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.5.0.dev20241228161200.dist-info/RECORD,,
+cirq_core-1.5.0.dev20250102012912.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.5.0.dev20250102012912.dist-info/METADATA,sha256=s4xkfrGYnefP_1yKv-sW10ys8FedPI67_fcuBGnrpRw,1992
+cirq_core-1.5.0.dev20250102012912.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cirq_core-1.5.0.dev20250102012912.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.5.0.dev20250102012912.dist-info/RECORD,,