From a5bcf1233b8a38bc2366ae3a56c3fece33924987 Mon Sep 17 00:00:00 2001
From: Doug Strain <dstrain@google.com>
Date: Fri, 16 Feb 2024 13:57:52 -0800
Subject: [PATCH] Change str of ResultDict to print out repeated measurements

- ResultDict will now print out repeated measurements on each
line, as opposed to throwing ValueError

Fixes: #6447
---
 cirq-core/cirq/study/result.py      | 14 ++++++++++++++
 cirq-core/cirq/study/result_test.py |  6 ++++++
 2 files changed, 20 insertions(+)

diff --git a/cirq-core/cirq/study/result.py b/cirq-core/cirq/study/result.py
index 53158848d3a..0786e997240 100644
--- a/cirq-core/cirq/study/result.py
+++ b/cirq-core/cirq/study/result.py
@@ -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
@@ -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):
diff --git a/cirq-core/cirq/study/result_test.py b/cirq-core/cirq/study/result_test.py
index a335bed2859..04adccf2b14 100644
--- a/cirq-core/cirq/study/result_test.py
+++ b/cirq-core/cirq/study/result_test.py
@@ -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(