Skip to content

Use strings as values for enum instead of integers #469

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

Merged
merged 5 commits into from
Dec 12, 2024
Merged

Use strings as values for enum instead of integers #469

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36cc9a2
Use strings as values for enum instead of integers
ecomodeller Nov 21, 2024
88e7320
Unused import
ecomodeller Nov 21, 2024
ae2348f
Remove commented line
ecomodeller Nov 21, 2024
810ae46
Fix GeometryType example
ecomodeller Dec 4, 2024
0f67e8f
Merge branch 'main' into enum
jsmariegaard Dec 12, 2024
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
4 changes: 2 additions & 2 deletions modelskill/model/factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def model_result(
if gtype is None:
geometry = _guess_gtype(data)
else:
geometry = GeometryType.from_string(gtype)
geometry = GeometryType(gtype)

return _modelresult_lookup[geometry](
data=data,
Expand All @@ -79,7 +79,7 @@ def __new__(
if gtype is None:
geometry = _guess_gtype(data)
else:
geometry = GeometryType.from_string(gtype)
geometry = GeometryType(gtype)

return _modelresult_lookup[geometry](
data=data,
Expand Down
2 changes: 1 addition & 1 deletion modelskill/obs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def observation(
if gtype is None:
geometry = _guess_gtype(**kwargs)
else:
geometry = GeometryType.from_string(gtype)
geometry = GeometryType(gtype)

return _obs_class_lookup[geometry](
data=data,
Expand Down
22 changes: 11 additions & 11 deletions modelskill/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from enum import Enum, auto
from enum import Enum
from pathlib import Path
from typing import Union, List, Optional
from dataclasses import dataclass
Expand All @@ -10,10 +10,10 @@
class GeometryType(Enum):
"""Geometry type (gtype) of data"""

POINT = auto()
TRACK = auto()
UNSTRUCTURED = auto()
GRID = auto()
POINT = "point"
TRACK = "track"
UNSTRUCTURED = "unstructured"
GRID = "grid"

def __str__(self) -> str:
return self.name.lower()
Expand All @@ -25,17 +25,17 @@ def from_string(s: str) -> "GeometryType":
Examples
--------
>>> GeometryType.from_string("point")
<GeometryType.POINT: 1>
<GeometryType.POINT: 'point'>
>>> GeometryType.from_string("track")
<GeometryType.TRACK: 2>
<GeometryType.TRACK: 'track'>
>>> GeometryType.from_string("unstructured")
<GeometryType.UNSTRUCTURED: 3>
<GeometryType.UNSTRUCTURED: 'unstructured'>
>>> GeometryType.from_string("flexible mesh")
<GeometryType.UNSTRUCTURED: 3>
<GeometryType.UNSTRUCTURED: 'unstructured'>
>>> GeometryType.from_string("dfsu")
<GeometryType.UNSTRUCTURED: 3>
GeometryType.from_string("flexible mesh")
>>> GeometryType.from_string("grid")
<GeometryType.GRID: 4>
<GeometryType.GRID: 'grid'>
"""

try:
Expand Down
Loading