Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve route finding performance #70

Closed
wants to merge 2 commits into from
Closed

Improve route finding performance #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7642f2
Improve route finding performance
lemonyte May 12, 2024
a5c7fa6
Merge branch 'main' into find-routes-perf
lemonyte May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions src/ferry_planner/route.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from __future__ import annotations

import hashlib
from collections.abc import Iterable, Iterator, Sequence
from collections.abc import Generator, Iterable, Iterator, Sequence
from copy import deepcopy
from datetime import datetime, timedelta
from enum import Enum
Expand Down Expand Up @@ -182,21 +182,18 @@ def __init__(self, connection_db: ConnectionDB, /) -> None:
self._connection_db = connection_db

def find_routes(self, *, origin: Location, destination: Location) -> Iterator[Route]:
routes = []
self._find_routes_recurse(next_point=origin, end_point=destination, routes=routes)
yield from routes
return self._find_routes_recurse(next_point=origin, end_point=destination)

def _find_routes_recurse( # noqa: C901, PLR0912, PLR0913
self,
*,
next_point: Location,
end_point: Location,
routes: list[Route],
current_route: list[Location] | None = None,
dead_ends: list[Connection] | None = None,
lands: list[str] | None = None,
last_connection_type: type[Connection] = Connection,
) -> bool:
) -> Generator[Route, None, bool]:
if current_route is None:
current_route = []
if dead_ends is None:
Expand All @@ -205,7 +202,7 @@ def _find_routes_recurse( # noqa: C901, PLR0912, PLR0913
lands = []
current_route.append(next_point)
if next_point == end_point:
routes.append(current_route.copy())
yield current_route.copy()
del current_route[-1]
return True
if isinstance(end_point, City):
Expand All @@ -216,7 +213,7 @@ def _find_routes_recurse( # noqa: C901, PLR0912, PLR0913
pass
else:
current_route.append(end_point)
routes.append(current_route.copy())
yield current_route.copy()
del current_route[-2:]
return True
res = False
Expand All @@ -235,18 +232,20 @@ def _find_routes_recurse( # noqa: C901, PLR0912, PLR0913
lands.append(connection.origin.land_group)
else:
lands.append("")
if self._find_routes_recurse(
next_point=connection.destination,
end_point=end_point,
routes=routes,
current_route=current_route,
dead_ends=dead_ends,
lands=lands,
last_connection_type=type(connection),
):
res = True
else:
dead_ends.append(connection)
try:
yield from self._find_routes_recurse(
next_point=connection.destination,
end_point=end_point,
current_route=current_route,
dead_ends=dead_ends,
lands=lands,
last_connection_type=type(connection),
)
except StopIteration as exc:
if exc.value is True:
res = True
else:
dead_ends.append(connection)
del lands[-1]
del current_route[-1]
return res
Expand Down
Loading