Skip to content

Fix inverted non-numeric >= and <= fallbacks in resolve_filter #393

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
nikhilsi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix inverted non-numeric >= and <= fallbacks in resolve_filter #393

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions openavmkit/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,12 @@ def resolve_filter(df: pd.DataFrame, f: list, rename_map: dict = None) -> pd.Ser
if is_column_of_type(df, field, "number"):
return df[field].fillna(0).ge(value)
else:
return df[field].le(value)
return df[field].ge(value)
if operator == "<=":
if is_column_of_type(df, field, "number"):
return df[field].fillna(0).le(value)
else:
return df[field].ge(value)
return df[field].le(value)
if operator == "==":
return df[field].eq(value)
if operator == "!=":
Expand Down
20 changes: 20 additions & 0 deletions tests/test_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,3 +643,23 @@ def test_filter_debug():
assert lists_are_equal(results_sf_select_improved, ['165177'])
assert lists_are_equal(results_sf_select_vacant, [])



def test_string_ordered_comparisons():
import pandas as pd
from openavmkit.filters import resolve_filter

df = pd.DataFrame({"sale_date": ["2019-06-01", "2020-01-01", "2021-03-15"]})

ge = resolve_filter(df, [">=", "sale_date", "str:2020-01-01"])
assert list(df[ge]["sale_date"]) == ["2020-01-01", "2021-03-15"]

le = resolve_filter(df, ["<=", "sale_date", "str:2020-01-01"])
assert list(df[le]["sale_date"]) == ["2019-06-01", "2020-01-01"]

# > and < were already correct; control cases
gt = resolve_filter(df, [">", "sale_date", "str:2020-01-01"])
assert list(df[gt]["sale_date"]) == ["2021-03-15"]

lt = resolve_filter(df, ["<", "sale_date", "str:2020-01-01"])
assert list(df[lt]["sale_date"]) == ["2019-06-01"]
Loading