Skip to content
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

Access _row and _col attributes directly in GridQubit instead of using properties #6075

Merged
merged 1 commit into from
Apr 22, 2023
Merged

Access _row and _col attributes directly in GridQubit instead of using properties #6075

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions cirq-core/cirq/devices/grid_qubit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ def col(self) -> int:
return self._col

def with_dimension(self, dimension: int) -> 'GridQid':
return GridQid(self.row, self.col, dimension=dimension)
return GridQid(self._row, self._col, dimension=dimension)

def is_adjacent(self, other: 'cirq.Qid') -> bool:
"""Determines if two qubits are adjacent qubits."""
return (
isinstance(other, GridQubit)
and abs(self.row - other.row) + abs(self.col - other.col) == 1
and abs(self._row - other._row) + abs(self._col - other._col) == 1
)

def neighbors(self, qids: Optional[Iterable[ops.Qid]] = None) -> Set['_BaseGridQid']:
Expand All @@ -71,7 +71,7 @@ def _with_row_col(self, row: int, col: int) -> Self:
"""Returns a qid with the same type but a different coordinate."""

def __complex__(self) -> complex:
return self.col + 1j * self.row
return self._col + 1j * self._row

def __add__(self, other: Union[Tuple[int, int], Self]) -> Self:
if isinstance(other, _BaseGridQid):
Expand All @@ -80,7 +80,7 @@ def __add__(self, other: Union[Tuple[int, int], Self]) -> Self:
"Can only add GridQids with identical dimension. "
f"Got {self.dimension} and {other.dimension}"
)
return self._with_row_col(row=self.row + other.row, col=self.col + other.col)
return self._with_row_col(row=self._row + other._row, col=self._col + other._col)
if not (
isinstance(other, (tuple, np.ndarray))
and len(other) == 2
Expand All @@ -90,7 +90,7 @@ def __add__(self, other: Union[Tuple[int, int], Self]) -> Self:
'Can only add integer tuples of length 2 to '
f'{type(self).__name__}. Instead was {other}'
)
return self._with_row_col(row=self.row + other[0], col=self.col + other[1])
return self._with_row_col(row=self._row + other[0], col=self._col + other[1])

def __sub__(self, other: Union[Tuple[int, int], Self]) -> Self:
if isinstance(other, _BaseGridQid):
Expand All @@ -99,7 +99,7 @@ def __sub__(self, other: Union[Tuple[int, int], Self]) -> Self:
"Can only subtract GridQids with identical dimension. "
f"Got {self.dimension} and {other.dimension}"
)
return self._with_row_col(row=self.row - other.row, col=self.col - other.col)
return self._with_row_col(row=self._row - other._row, col=self._col - other._col)
if not (
isinstance(other, (tuple, np.ndarray))
and len(other) == 2
Expand All @@ -109,7 +109,7 @@ def __sub__(self, other: Union[Tuple[int, int], Self]) -> Self:
"Can only subtract integer tuples of length 2 to "
f"{type(self).__name__}. Instead was {other}"
)
return self._with_row_col(row=self.row - other[0], col=self.col - other[1])
return self._with_row_col(row=self._row - other[0], col=self._col - other[1])

def __radd__(self, other: Tuple[int, int]) -> Self:
return self + other
Expand All @@ -118,7 +118,7 @@ def __rsub__(self, other: Tuple[int, int]) -> Self:
return -self + other

def __neg__(self) -> Self:
return self._with_row_col(row=-self.row, col=-self.col)
return self._with_row_col(row=-self._row, col=-self._col)


class GridQid(_BaseGridQid):
Expand Down Expand Up @@ -255,16 +255,16 @@ def from_diagram(diagram: str, dimension: int) -> List['GridQid']:
return [GridQid(*c, dimension=dimension) for c in coords]

def __repr__(self) -> str:
return f"cirq.GridQid({self.row}, {self.col}, dimension={self.dimension})"
return f"cirq.GridQid({self._row}, {self._col}, dimension={self.dimension})"

def __str__(self) -> str:
return f"q({self.row}, {self.col}) (d={self.dimension})"
return f"q({self._row}, {self._col}) (d={self.dimension})"

def _circuit_diagram_info_(
self, args: 'cirq.CircuitDiagramInfoArgs'
) -> 'cirq.CircuitDiagramInfo':
return protocols.CircuitDiagramInfo(
wire_symbols=(f"({self.row}, {self.col}) (d={self.dimension})",)
wire_symbols=(f"({self._row}, {self._col}) (d={self.dimension})",)
)

def _json_dict_(self) -> Dict[str, Any]:
Expand Down Expand Up @@ -305,13 +305,13 @@ def __hash__(self) -> int:
def __eq__(self, other):
# Explicitly implemented for performance (vs delegating to Qid).
if isinstance(other, GridQubit):
return self.row == other.row and self.col == other.col
return self._row == other._row and self._col == other._col
return NotImplemented

def __ne__(self, other):
# Explicitly implemented for performance (vs delegating to Qid).
if isinstance(other, GridQubit):
return self.row != other.row or self.col != other.col
return self._row != other._row or self._col != other._col
return NotImplemented

@property
Expand Down Expand Up @@ -412,15 +412,15 @@ def from_diagram(diagram: str) -> List['GridQubit']:
return [GridQubit(*c) for c in coords]

def __repr__(self) -> str:
return f"cirq.GridQubit({self.row}, {self.col})"
return f"cirq.GridQubit({self._row}, {self._col})"

def __str__(self) -> str:
return f"q({self.row}, {self.col})"
return f"q({self._row}, {self._col})"

def _circuit_diagram_info_(
self, args: 'cirq.CircuitDiagramInfoArgs'
) -> 'cirq.CircuitDiagramInfo':
return protocols.CircuitDiagramInfo(wire_symbols=(f"({self.row}, {self.col})",))
return protocols.CircuitDiagramInfo(wire_symbols=(f"({self._row}, {self._col})",))

def _json_dict_(self) -> Dict[str, Any]:
return protocols.obj_to_dict_helper(self, ['row', 'col'])
Expand Down