fix(prediction): bound import/export kWh to end_record, not the full forecast horizon

run_prediction() returned the raw, whole-loop import_kwh_battery/house and
export_kwh accumulators instead of the already-computed final_* variants that
are correctly gated to end_record (matching final_metric/final_soc). Any
caller planning a longer horizon than it bills (e.g. the annual tool's 48h
lookahead billed as one day, or Compare's 48h plan billed as 24h) reported
import/export inflated by the unbilled spillover period - roughly double for
a flat load. Mirrored the same fix into the C++ kernel and bumped the parity
revision.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Author: springfall2008

apps/predbat/prediction.py

@@ -1288,9 +1288,9 @@ def run_prediction(self, charge_limit, charge_window, export_window, export_limi
         if not save and cache:
             self.prediction_cache[sim_hash] = (
                 round(final_metric, 4),
-                round(import_kwh_battery, 4),
-                round(import_kwh_house, 4),
-                round(export_kwh, 4),
+                round(final_import_kwh_battery, 4),
+                round(final_import_kwh_house, 4),
+                round(final_export_kwh, 4),
                 round(soc_min, 4),
                 round(final_soc, 4),
                 soc_min_minute,
@@ -1308,9 +1308,9 @@ def run_prediction(self, charge_limit, charge_window, export_window, export_limi
 
         return (
             round(final_metric, 4),
-            round(import_kwh_battery, 4),
-            round(import_kwh_house, 4),
-            round(export_kwh, 4),
+            round(final_import_kwh_battery, 4),
+            round(final_import_kwh_house, 4),
+            round(final_export_kwh, 4),
             round(soc_min, 4),
             round(final_soc, 4),
             soc_min_minute,

apps/predbat/prediction_kernel.cpp

@@ -27,7 +27,7 @@
 #include <vector>
 
 #define PK_ABI_VERSION 2
-#define PK_PARITY_REVISION 2
+#define PK_PARITY_REVISION 3
 #define PK_MAX_CARS 4
 #define PK_RUN_EVERY 5 // const.py RUN_EVERY
 
@@ -375,6 +375,9 @@ int32_t pk_run(int64_t handle, const PkScenario *s, PkResult *out)
     double final_metric_keep = metric_keep;
     double final_iboost_kwh = iboost_today_kwh;
     double final_carbon_g = carbon_g;
+    double final_import_kwh_battery = import_kwh_battery;
+    double final_import_kwh_house = import_kwh_house;
+    double final_export_kwh = export_kwh;
     double charge_rate_now = c->charge_rate_now;
     double discharge_rate_now = c->discharge_rate_now;
     const bool car_enable = c->num_cars > 0;
@@ -938,6 +941,9 @@ int32_t pk_run(int64_t handle, const PkScenario *s, PkResult *out)
             final_metric_keep = metric_keep;
             final_iboost_kwh += iboost_amount;
             final_carbon_g = carbon_g;
+            final_import_kwh_battery = import_kwh_battery;
+            final_import_kwh_house = import_kwh_house;
+            final_export_kwh = export_kwh;
 
             // Record soc min - prediction.py:1183-1186
             if (soc < soc_min) {
@@ -948,9 +954,9 @@ int32_t pk_run(int64_t handle, const PkScenario *s, PkResult *out)
     }
 
     out->final_metric = final_metric;
-    out->import_kwh_battery = import_kwh_battery;
-    out->import_kwh_house = import_kwh_house;
-    out->export_kwh = export_kwh;
+    out->import_kwh_battery = final_import_kwh_battery;
+    out->import_kwh_house = final_import_kwh_house;
+    out->export_kwh = final_export_kwh;
     out->soc_min = soc_min;
     out->final_soc = final_soc;
     out->battery_cycle = final_battery_cycle;

apps/predbat/prediction_kernel.py

@@ -31,7 +31,7 @@
 
 # Expected ABI/parity revisions of the shared library (see prediction_kernel.cpp)
 KERNEL_ABI_VERSION = 2
-KERNEL_PARITY_REVISION = 2
+KERNEL_PARITY_REVISION = 3
 
 # Maximum number of cars supported by the kernel (PK_MAX_CARS in prediction_kernel.cpp)
 KERNEL_MAX_CARS = 4