cirq-core 1.5.0.dev20241206010229__py3-none-any.whl → 1.5.0.dev20241207174114__py3-none-any.whl

cirq/__init__.py

@@ -494,6 +494,7 @@ from cirq.sim import (
 )
 
 from cirq.study import (
+    Concat as Concat,
     dict_to_product_sweep as dict_to_product_sweep,
     dict_to_zip_sweep as dict_to_zip_sweep,
     ExpressionMap as ExpressionMap,

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.dev20241206010229"
+__version__ = "1.5.0.dev20241207174114"

cirq/_version_test.py

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

cirq/json_resolver_cache.py

@@ -120,6 +120,7 @@ def _class_resolver_dictionary() -> Dict[str, ObjectFactory]:
         'CliffordState': cirq.CliffordState,
         'CliffordTableau': cirq.CliffordTableau,
         'CNotPowGate': cirq.CNotPowGate,
+        'Concat': cirq.Concat,
         'ConstantQubitNoiseModel': cirq.ConstantQubitNoiseModel,
         'ControlledGate': cirq.ControlledGate,
         'ControlledOperation': cirq.ControlledOperation,

cirq/protocols/json_test_data/Concat.json

@@ -0,0 +1,19 @@
+{
+    "cirq_type": "Concat",
+    "sweeps": [
+      {
+        "cirq_type": "Linspace",
+        "key": "a",
+        "start": 0,
+        "stop": 1,
+        "length": 2
+      },
+      {
+        "cirq_type": "Linspace",
+        "key": "a",
+        "start": 0,
+        "stop": 2,
+        "length": 4
+      }
+    ]
+  }

cirq/protocols/json_test_data/Concat.repr

@@ -0,0 +1 @@
+cirq.Concat(cirq.Linspace('a', start=0, stop=1, length=2), cirq.Linspace('a', start=0, stop=2, length=4))

cirq/study/__init__.py

@@ -36,6 +36,7 @@ from cirq.study.sweepable import (
 )
 
 from cirq.study.sweeps import (
+    Concat as Concat,
     Linspace as Linspace,
     ListSweep as ListSweep,
     Points as Points,

cirq/study/sweeps.py

@@ -276,6 +276,63 @@ class Product(Sweep):
         return Product(*factors)
 
 
+class Concat(Sweep):
+    """Concatenates multiple to a new sweep.
+
+    All sweeps must share the same descriptors.
+
+    If one sweep assigns 'a' to the values 0, 1, 2, and another sweep assigns
+    'a' to the values 3, 4, 5, the concatenation produces a sweep assigning
+    'a' to the values 0, 1, 2, 3, 4, 5 in sequence.
+    """
+
+    def __init__(self, *sweeps: Sweep) -> None:
+        if not sweeps:
+            raise ValueError("Concat requires at least one sweep.")
+
+        # Validate consistency across sweeps
+        first_sweep = sweeps[0]
+        for sweep in sweeps[1:]:
+            if sweep.keys != first_sweep.keys:
+                raise ValueError("All sweeps must have the same descriptors.")
+
+        self.sweeps = sweeps
+
+    def __eq__(self, other):
+        if not isinstance(other, Concat):
+            return NotImplemented
+        return self.sweeps == other.sweeps
+
+    def __hash__(self):
+        return hash(tuple(self.sweeps))
+
+    @property
+    def keys(self) -> List['cirq.TParamKey']:
+        return self.sweeps[0].keys
+
+    def __len__(self) -> int:
+        return sum(len(sweep) for sweep in self.sweeps)
+
+    def param_tuples(self) -> Iterator[Params]:
+        for sweep in self.sweeps:
+            yield from sweep.param_tuples()
+
+    def __repr__(self) -> str:
+        sweeps_repr = ', '.join(repr(sweep) for sweep in self.sweeps)
+        return f'cirq.Concat({sweeps_repr})'
+
+    def __str__(self) -> str:
+        sweeps_repr = ', '.join(repr(s) for s in self.sweeps)
+        return f'Concat({sweeps_repr})'
+
+    def _json_dict_(self) -> Dict[str, Any]:
+        return protocols.obj_to_dict_helper(self, ['sweeps'])
+
+    @classmethod
+    def _from_json_dict_(cls, sweeps, **kwargs):
+        return Concat(*sweeps)
+
+
 class Zip(Sweep):
     """Zip product (direct sum) of one or more sweeps.
 

cirq/study/sweeps_test.py

@@ -246,6 +246,8 @@ def test_equality():
     et.make_equality_group(lambda: cirq.Linspace('b', 0, 10, 11))
     et.make_equality_group(lambda: cirq.Points('a', list(range(11))))
     et.make_equality_group(lambda: cirq.Points('b', list(range(11))))
+    et.make_equality_group(lambda: cirq.Concat(cirq.Linspace('a', 0, 10, 11)))
+    et.make_equality_group(lambda: cirq.Concat(cirq.Linspace('b', 0, 10, 11)))
 
     # Product and Zip sweeps can also be equated.
     et.make_equality_group(lambda: cirq.Linspace('a', 0, 5, 6) * cirq.Linspace('b', 10, 15, 6))
@@ -373,3 +375,105 @@ def test_dict_to_zip_sweep():
     assert cirq.dict_to_zip_sweep({'t': [0, 1], 's': [2, 3], 'r': 4}) == (
         cirq.Zip(cirq.Points('t', [0, 1]), cirq.Points('s', [2, 3]), cirq.Points('r', [4]))
     )
+
+
+def test_concat_linspace():
+    sweep1 = cirq.Linspace('a', 0.34, 9.16, 4)
+    sweep2 = cirq.Linspace('a', 10, 20, 4)
+    concat_sweep = cirq.Concat(sweep1, sweep2)
+
+    assert len(concat_sweep) == 8
+    assert concat_sweep.keys == ['a']
+    params = list(concat_sweep.param_tuples())
+    assert len(params) == 8
+    assert params[0] == (('a', 0.34),)
+    assert params[3] == (('a', 9.16),)
+    assert params[4] == (('a', 10.0),)
+    assert params[7] == (('a', 20.0),)
+
+
+def test_concat_points():
+    sweep1 = cirq.Points('a', [1, 2])
+    sweep2 = cirq.Points('a', [3, 4, 5])
+    concat_sweep = cirq.Concat(sweep1, sweep2)
+
+    assert concat_sweep.keys == ['a']
+    assert len(concat_sweep) == 5
+    params = list(concat_sweep)
+    assert len(params) == 5
+    assert _values(concat_sweep, 'a') == [1, 2, 3, 4, 5]
+
+
+def test_concat_many_points():
+    sweep1 = cirq.Points('a', [1, 2])
+    sweep2 = cirq.Points('a', [3, 4, 5])
+    sweep3 = cirq.Points('a', [6, 7, 8])
+    concat_sweep = cirq.Concat(sweep1, sweep2, sweep3)
+
+    assert len(concat_sweep) == 8
+    params = list(concat_sweep)
+    assert len(params) == 8
+    assert _values(concat_sweep, 'a') == [1, 2, 3, 4, 5, 6, 7, 8]
+
+
+def test_concat_mixed():
+    sweep1 = cirq.Linspace('a', 0, 1, 3)
+    sweep2 = cirq.Points('a', [2, 3])
+    concat_sweep = cirq.Concat(sweep1, sweep2)
+
+    assert len(concat_sweep) == 5
+    assert _values(concat_sweep, 'a') == [0.0, 0.5, 1.0, 2, 3]
+
+
+def test_concat_inconsistent_keys():
+    sweep1 = cirq.Linspace('a', 0, 1, 3)
+    sweep2 = cirq.Points('b', [2, 3])
+
+    with pytest.raises(ValueError, match="All sweeps must have the same descriptors"):
+        cirq.Concat(sweep1, sweep2)
+
+
+def test_concat_sympy_symbol():
+    a = sympy.Symbol('a')
+    sweep1 = cirq.Linspace(a, 0, 1, 3)
+    sweep2 = cirq.Points(a, [2, 3])
+    concat_sweep = cirq.Concat(sweep1, sweep2)
+
+    assert len(concat_sweep) == 5
+    assert _values(concat_sweep, 'a') == [0.0, 0.5, 1.0, 2, 3]
+
+
+def test_concat_repr_and_str():
+    sweep1 = cirq.Linspace('a', 0, 1, 3)
+    sweep2 = cirq.Points('a', [2, 3])
+    concat_sweep = cirq.Concat(sweep1, sweep2)
+
+    expected_repr = (
+        "cirq.Concat(cirq.Linspace('a', start=0, stop=1, length=3), cirq.Points('a', [2, 3]))"
+    )
+    expected_str = "Concat(cirq.Linspace('a', start=0, stop=1, length=3), cirq.Points('a', [2, 3]))"
+
+    assert repr(concat_sweep) == expected_repr
+    assert str(concat_sweep) == expected_str
+
+
+def test_concat_large_sweep():
+    sweep1 = cirq.Points('a', list(range(101)))
+    sweep2 = cirq.Points('a', list(range(101, 202)))
+    concat_sweep = cirq.Concat(sweep1, sweep2)
+
+    assert len(concat_sweep) == 202
+    assert _values(concat_sweep, 'a') == list(range(101)) + list(range(101, 202))
+
+
+def test_concat_different_keys_raises():
+    sweep1 = cirq.Linspace('a', 0, 1, 3)
+    sweep2 = cirq.Points('b', [2, 3])
+
+    with pytest.raises(ValueError, match="All sweeps must have the same descriptors."):
+        _ = cirq.Concat(sweep1, sweep2)
+
+
+def test_concat_empty_sweep_raises():
+    with pytest.raises(ValueError, match="Concat requires at least one sweep."):
+        _ = cirq.Concat()

{cirq_core-1.5.0.dev20241206010229.dist-info → cirq_core-1.5.0.dev20241207174114.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cirq-core
-Version: 1.5.0.dev20241206010229
+Version: 1.5.0.dev20241207174114
 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.dev20241206010229.dist-info → cirq_core-1.5.0.dev20241207174114.dist-info}/RECORD

@@ -1,13 +1,13 @@
-cirq/__init__.py,sha256=xi-1fue3KEYu9kIQauVX0XNR6gvoBkz_MoZGENXfMpc,28062
+cirq/__init__.py,sha256=Qi4qkUVdT7je-13VrMLdVVcF1RPHI3nR8oTUs90l9OI,28084
 cirq/_compat.py,sha256=wl0Z7OYLpt07Vjts5l82jWjZE3WTy3uMHXaHwLwZKuo,29406
 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=7_be8P_bChJH6SBFNPc1pL0BRp46f3d5OhuB5lHtuhs,1206
-cirq/_version_test.py,sha256=tYFenKHls7GFAObJxWirK86YeptOpeBWIiWVNWVC3Ho,147
+cirq/_version.py,sha256=A1qNRdgJODR_Wy5kBLRlVgJNks--0in6YvmUS5F2rpw,1206
+cirq/_version_test.py,sha256=mvMHDO3Ij5dj8js-w0cA8h2l4jZ7ohKrSCr7admuD6Q,147
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
-cirq/json_resolver_cache.py,sha256=ytePZtNZgKjOF2NiVpUTuotB-JKZmQNOFIFdvXqsxHw,13271
+cirq/json_resolver_cache.py,sha256=03MVo6Y-UYrzt9CKHmwpiBLN2ixL6uSU-OWnKZXfG7k,13302
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
 cirq/circuits/__init__.py,sha256=HKunqRpZoDmjy1IiK9Cn84MTGT84_PMeQ5VDCPafcWk,1335
 cirq/circuits/_block_diagram_drawer.py,sha256=06ceNV01cMx4irIGYnztfLt_HDNhK3AwfsiNh686hjU,9510
@@ -501,6 +501,8 @@ cirq/protocols/json_test_data/CliffordState.repr,sha256=irZZrWXfNYM-bjA4IqHhgJMl
 cirq/protocols/json_test_data/CliffordState.repr_inward,sha256=irZZrWXfNYM-bjA4IqHhgJMlTDlG6rtlP34t9ix71co,52
 cirq/protocols/json_test_data/CliffordTableau.json,sha256=ErcX0cp1XEM28GvuVCxbWNLOx7OfVQtsB6cYwGOHfms,209
 cirq/protocols/json_test_data/CliffordTableau.repr,sha256=BA-VCQ1WeZNyhIwlQLeZUiLCeU2mTVuY4LA9Og0tJZE,34
+cirq/protocols/json_test_data/Concat.json,sha256=yBNdsxH1jxEcLPnGpW1Ndji-68C1N8M-CQnco0WWCWA,311
+cirq/protocols/json_test_data/Concat.repr,sha256=WG2vmD9Z1odmwXJA2N68cFjz4DkkoHJYPGNzOc0NUWo,105
 cirq/protocols/json_test_data/ConstantQubitNoiseModel.json,sha256=dbe4xJvXXIOv1KyjGJXlvJ3kd3W7XEHQt5xFY0bGEtk,144
 cirq/protocols/json_test_data/ConstantQubitNoiseModel.repr,sha256=OIRaaB6GlqJY_8TkEwvZQ8VpbPNi6fWii1vhTJn0t4o,36
 cirq/protocols/json_test_data/ControlledGate.json,sha256=CjFsQaCrr84mZ-fD2els2AQ0QZNlK9Jv4AP0znV02kA,757
@@ -933,7 +935,7 @@ cirq/sim/clifford/stabilizer_simulation_state.py,sha256=mqADFqLHg2Kit9EsuhNp8ntZ
 cirq/sim/clifford/stabilizer_simulation_state_test.py,sha256=dsphoXTaIwRCjprGJQirSs0qeVKHlni_pt_GZJn5Vpc,4317
 cirq/sim/clifford/stabilizer_state_ch_form.py,sha256=vyyIKLcI-_Ox1QQbUSbTj_Zo4hotpDwvxQQ2u7zJxns,14049
 cirq/sim/clifford/stabilizer_state_ch_form_test.py,sha256=FK0IsyrTfT6ZPZeBYmyPG2xpzUT7RG6P6UQw_61c6kU,3149
-cirq/study/__init__.py,sha256=ENnCMMGxX50df5n-uM7aHDQoXGoMvY_XXroNdBxJZX4,1625
+cirq/study/__init__.py,sha256=OyJhZjBiEkNbtSuSZaOwHGwwnOIGgnn-W8ec0xHhHBI,1647
 cirq/study/flatten_expressions.py,sha256=B-CQcj8eSWAJPIff5bQiZGobnYx8kB0c5WTLowfCVXo,15604
 cirq/study/flatten_expressions_test.py,sha256=6e7pTkaBrZW-EmG4teZxcwemqnxCtJW3kq2KOlPcwW8,6078
 cirq/study/resolver.py,sha256=dDEGIwWueP7ZICbEAUc6G5li2UoTFkPS9Qs2dSDCbV8,11906
@@ -942,8 +944,8 @@ cirq/study/result.py,sha256=KzjpjvDVCTFjMyq9r91pZSYdtcD1x3yj8jP_StlOSMg,19285
 cirq/study/result_test.py,sha256=fq5BH78RswfTiYjMchJ4wEDDyaJu0QdJoGobMjKDeSI,15591
 cirq/study/sweepable.py,sha256=hHBXn5MQZJawiiIXWZdn_qygbPeIFtt300wIqVHiYl8,4356
 cirq/study/sweepable_test.py,sha256=ENv03_GJmbUc_ukJoqfgG-H5C_yyx1jCcvxohSMyQVU,5502
-cirq/study/sweeps.py,sha256=zKz8hmLnpukNzUp7YjsrD8wEGxf2peX19522kUKUfWI,19850
-cirq/study/sweeps_test.py,sha256=YdXHzZO10OHoPTU2ifmsfH7KByIJeeANy91AHqX8nwg,12135
+cirq/study/sweeps.py,sha256=v7wP0hh528tK4LRbNJU848ypbb2jTQgPZKY2oz7o7vA,21599
+cirq/study/sweeps_test.py,sha256=rgnU7zB7hxOXLbalYJb0yy_QPCOd-LxKgUir1bcyC2s,15426
 cirq/testing/__init__.py,sha256=m_HUdHcJ3HcKpGQBKCwZ6E6QSkKpIN-dUGr4e75o4tY,6217
 cirq/testing/circuit_compare.py,sha256=nBQES45wLVThOqC3WrPrYKLQP7HQ2pH5DjlJ5bHkrtU,19176
 cirq/testing/circuit_compare_test.py,sha256=AduZCzwBNFCYrjEpyS1DvIR6jU8GaFqQBBgPXyIALoU,19743
@@ -1187,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.dev20241206010229.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.5.0.dev20241206010229.dist-info/METADATA,sha256=rlITYQgXpVq8UKA48VZiP3PexthUixGBwWyvJmKiu7I,1992
-cirq_core-1.5.0.dev20241206010229.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cirq_core-1.5.0.dev20241206010229.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.5.0.dev20241206010229.dist-info/RECORD,,
+cirq_core-1.5.0.dev20241207174114.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.5.0.dev20241207174114.dist-info/METADATA,sha256=GXOgvkVTPhl38qPeUxSwCABUFmCW-Dow6rJFVCrWvz8,1992
+cirq_core-1.5.0.dev20241207174114.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cirq_core-1.5.0.dev20241207174114.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.5.0.dev20241207174114.dist-info/RECORD,,