Bugfix 461 get derived points (#477)

* Issue #461 Fix second intersection check at line 1337 to match original R script code and use extend to flatten the result ( a list of tuples) to improve performance

* Issue #461 make same updates to scorecard class that uses the same code as agg_stat.py

Author: bikegeek

metcalcpy/agg_stat.py

@@ -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}")
 
@@ -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
@@ -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

metcalcpy/scorecard.py

@@ -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}")