Fixes for coarse/fine and update docs (#3230)

Author: springfall2008

apps/predbat/config.py

@@ -2099,4 +2099,5 @@
     "predheat": {"type": "dict"},
     "forecast_solar": {"type": "dict_list"},
     "forecast_solar_max_age": {"type": "float"},
+    "enable_coarse_fine_levels": {"type": "boolean"},
 }

apps/predbat/plan.py

@@ -40,6 +40,7 @@ def __init__(self, result):
         Store the data into the class
         """
         self.result = result
+        time.sleep(0)  # Yield control
 
     def get(self):
         """
@@ -322,31 +323,32 @@ def optimise_charge_limit_price_threads(
 
         FINE_SLOT_LENGTHS = [48, 32, 24, 16, 14, 12, 10, 8, 6, 5, 4, 3, 2, 1]
         COARSE_SLOT_LENGTHS = [32, 16, 8, 4, 2, 1]
+        min_freeze_percent = calc_percent_limit(self.best_soc_min, self.soc_max)
 
         # Start loop of trials
-        for coarse in [True, False] if enable_coarse_fine else [False]:
-            if not enable_coarse_fine:
-                charge_slot_choices = FINE_SLOT_LENGTHS
-                export_slot_choices = FINE_SLOT_LENGTHS
-            elif coarse:
-                charge_slot_choices = COARSE_SLOT_LENGTHS
-                export_slot_choices = COARSE_SLOT_LENGTHS
-            else:
-                charge_slot_choices = slots_around(best_max_charge_slots, FINE_SLOT_LENGTHS)
-                export_slot_choices = slots_around(best_max_export_slots, FINE_SLOT_LENGTHS)
+        for loop_price in all_prices:
+            if best_level_score is not None:
+                this_level_score = levels_score.get(loop_price, 9999999)
+                if abs(this_level_score - best_level_score) > (0.3 * level_score_range):
+                    if self.debug_enable:
+                        self.log("Skipping price {} as level score {} is not within 30% of best {}".format(loop_price, this_level_score, best_level_score))
+                    continue
 
-            for loop_price in all_prices:
-                if best_level_score is not None:
-                    this_level_score = levels_score.get(loop_price, 9999999)
-                    if abs(this_level_score - best_level_score) > (0.3 * level_score_range):
-                        if self.debug_enable:
-                            self.log("Skipping price {} as level score {} is not within 30% of best {}".format(loop_price, this_level_score, best_level_score))
-                        continue
+            for coarse in [True, False] if enable_coarse_fine else [False]:
+                if not enable_coarse_fine:
+                    charge_slot_choices = FINE_SLOT_LENGTHS
+                    export_slot_choices = FINE_SLOT_LENGTHS
+                elif coarse:
+                    charge_slot_choices = COARSE_SLOT_LENGTHS
+                    export_slot_choices = COARSE_SLOT_LENGTHS
+                else:
+                    charge_slot_choices = slots_around(best_max_charge_slots, FINE_SLOT_LENGTHS)
+                    export_slot_choices = slots_around(best_max_export_slots, FINE_SLOT_LENGTHS)
 
                 pred_table = []
-                charge_freeze_options = [True, False] if self.set_charge_freeze and not coarse else [False]
-                export_freeze_options = [True, False] if self.set_export_freeze and not coarse else [False]
-                min_freeze_percent = calc_percent_limit(self.best_soc_min, self.soc_max)
+                charge_freeze_options = [True, False] if (self.set_charge_freeze and not coarse) else [False]
+                export_freeze_options = [True, False] if (self.set_export_freeze and not coarse) else [False]
+
                 for max_charge_slots in charge_slot_choices:
                     for max_export_slots in export_slot_choices:
                         for try_charge_freeze in charge_freeze_options:

coverage/cases/predbat_debug_pre_saving1.yaml.expected.json

@@ -1 +1 @@
-{"charge_limit_best": [0.38, 0.38, 0.52, 0.38, 0.52, 9.52, 9.52, 9.52, 9.52, 0.38, 0.38, 0.38, 9.52, 9.52], "charge_window_best": [{"start": 1020, "end": 1080, "average": 25.58, "target": 0.38}, {"start": 1140, "end": 1170, "average": 25.58, "target": 0.38}, {"start": 1170, "end": 1230, "average": 25.58, "target": 0.52}, {"start": 1230, "end": 1350, "average": 25.58, "target": 0.38}, {"start": 1350, "end": 1380, "average": 25.58, "target": 0.52}, {"start": 1410, "end": 1660, "average": 7.0, "target": 9.505}, {"start": 1680, "end": 1735, "average": 7.0, "target": 9.519}, {"start": 1740, "end": 1770, "average": 7.0, "target": 9.518}, {"start": 1770, "end": 1980, "average": 25.58, "target": 9.52}, {"start": 2100, "end": 2130, "average": 25.58, "target": 0.38}, {"start": 2520, "end": 2580, "average": 25.58, "target": 0.38}, {"start": 2640, "end": 2700, "average": 25.58, "target": 0.38}, {"start": 2850, "end": 3210, "average": 7.0, "target": 9.52}, {"start": 3210, "end": 3900, "average": 25.58, "target": 9.52}], "export_window_best": [{"average": 75.0, "end": 1140, "start": 1080, "set": 69.8, "target": 9}, {"average": 15.0, "end": 1680, "start": 1660, "set": 14.0, "target": 90}, {"average": 15.0, "end": 1740, "start": 1735, "set": 14.0, "start_orig": 1710, "target": 98}], "export_limits_best": [4, 86.0, 93.0]}
+{"charge_limit_best": [0.38, 0.38, 0.52, 0.38, 0.52, 9.52, 9.52, 9.52, 9.52, 0.38, 9.52, 9.52], "charge_window_best": [{"start": 1020, "end": 1080, "average": 25.58, "target": 0.38}, {"start": 1140, "end": 1170, "average": 25.58, "target": 0.38}, {"start": 1170, "end": 1230, "average": 25.58, "target": 0.52}, {"start": 1230, "end": 1350, "average": 25.58, "target": 0.38}, {"start": 1350, "end": 1380, "average": 25.58, "target": 0.52}, {"start": 1410, "end": 1660, "average": 7.0, "target": 9.505}, {"start": 1680, "end": 1735, "average": 7.0, "target": 9.519}, {"start": 1740, "end": 1770, "average": 7.0, "target": 9.518}, {"start": 1770, "end": 1980, "average": 25.58, "target": 9.52}, {"start": 2700, "end": 2820, "average": 25.58, "target": 0.38}, {"start": 2850, "end": 3210, "average": 7.0, "target": 9.52}, {"start": 3210, "end": 3900, "average": 25.58, "target": 9.52}], "export_window_best": [{"average": 75.0, "end": 1140, "start": 1080, "set": 69.8, "target": 9}, {"average": 15.0, "end": 1680, "start": 1660, "set": 14.0, "target": 90}, {"average": 15.0, "end": 1740, "start": 1735, "set": 14.0, "start_orig": 1710, "target": 98}], "export_limits_best": [4, 86.0, 93.0]}

docs/apps-yaml.md

@@ -215,6 +215,21 @@ Valid values are:
   threads: auto
 ```
 
+### enable_coarse_fine_levels
+
+Controls the two-pass coarse/fine optimization algorithm for improved planning performance. The default is True (enabled).
+
+When enabled, Predbat uses a two-pass optimization strategy:
+
+- **Coarse pass**: Quickly evaluates a reduced set of slot length combinations to identify approximately optimal charge/export window sizes
+- **Fine pass**: Refines the search by focusing only on slot lengths near those identified as optimal
+
+This significantly reduces planning time while maintaining near-optimal results. You can disable this by setting it to False if needed.
+
+```yaml
+  enable_coarse_fine_levels: True
+```
+
 ### Web interface
 
 Docker users can change the web port for the Predbat web interface by setting **web_port** to a new port number. The default port of 5052 must always be used for the Predbat add-on.