Skip to content

⚡️ ExpressionCombine readability and test #43

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
BaptisteDE merged 1 commit into from
Jun 30, 2025
Merged

⚡️ ExpressionCombine readability and test #43

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
16 changes: 16 additions & 0 deletions tests/test_processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,22 @@ def test_combiner(self):
assert res.shape == (3, 6)
check_feature_names_out(combiner, res)

combiner_cond = ExpressionCombine(
columns_dict={
"T1": "Text__°C__outdoor",
},
expression="(T1 > 10) * 1",
result_column_name="where_test_01__hvac",
)

res = combiner_cond.fit_transform(test_df.copy())
check_feature_names_out(combiner_cond, res)
np.testing.assert_almost_equal(
res["where_test_01__hvac"],
[0, 0, 0],
decimal=1,
)

@patch("tide.base.get_oikolab_df", side_effect=mock_get_oikolab_df)
def test_fill_oiko_meteo(self, mock_get_oikolab):
data = pd.read_csv(
Expand Down
10 changes: 5 additions & 5 deletions tide/processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2044,11 +2044,11 @@ def _fit_implementation(self, X, y=None):
self.feature_names_out_.append(self.result_column_name)

def _transform_implementation(self, X: pd.Series | pd.DataFrame):
exp = self.expression
for key, val in self.columns_dict.items():
exp = exp.replace(key, f'X["{val}"]')

X.loc[:, self.result_column_name] = pd.eval(exp, target=X)
X.loc[:, self.result_column_name] = pd.eval(
self.expression,
target=X,
local_dict={var: X[col] for var, col in self.columns_dict.items()},
)
return X[self.feature_names_out_]


Expand Down