added to_kingdom function #32
Conversation
geost/base.py
Outdated
| @@ -1,5 +1,5 @@ | |||
| import pickle | |||
| from pathlib import WindowsPath | |||
| from pathlib import Path, WindowsPath | |||
There was a problem hiding this comment.
Path hoeft niet geimporteerd te worden, zie hieronder
geost/base.py
Outdated
|
|
||
| tdchart.drop("surface", axis=1, inplace=True) | ||
| tdchart.sort_values(by=["id", "MD"], inplace=True) | ||
| outfile = Path(outfile.parent, f"{outfile.stem}_TDCHART{outfile.suffix}") |
There was a problem hiding this comment.
outfile.parent.joinpath(f"{outfile.stem}_TDCHART{outfile.suffix}")
-> Dan hoeft Path ook niet geimporteerd te worden
geost/base.py
Outdated
| vs : float | ||
| sound velocity in sediment in m/s, default is 1600 m/s | ||
| """ | ||
| self.data.to_kingdom(outfile, vw, vs) |
There was a problem hiding this comment.
Deze wordt gemist in tests. -> ook nog test vanuit collection schrijven
tests/test_collections.py
Outdated
| @@ -465,6 +465,16 @@ def test_to_qgis3d(self, borehole_collection): | |||
| assert outfile.is_file() | |||
| outfile.unlink() | |||
|
|
|||
| @pytest.mark.unittest | |||
| def test_to_kingdom(self, borehole_data): | |||
There was a problem hiding this comment.
Borehole_data is layeredData object, vandaar dat (zie vorige comment) het aanroepen van de collection method niet getest wordt.
Gebruik in plaats daarvan de borehole_collection fixture
| @@ -270,22 +270,32 @@ def test_to_qgis3d(self, borehole_data): | |||
| assert outfile.is_file() | |||
| outfile.unlink() | |||
|
|
|||
| @pytest.mark.unittest | |||
| def test_to_kingdom(self, borehole_data): | |||
There was a problem hiding this comment.
Er worden wat situaties gemist door de if/else statements in de export functie. Zou je die ook nog kunnen testen?
geost/base.py
Outdated
|
|
||
| Parameters | ||
| ---------- | ||
| outfile : Union[str, WindowsPath] |
There was a problem hiding this comment.
str | WindowsPath
Gebruyik van Union typing is sinds Python 3.11 niet meer nodig
geost/base.py
Outdated
| @@ -1110,6 +1110,65 @@ def to_qgis3d( | |||
| qgis3d = self._create_geodataframe_3d(relative_to_vertical_reference) | |||
| qgis3d.to_file(outfile, driver="GPKG", **kwargs) | |||
|
|
|||
| def to_kingdom(self, outfile, vw=1500.0, vs=1600.0): | |||
There was a problem hiding this comment.
typing staat ook in de functiedefinitie:
def to_kingdom(self, outfile: str | WindowsPath, vw: float = 1500.0, vs: float = 1600.0
geost/base.py
Outdated
| @@ -2041,6 +2100,22 @@ def to_qgis3d( | |||
| """ | |||
| self.data.to_qgis3d(outfile, relative_to_vertical_reference, **kwargs) | |||
|
|
|||
| def to_kingdom(self, outfile, vw=1500.0, vs=1600.0): | |||
There was a problem hiding this comment.
typing staat ook in de functiedefinitie:
def to_kingdom(self, outfile: str | WindowsPath, vw: float = 1500.0, vs: float = 1600.0
geost/base.py
Outdated
| """ | ||
| # total depth of borehole in m | ||
| if "Total depth" in self.df.columns: | ||
| self["Total depth"] = self["surface"] - self["end"] |
There was a problem hiding this comment.
De dataframe wordt nu blijvend aangepast voor het hele object, maar dit kan beter alleen binnen de exportfunctie gehouden worden.
geost/base.py
Outdated
| self.df.insert(7, "Total depth", (self["surface"] - self["end"])) | ||
| # start depth of interval in m | ||
| if "Start depth" in self.df.columns: | ||
| self["Start depth"] = self["top"] |
There was a problem hiding this comment.
Als dat het geval is dan hoeft er toch niks te gebeuren -> pass?
|
Nog even over nagedacht en zou het zo aanpakken:
Dat lost een aantal dingen meteen op. Zo heb je geen if/else statements meer die extra testsituaties vereisen. Wel zou ik nog testen of je nieuw gemaakte kolommen voldoen aan de verwachtingen (dus Start_depth, Total_depth, End_depth). Ook blijft LayeredData.df onaangepast. |
new function to export data for the seismic interpretation software Kingdom