From e66a64d2d5f41495b976736a2d1e24a8461b5acc Mon Sep 17 00:00:00 2001 From: Aidan Liu Date: Sat, 3 Oct 2026 00:03:03 -0400 Subject: [PATCH 1/3] Speed sweep range summary --- sim/main.py | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/sim/main.py b/sim/main.py index d8148e7..e6f0407 100644 --- a/sim/main.py +++ b/sim/main.py @@ -97,8 +97,11 @@ def fmt_elapsed(minute_of_day: float, start_time_hour: float) -> str: speeds_mph=SPEED_SWEEP_MPH, use_api_weather=True, ) + rows.sort(key=lambda row: row["mph"]) - print("\nSpeed sweep summary") + print_speed_sweep_summary(rows) + + print("\nSpeed sweep table") 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: @@ -113,6 +116,28 @@ def fmt_elapsed(minute_of_day: float, start_time_hour: float) -> str: f" {row['laps']:>4} | {row['distance_miles']:>13.1f} | {cutoff:>22} | {'Yes' if row['feasibility'] else 'No'}" ) +def print_speed_sweep_summary(rows): + print("\nSpeed sweep results:") + + # using a generator (lazy evaluation) to do this + slowest_feasible = next((row for row in rows if row["feasibility"]), None) + fastest_feasible = next((row for row in reversed(rows) if row["feasibility"]), None) + best_fixed_speed_row = max((row for row in rows if row["feasibility"]), key=lambda row: row["distance_miles"]) + + none_feasible = all(not row["feasibility"] for row in rows) + all_feasible = all(row["feasibility"] for row in rows) + + print(f"{len(rows)} speeds were tested") + if none_feasible: + print("No speeds were feasible!") + else: + print(f"Slowest feasible speed: {slowest_feasible['mph']} mph" if slowest_feasible else "None") + print(f"Fastest feasible speed: {fastest_feasible['mph']} mph" if fastest_feasible else "None") + print(f"Best feasible fixed speed (max distance): {best_fixed_speed_row['mph']} mph " + f"with {best_fixed_speed_row['distance_miles']:.1f} mi" + if best_fixed_speed_row else "None") + if all_feasible: + print("All speeds were feasible!") def main(): args = parse_args() From ffc5bf0e7bc81f13364f96bf0b9be08163543b57 Mon Sep 17 00:00:00 2001 From: Aidan Liu Date: Sat, 3 Oct 2026 00:09:50 -0400 Subject: [PATCH 2/3] Have copilot generate tests --- tests/fixed_speed_sweep_test.py | 60 +++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 tests/fixed_speed_sweep_test.py diff --git a/tests/fixed_speed_sweep_test.py b/tests/fixed_speed_sweep_test.py new file mode 100644 index 0000000..b177c29 --- /dev/null +++ b/tests/fixed_speed_sweep_test.py @@ -0,0 +1,60 @@ +import unittest +from contextlib import redirect_stdout +from io import StringIO + +from sim.main import print_speed_sweep_summary + + +class TestFixedSpeedSweepSummary(unittest.TestCase): + def get_summary(self, rows): + output = StringIO() + with redirect_stdout(output): + print_speed_sweep_summary(rows) + return output.getvalue() + + def test_no_speeds_are_feasible(self): + rows = [ + {"mph": 20, "feasibility": False, "distance_miles": 120}, + {"mph": 30, "feasibility": False, "distance_miles": 150}, + ] + + summary = self.get_summary(rows) + + self.assertIn("2 speeds were tested", summary) + self.assertIn("No speeds were feasible!", summary) + self.assertNotIn("Slowest feasible speed:", summary) + self.assertNotIn("Best feasible fixed speed", summary) + + def test_some_speeds_are_feasible(self): + rows = [ + {"mph": 20, "feasibility": True, "distance_miles": 100}, + {"mph": 30, "feasibility": False, "distance_miles": 150}, + {"mph": 40, "feasibility": True, "distance_miles": 180}, + ] + + summary = self.get_summary(rows) + + self.assertIn("3 speeds were tested", summary) + self.assertIn("Slowest feasible speed: 20 mph", summary) + self.assertIn("Fastest feasible speed: 40 mph", summary) + self.assertIn("Best feasible fixed speed (max distance): 40 mph with 180.0 mi", summary) + self.assertNotIn("All speeds were feasible!", summary) + + def test_all_speeds_are_feasible(self): + rows = [ + {"mph": 20, "feasibility": True, "distance_miles": 100}, + {"mph": 30, "feasibility": True, "distance_miles": 200}, + {"mph": 40, "feasibility": True, "distance_miles": 180}, + ] + + summary = self.get_summary(rows) + + self.assertIn("3 speeds were tested", summary) + self.assertIn("Slowest feasible speed: 20 mph", summary) + self.assertIn("Fastest feasible speed: 40 mph", summary) + self.assertIn("Best feasible fixed speed (max distance): 30 mph with 200.0 mi", summary) + self.assertIn("All speeds were feasible!", summary) + + +if __name__ == "__main__": + unittest.main() \ No newline at end of file From e0795fa54c4fee1f184e15f954e8e90e9ce014be Mon Sep 17 00:00:00 2001 From: Aidan Liu Date: Sat, 3 Oct 2026 00:11:56 -0400 Subject: [PATCH 3/3] Fix crash when there are no feasible speeds --- sim/main.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sim/main.py b/sim/main.py index e6f0407..c608bbc 100644 --- a/sim/main.py +++ b/sim/main.py @@ -97,7 +97,6 @@ def fmt_elapsed(minute_of_day: float, start_time_hour: float) -> str: speeds_mph=SPEED_SWEEP_MPH, use_api_weather=True, ) - rows.sort(key=lambda row: row["mph"]) print_speed_sweep_summary(rows) @@ -119,10 +118,11 @@ def fmt_elapsed(minute_of_day: float, start_time_hour: float) -> str: def print_speed_sweep_summary(rows): print("\nSpeed sweep results:") - # using a generator (lazy evaluation) to do this - slowest_feasible = next((row for row in rows if row["feasibility"]), None) - fastest_feasible = next((row for row in reversed(rows) if row["feasibility"]), None) - best_fixed_speed_row = max((row for row in rows if row["feasibility"]), key=lambda row: row["distance_miles"]) + rows.sort(key=lambda row: row["mph"]) + feasible_rows = [row for row in rows if row["feasibility"]] + slowest_feasible = feasible_rows[0] if feasible_rows else None + fastest_feasible = feasible_rows[-1] if feasible_rows else None + best_fixed_speed_row = max(feasible_rows, key=lambda row: row["distance_miles"]) if feasible_rows else None none_feasible = all(not row["feasibility"] for row in rows) all_feasible = all(row["feasibility"] for row in rows)