Skip to content

Debug harness: use load_scaling when evaluating the original plan #4218

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
springfall2008 merged 1 commit into from
Jul 9, 2026
+9 −1
Merged

Debug harness: use load_scaling when evaluating the original plan #4218

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
10 changes: 9 additions & 1 deletion apps/predbat/tests/test_single_debug.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,18 +155,24 @@ def run_single_debug(test_name, my_predbat, debug_file, expected_file=None, comp
return

# Reset load model
# Mirror the load model rebuild done by calculate_plan (plan.py) so the original plan metric is
# evaluated against the same load data as the re-calculated plan - in particular load_scaling.
# Otherwise the two metrics printed by this harness differ by the load scaling and look like a
# plan regression when the plans are identical.
if reset_load_model:
print("Reset load model")
my_predbat.load_minutes_step = my_predbat.step_data_history(
my_predbat.load_minutes,
my_predbat.minutes_now,
forward=False,
scale_today=my_predbat.load_inday_adjustment,
scale_fixed=1.0 * load_override,
scale_fixed=my_predbat.load_scaling * load_override,
type_load=True,
load_forecast=my_predbat.load_forecast,
load_scaling_dynamic=my_predbat.load_scaling_dynamic,
cloud_factor=my_predbat.metric_load_divergence,
load_adjust=my_predbat.manual_load_adjust,
load_baseline=my_predbat.dynamic_load_baseline,
)
my_predbat.load_minutes_step10 = my_predbat.step_data_history(
my_predbat.load_minutes,
Expand All @@ -178,6 +184,8 @@ def run_single_debug(test_name, my_predbat, debug_file, expected_file=None, comp
load_forecast=my_predbat.load_forecast,
load_scaling_dynamic=my_predbat.load_scaling_dynamic,
cloud_factor=min(my_predbat.metric_load_divergence + 0.5, 1.0) if my_predbat.metric_load_divergence else None,
load_adjust=my_predbat.manual_load_adjust,
load_baseline=my_predbat.dynamic_load_baseline,
)
my_predbat.pv_forecast_minute_step = my_predbat.step_data_history(my_predbat.pv_forecast_minute, my_predbat.minutes_now, forward=True, cloud_factor=my_predbat.metric_cloud_coverage)
my_predbat.pv_forecast_minute10_step = my_predbat.step_data_history(
Expand Down
Loading