Plan prices

Author: springfall2008

apps/predbat/output.py

@@ -823,8 +823,27 @@ def short_textual_plan(self, soc_min, soc_min_minute, pv_forecast_minute_step, p
         rate_export_str = rate_bucket_export[0]["rate"]
         rate_export_duration = rate_bucket_export[0]["end"] - rate_bucket_export[0]["start"]
 
+        midnight_today_minute = 24*60 - self.minutes_now
+        midnight_tomorrow_minute = 24*60 + midnight_today_minute
+
+        metric_midnight_today = self.predict_metric_best.get(midnight_today_minute, 0.0)
+        metric_midnight_tomorrow = self.predict_metric_best.get(midnight_tomorrow_minute, None)
+
+        if metric_midnight_tomorrow is not None:
+           metric_midnight_tomorrow -= metric_midnight_today
+
+        if metric_midnight_tomorrow is None:
+            sentence += "- Your estimated bill for today is {}{}\n".format(
+                self.currency_symbols[0], dp2(metric_midnight_today/100)
+            )
+        else:
+            sentence += "- Your estimated bill for today is {}{} and tomorrow is {}{}\n".format(
+                self.currency_symbols[0], dp2(metric_midnight_today/100),
+                self.currency_symbols[0], dp2(metric_midnight_tomorrow/100),
+            )
+
         if rate_import_str != "fixed":
-            sentence = "- Import rates are {} {} for the next {}".format(rate_import_str, rate_bucket_import[0]["range"], self.duration_string(rate_import_duration))
+            sentence += "- Import rates are {} {} for the next {}".format(rate_import_str, rate_bucket_import[0]["range"], self.duration_string(rate_import_duration))
             if len(rate_bucket_import) > 1:
                 sentence += " and then {} {} for the next {}".format(rate_bucket_import[1]["rate"], rate_bucket_import[1]["range"], self.duration_string(rate_bucket_import[1]["end"] - rate_bucket_import[1]["start"]))
             sentence += ".\n"

apps/predbat/plan.py

@@ -164,7 +164,6 @@ def optimise_charge_limit_price_threads(
             self.log("All prices {}".format(all_prices))
             if region_start:
                 self.log("Region {} - {}".format(self.time_abs_str(region_start), self.time_abs_str(region_end)))
-        self.log("Current best metric {} cost {} best level score {} all level score {}".format(best_metric, best_cost, best_level_score, levels_score))
 
         # Start loop of trials
         for loop_price in all_prices:
@@ -2694,11 +2693,12 @@ def optimise_detailed_pass(
                                 )
                                 printed_set = True
 
-                            self.log(
-                                "Optimise export window {} end_record {} best_price_charge {} best_price_export {} lowest_price_charge {} with charge limits {} export limits {}".format(
-                                    window_n, self.time_abs_str(self.end_record + self.minutes_now), best_price_charge, best_price_export, lowest_price_charge, self.charge_limit_best, self.export_limits_best
+                            if self.debug_enable:
+                                self.log(
+                                    "Optimise export window {} end_record {} best_price_charge {} best_price_export {} lowest_price_charge {} with charge limits {} export limits {}".format(
+                                        window_n, self.time_abs_str(self.end_record + self.minutes_now), best_price_charge, best_price_export, lowest_price_charge, self.charge_limit_best, self.export_limits_best
+                                    )
                                 )
-                            )
 
                             self.export_window_best[window_n]["start"] = self.export_window_best[window_n].get("start_orig", self.export_window_best[window_n]["start"])
                             n_best_soc, n_best_start, n_best_metric, n_best_cost, n_soc_min, n_soc_min_minute, n_best_keep, n_best_cycle, n_best_carbon, n_best_import = self.optimise_export(
@@ -2727,12 +2727,6 @@ def optimise_detailed_pass(
                                 self.export_window_best[window_n]["start_orig"] = self.export_window_best[window_n].get("start_orig", self.export_window_best[window_n]["start"])
                                 self.export_window_best[window_n]["start"] = best_start
 
-                                self.log(
-                                    "Optimised export window {} end_record {} best_price_charge {} best_price_export {} lowest_price_charge {} with charge limits {} export limits {}".format(
-                                        window_n, self.time_abs_str(self.end_record + self.minutes_now), best_price_charge, best_price_export, lowest_price_charge, self.charge_limit_best, self.export_limits_best
-                                    )
-                                )
-
                                 self.plan_write_debug(debug_mode, "plan_{}_export_{}.html".format(pass_type, window_n))
 
                                 if self.debug_enable: