Skip to content

fix(cfgUtils): handle none strings in numeric conversion checks #1279

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

Open
fso42 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(cfgUtils): handle none strings in numeric conversion checks #1279

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions avaframe/in3Utils/cfgUtils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,9 +912,9 @@ def convertDF2numerics(simDF):
simDFTest = simDF[name].str.replace(".", "", regex=False)
# allow for - sign too
simDFTest = simDFTest.replace("-", "", regex=False)
# check for str(np.nan) as these cannot be converted to numerics by pd.to_numeric
# check for str(np.nan) or str(None) as these cannot be converted to numerics by pd.to_numeric
# but as friction model parameters are set to nans this is required here
if simDFTest.dropna().astype(str).eq("nan").any():
if simDFTest.dropna().astype(str).str.lower().isin(["nan", "none"]).any():
simDF = setStrnanToNan(simDF, simDFTest, name)
# also include columns where nan is in first row - so check for any row
if simDFTest.str.isdigit().any() and (name != "tSteps"):
Expand Down Expand Up @@ -945,10 +945,10 @@ def setStrnanToNan(simDF, simDFTest, name):
Returns
--------
simDF: pandas dataframe
updated pandas dataframe with np.nan values where string nan was
updated pandas dataframe with np.nan values where string nan or none was
"""

nanIndex = simDFTest.str.match("nan", flags=re.IGNORECASE)
nanIndex = simDFTest.str.match("nan|none", flags=re.IGNORECASE)
simIndex = simDF.index.values
# loop over each row and use iloc to avoid duplicate index issues
for index, nanInd in enumerate(nanIndex):
Expand Down
Loading