diff --git a/sim/main.py b/sim/main.py index ab45645..d8148e7 100644 --- a/sim/main.py +++ b/sim/main.py @@ -99,8 +99,8 @@ def fmt_elapsed(minute_of_day: float, start_time_hour: float) -> str: ) print("\nSpeed sweep summary") - print(" Speed (mph) | Final SoC (%) | Laps | Distance (mi) | 10% reached at") - print(" ----------- | ------------- | ---- | ------------- | --------------") + print(" Speed (mph) | Final SoC (%) | Target SoC% | SoC Margin (%) | Energy Margin (Wh) | Laps | Distance (mi) | Target SoC% reached at | Feasible?") + print(" ----------- | ------------- | ----------- | -------------- | ------------------ | ---- | ------------- | ---------------------- | ---------") for row in rows: cutoff = ( "Full 8h" @@ -109,7 +109,8 @@ def fmt_elapsed(minute_of_day: float, start_time_hour: float) -> str: ) print( f" {row['mph']:>11.0f} | {row['final_soc_pct']:>13.1f} |" - f" {row['laps']:>4} | {row['distance_miles']:>13.1f} | {cutoff:>11}" + f" {row['target_soc_pct']:>10.1f}% | {row['soc_margin_pct']:>13.1f}% | {row['energy_margin_wh']:>18.1f} |" + f" {row['laps']:>4} | {row['distance_miles']:>13.1f} | {cutoff:>22} | {'Yes' if row['feasibility'] else 'No'}" )