Merge b7244ad400 into 1f41f4b35a

2024/aoc/__main__.py

@@ -1,5 +1,4 @@
 import datetime
-import time
 
 import click
 
@@ -15,19 +14,17 @@ from . import days
     default="-",
     help="Problem input file",
 )
-@click.option("-t", "--time", "timing", is_flag=True, help="Print elapsed time afterwards")
+@click.option("-t", "--time", is_flag=True, help="Print elapsed time afterwards")
 @click.argument("day", required=True)
-def main(day: int, timing: bool, data: str) -> None:
+def main(day: int, time: bool, data: str) -> None:
     runner_class = days.get_runner(day)
 
-    start = time.perf_counter_ns()
+    start = datetime.datetime.now()
 
     part1, part2 = runner_class.run_both(data)
 
-    if timing:
+    if time:
-        elapsed = time.perf_counter_ns() - start
+        click.echo(f"Elapsed: {datetime.datetime.now() - start}", err=True)
-        delta = datetime.timedelta(microseconds=elapsed / 1000)
-        click.echo(f"Elapsed: {delta}", err=True)
 
     click.echo(part1)
     click.echo(part2)

2024/aoc/days/__init__.py

@@ -1,12 +1,12 @@
 import importlib
 from abc import ABC, abstractmethod
-from typing import Any, cast
+from typing import Any, Tuple, cast
 
 
 class Runner(ABC):
     @classmethod
     @abstractmethod
-    def run_both(cls, data: str) -> tuple[Any, Any]:
+    def run_both(cls, data: str) -> Tuple[Any, Any]:
         pass
 
     @classmethod
@@ -22,7 +22,7 @@ class Runner(ABC):
 
 class SeparateRunner(Runner):
     @classmethod
-    def run_both(cls, data: str) -> tuple[Any, Any]:
+    def run_both(cls, data: str) -> Tuple[Any, Any]:
         return (cls.part1(data), cls.part2(data))