diff --git a/docs/tutorials/data_processing.ipynb b/docs/tutorials/data_processing.ipynb index 9b8e04b34..bed2c6280 100644 --- a/docs/tutorials/data_processing.ipynb +++ b/docs/tutorials/data_processing.ipynb @@ -49,7 +49,7 @@ "execution_count": null, "outputs": [], "source": [ - "titanic_slice = titanic.slice(end=10)\n", + "titanic_slice = titanic.slice_rows(end=10)\n", "\n", "titanic_slice # just to show the output" ], diff --git a/docs/tutorials/data_visualization.ipynb b/docs/tutorials/data_visualization.ipynb index 4e2f9034e..355e411ab 100644 --- a/docs/tutorials/data_visualization.ipynb +++ b/docs/tutorials/data_visualization.ipynb @@ -46,7 +46,7 @@ "execution_count": null, "outputs": [], "source": [ - "titanic.slice(end=10)" + "titanic.slice_rows(end=10)" ], "metadata": { "collapsed": false, diff --git a/docs/tutorials/machine_learning.ipynb b/docs/tutorials/machine_learning.ipynb index bd8867b93..7a6eaf9a6 100644 --- a/docs/tutorials/machine_learning.ipynb +++ b/docs/tutorials/machine_learning.ipynb @@ -21,7 +21,6 @@ "execution_count": null, "outputs": [], "source": [ - "from safeds.data.tabular.containers import TaggedTable\n", "from safeds.data.tabular.containers import Table\n", "\n", "training_set = Table({\n", diff --git a/src/safeds/data/tabular/containers/_table.py b/src/safeds/data/tabular/containers/_table.py index 03a8dec26..fed28feac 100644 --- a/src/safeds/data/tabular/containers/_table.py +++ b/src/safeds/data/tabular/containers/_table.py @@ -783,7 +783,7 @@ def shuffle_rows(self) -> Table: new_df.columns = self._schema.get_column_names() return Table(new_df) - def slice( + def slice_rows( self, start: Optional[int] = None, end: Optional[int] = None, @@ -901,8 +901,8 @@ def split(self, percentage_in_first: float) -> tuple[Table, Table]: if percentage_in_first <= 0 or percentage_in_first >= 1: raise ValueError("the given percentage is not in range") return ( - self.slice(0, round(percentage_in_first * self.count_rows())), - self.slice(round(percentage_in_first * self.count_rows())), + self.slice_rows(0, round(percentage_in_first * self.count_rows())), + self.slice_rows(round(percentage_in_first * self.count_rows())), ) def tag_columns(self, target_name: str, feature_names: Optional[list[str]] = None) -> TaggedTable: diff --git a/tests/safeds/data/tabular/containers/_table/test_slice.py b/tests/safeds/data/tabular/containers/_table/test_slice_rows.py similarity index 64% rename from tests/safeds/data/tabular/containers/_table/test_slice.py rename to tests/safeds/data/tabular/containers/_table/test_slice_rows.py index 1dd791044..f5dadfd54 100644 --- a/tests/safeds/data/tabular/containers/_table/test_slice.py +++ b/tests/safeds/data/tabular/containers/_table/test_slice_rows.py @@ -3,31 +3,31 @@ from safeds.data.tabular.containers import Table -def test_slice_valid() -> None: +def test_slice_rows_valid() -> None: table = Table(pd.DataFrame(data={"col1": [1, 2, 1], "col2": [1, 2, 4]})) test_table = Table(pd.DataFrame(data={"col1": [1, 2], "col2": [1, 2]})) second_test_table = Table(pd.DataFrame(data={"col1": [1, 1], "col2": [1, 4]})) - new_table = table.slice(0, 2, 1) - second_new_table = table.slice(0, 3, 2) - third_new_table = table.slice() + new_table = table.slice_rows(0, 2, 1) + second_new_table = table.slice_rows(0, 3, 2) + third_new_table = table.slice_rows() assert new_table == test_table assert second_new_table == second_test_table assert third_new_table == table -def test_slice_invalid() -> None: +def test_slice_rows_invalid() -> None: table = Table(pd.DataFrame(data={"col1": [1, 2, 1], "col2": [1, 2, 4]})) with pytest.raises(ValueError): - table.slice(3, 2, 1) + table.slice_rows(3, 2, 1) with pytest.raises(ValueError): - table.slice(4, 0, 1) + table.slice_rows(4, 0, 1) with pytest.raises(ValueError): - table.slice(0, 4, 1) + table.slice_rows(0, 4, 1) with pytest.raises(ValueError): - table.slice(-4, 0, 1) + table.slice_rows(-4, 0, 1) with pytest.raises(ValueError): - table.slice(0, -4, 1) + table.slice_rows(0, -4, 1)