Skip to content

Bugfix 461 get derived points #477

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
bikegeek merged 2 commits into from
Aug 10, 2026
Merged

Bugfix 461 get derived points #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ab55bb
Issue #461 Fix second intersection check at line 1337 to match origin…
bikegeek Aug 7, 2026
136ce82
Issue #461 make same updates to scorecard class that uses the same co…
bikegeek Aug 7, 2026
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
10 changes: 7 additions & 3 deletions metcalcpy/agg_stat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,6 +1299,7 @@ def _get_derived_points(self, series_val, indy_vals, axis="1"):
result = []

# Loop through each derived series for the specified axis

for derived_serie in self.params['derived_series_' + axis]:
safe_log(logger, "debug", f"Processing derived series: {derived_serie}")

Expand Down Expand Up @@ -1333,8 +1334,8 @@ def _get_derived_points(self, series_val, indy_vals, axis="1"):

# Filter values based on intersections with ds_1
for var in series_val.keys():
if derived_val[var] is not None and intersection(derived_val[var], ds_1) == intersection(derived_val[var], ds_1):
derived_val[var] = intersection(derived_val[var], ds_1)
if derived_val[var] is not None and intersection(derived_val[var], ds_1) == intersection(derived_val[var], ds_2):
derived_val[var] = intersection(derived_val[var], ds_2)
safe_log(logger, "debug", f"Updated '{var}' in derived values: {derived_val[var]}")

# Generate the derived curve name
Expand Down Expand Up @@ -1362,7 +1363,10 @@ def _get_derived_points(self, series_val, indy_vals, axis="1"):
safe_log(logger, "debug", f"Derived values appended to result: {derived_val}")

# Flatten the result list and return it
flattened_result = [y for x in result for y in x]
flattened_result = []
for row in result:
flattened_result.extend(row)

safe_log(logger, "info", f"Derived points calculation completed. Total derived points: {len(flattened_result)}")

return flattened_result
Expand Down
2 changes: 1 addition & 1 deletion metcalcpy/scorecard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ def _get_derived_points(self, series_val, indy_vals):
if derived_val[var] is not None \
and intersection(derived_val[var], ds_1) \
== intersection(derived_val[var], ds_1):
derived_val[var] = intersection(derived_val[var], ds_1)
derived_val[var] = intersection(derived_val[var], ds_2)

derived_curve_name = get_derived_curve_name(derived_serie)
safe_log(logger, "debug", f"Derived curve name: {derived_curve_name}")
Expand Down