diff --git a/src/dashboard_model/service.py b/src/dashboard_model/service.py index 98f4129..ef93016 100644 --- a/src/dashboard_model/service.py +++ b/src/dashboard_model/service.py @@ -40,6 +40,8 @@ async def get_model_data(*, db_session: DbSession, simulation_id: Optional[UUID] # Availability Factor (same as your first formula - this one is correct) availability = (main_calc_data.availability) * 100 + + is_oh = (main_calc_data.sof >= 10) # Equivalent Forced Outage Rate (EFOR) EFOR = main_calc_data.efor @@ -47,7 +49,7 @@ async def get_model_data(*, db_session: DbSession, simulation_id: Optional[UUID] #Prediction EAF = main_calc_data.eaf Derating = main_calc_data.derating_hours - Trip = main_calc_data.num_events + Trip = main_calc_data.num_events-1 if is_oh else main_calc_data.num_events EAF_KONKIN = main_calc_data.eaf_konkin SOF = main_calc_data.sof