From 78596ada831cd01cb7d883286c345f5a07177f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Gr=C3=A9us?= Date: Fri, 3 May 2024 02:53:54 +0200 Subject: [PATCH 1/4] perf: improved performance of `TabularDataset.__eq__` by a factor of up to 2 perf: slightly improved performance of `TabularDataset.__hash__` fix: corrected `TabularDataset.__sizeof__` --- src/safeds/data/labeled/containers/_tabular_dataset.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/safeds/data/labeled/containers/_tabular_dataset.py b/src/safeds/data/labeled/containers/_tabular_dataset.py index 81e73bf9b..f09d0112e 100644 --- a/src/safeds/data/labeled/containers/_tabular_dataset.py +++ b/src/safeds/data/labeled/containers/_tabular_dataset.py @@ -94,7 +94,7 @@ def __eq__(self, other: object) -> bool: return NotImplemented if self is other: return True - return self.target == other.target and self.features == other.features and self._table == other._table + return self.target == other.target and self.features == other.features and self._extras == other._extras def __hash__(self) -> int: """ @@ -105,7 +105,7 @@ def __hash__(self) -> int: hash: The hash value. """ - return _structural_hash(self.target, self.features, self._table) + return _structural_hash(self.target, self.features, self._extras) def __sizeof__(self) -> int: """ @@ -116,7 +116,7 @@ def __sizeof__(self) -> int: size: Size of this object in bytes. """ - return sys.getsizeof(self._target) + sys.getsizeof(self._features) + sys.getsizeof(self._table) + return sys.getsizeof(self._target) + sys.getsizeof(self._features) + sys.getsizeof(self._table) + sys.getsizeof(self._extras) # ------------------------------------------------------------------------------------------------------------------ # Properties From 1a38aea1f72253fb6a7373f2a0b4f242c8f9262c Mon Sep 17 00:00:00 2001 From: megalinter-bot <129584137+megalinter-bot@users.noreply.github.com> Date: Fri, 3 May 2024 00:56:57 +0000 Subject: [PATCH 2/4] style: apply automated linter fixes --- src/safeds/data/labeled/containers/_tabular_dataset.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/safeds/data/labeled/containers/_tabular_dataset.py b/src/safeds/data/labeled/containers/_tabular_dataset.py index f09d0112e..ba460b3da 100644 --- a/src/safeds/data/labeled/containers/_tabular_dataset.py +++ b/src/safeds/data/labeled/containers/_tabular_dataset.py @@ -116,7 +116,12 @@ def __sizeof__(self) -> int: size: Size of this object in bytes. """ - return sys.getsizeof(self._target) + sys.getsizeof(self._features) + sys.getsizeof(self._table) + sys.getsizeof(self._extras) + return ( + sys.getsizeof(self._target) + + sys.getsizeof(self._features) + + sys.getsizeof(self._table) + + sys.getsizeof(self._extras) + ) # ------------------------------------------------------------------------------------------------------------------ # Properties From d8881ab1c69fdb7a474b8720b02c7caac7e7603b Mon Sep 17 00:00:00 2001 From: Alexander <47296670+Marsmaennchen221@users.noreply.github.com> Date: Mon, 6 May 2024 15:12:04 +0200 Subject: [PATCH 3/4] Update src/safeds/data/labeled/containers/_tabular_dataset.py --- src/safeds/data/labeled/containers/_tabular_dataset.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/safeds/data/labeled/containers/_tabular_dataset.py b/src/safeds/data/labeled/containers/_tabular_dataset.py index ba460b3da..b8e0cad35 100644 --- a/src/safeds/data/labeled/containers/_tabular_dataset.py +++ b/src/safeds/data/labeled/containers/_tabular_dataset.py @@ -119,7 +119,6 @@ def __sizeof__(self) -> int: return ( sys.getsizeof(self._target) + sys.getsizeof(self._features) - + sys.getsizeof(self._table) + sys.getsizeof(self._extras) ) From c2bfe4b9992c330d97329d2a4a16f03ab0bbe7e6 Mon Sep 17 00:00:00 2001 From: megalinter-bot <129584137+megalinter-bot@users.noreply.github.com> Date: Mon, 6 May 2024 13:13:38 +0000 Subject: [PATCH 4/4] style: apply automated linter fixes --- src/safeds/data/labeled/containers/_tabular_dataset.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/safeds/data/labeled/containers/_tabular_dataset.py b/src/safeds/data/labeled/containers/_tabular_dataset.py index b8e0cad35..87495812f 100644 --- a/src/safeds/data/labeled/containers/_tabular_dataset.py +++ b/src/safeds/data/labeled/containers/_tabular_dataset.py @@ -116,11 +116,7 @@ def __sizeof__(self) -> int: size: Size of this object in bytes. """ - return ( - sys.getsizeof(self._target) - + sys.getsizeof(self._features) - + sys.getsizeof(self._extras) - ) + return sys.getsizeof(self._target) + sys.getsizeof(self._features) + sys.getsizeof(self._extras) # ------------------------------------------------------------------------------------------------------------------ # Properties