comment edits

v2/app.py

@@ -22,9 +22,6 @@ from bess import BatteryParameters, BatteryModel
 met_2021_data, cons_2021_data = read_datasets()
 
 
-# TODO move out everything that should not be recalculated.
-# TODO actually use uiParameters. (base_price and peak_price were just to mock up the Accordion gui.)
-# TODO ui_refresh spawns its own Supplier, which is just dumb.
 # TODO some gui to upload consumption data.
 #      and maybe solar data? but we don't have a solar data -> production model built in. just scale and switch years from a dropdown?
 def recalculate(ui):
@@ -67,8 +64,6 @@ def recalculate(ui):
     if ui.fixed_consumption_kW is not None:
         all_data['Consumption'] = ui.fixed_consumption_kW
 
-    print("Working with", solar_parameters.solar_cell_num, "solar cells, that's a maximum production of", all_data['Production'].max(), "kW.")
-
     all_data_with_predictions = all_data.copy()
     add_dummy_predictions(all_data_with_predictions)
 
@@ -90,7 +85,7 @@ def recalculate(ui):
 
 
 # that's very error-prone, sorry. must be kept in sync with the gradio button click call.
-# secondarily, with recalculate().
+# with recalculate(), as well.
 def list_to_namespace(
     solar_cell_num, solar_cell_nominal_capacity,
     bess_capacity_Ah, bess_voltage_V, bess_charge_kW, bess_discharge_kW,
@@ -112,9 +107,10 @@ def list_to_namespace(
 
 def create_supplier(ui):
     supplier = Supplier(price=ui.base_price_HUFpkWh)
-    supplier.set_price_for_daily_interval_on_workdays(start=6, end=22, price=ui.peak_price_HUFpkWh)
+    supplier.set_price_for_daily_interval_on_workdays(start=6, end=18, price=ui.peak_price_HUFpkWh)
     return supplier
 
+
 def ui_refresh(
         solar_cell_num, solar_cell_nominal_capacity,
         bess_capacity_Ah, bess_voltage_V, bess_charge_kW, bess_discharge_kW,
@@ -149,7 +145,7 @@ def ui_refresh(
     supplier = create_supplier(ui)
 
     fee = supplier.fee(results["consumption_from_network"])
-    html += f"<tr><td>{fee/1e6:.3f} million HUF billed by energy supplier</td></tr>\n"
+    html += f"<tr><td>Network energy usage charge:</td><td>{fee/1e6:.3f} million HUF</td></tr>\n"
 
     html += "</table>"