Skip to content

Commit b0a0223

Browse files
committed
remove unnecessary .data
Signed-off-by: Thijs Baaijen <[email protected]>
1 parent 8697d7b commit b0a0223

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/power_grid_model_ds/_core/model/arrays/base/_string.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def _determine_column_widths(array: "FancyArray") -> list[tuple[str, int]]:
6363
return column_widths
6464

6565
for column in array.dtype.names:
66-
data = array.data[column]
66+
data = array[column]
6767
if data.size:
6868
# if float, round to 3 decimals
6969
if data.dtype.kind == "f":

src/power_grid_model_ds/_core/model/grids/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def branches(self) -> BranchArray:
133133
branch_dtype = BranchArray.get_dtype()
134134
branches = BranchArray()
135135
for array in self.branch_arrays:
136-
new_branch = BranchArray(data=array.data[list(branch_dtype.names)])
136+
new_branch = BranchArray(data=array[list(branch_dtype.names)])
137137
branches = fp.concatenate(branches, new_branch)
138138
return branches
139139

tests/unit/model/arrays/test_array.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_setattr(fancy_test_array: FancyTestArray):
5151
fancy_test_array.id = [9, 9, 9]
5252

5353
assert_array_equal(fancy_test_array.id, [9, 9, 9])
54-
assert_array_equal(fancy_test_array.data["id"], [9, 9, 9])
54+
assert_array_equal(fancy_test_array["id"], [9, 9, 9])
5555

5656

5757
def test_prevent_delete_numpy_attribute(fancy_test_array: FancyTestArray):
@@ -75,18 +75,18 @@ def test_getitem_unique_multiple_columns(fancy_test_array: FancyTestArray):
7575

7676

7777
def test_getitem_array_index(fancy_test_array: FancyTestArray):
78-
assert fancy_test_array[0].data.tolist() == fancy_test_array.data[0:1].tolist()
78+
assert fancy_test_array[0].tolist() == fancy_test_array[0:1].tolist()
7979

8080

8181
def test_getitem_array_nested_index(fancy_test_array: FancyTestArray):
8282
nested_array = fancy_test_array[0][0][0][0][0][0]
8383
assert isinstance(nested_array, FancyArray)
8484
assert nested_array.data.shape == (1,)
85-
assert nested_array.data.tolist() == fancy_test_array.data[0:1].tolist()
85+
assert nested_array.tolist() == fancy_test_array[0:1].tolist()
8686

8787

8888
def test_getitem_array_slice(fancy_test_array: FancyTestArray):
89-
assert fancy_test_array.data[0:2].tolist() == fancy_test_array[0:2].tolist()
89+
assert fancy_test_array[0:2].tolist() == fancy_test_array[0:2].tolist()
9090

9191

9292
def test_getitem_with_array_mask(fancy_test_array: FancyTestArray):

0 commit comments

Comments
 (0)