README.md

@@ -24,7 +24,6 @@ Refer to the READMEs in the `frontend` and `backend` directories for instruction
     - `google_maps_flutter` plugin
 - Python 3
     - `fastapi`
-    - `numpy, scipy`
 - Docker
 
 

backend/Pipfile

@@ -18,12 +18,10 @@ numpy = "*"
 fastapi = "*"
 pydantic = "*"
 shapely = "*"
-scipy = "*"
-osmpythontools = "*"
-pywikibot = "*"
 pymemcache = "*"
 fastapi-cli = "*"
 scikit-learn = "*"
 pyqt6 = "*"
 loki-logger-handler = "*"
 pulp = "*"
+scipy = "*"

backend/src/main.py

@@ -12,8 +12,8 @@ from .structs.linked_landmarks import LinkedLandmarks
 from .structs.trip import Trip
 from .utils.landmarks_manager import LandmarkManager
 from .utils.toilets_manager import ToiletsManager
-from .utils.optimizer import Optimizer
-from .utils.refiner import Refiner
+from .optimization.optimizer import Optimizer
+from .optimization.refiner import Refiner
 from .cache import client as cache_client
 
 logger = logging.getLogger(__name__)

backend/src/optimization/optimizer.py

@@ -6,7 +6,7 @@ import numpy as np
 import pulp as pl
 
 from ..structs.landmark import Landmark
-from .get_time_distance import get_time
+from ..utils.get_time_distance import get_time
 from ..constants import OPTIMIZER_PARAMETERS_PATH
 
 

backend/src/optimization/refiner.py

@@ -5,8 +5,8 @@ import yaml
 from shapely import buffer, LineString, Point, Polygon, MultiPoint, concave_hull
 
 from ..structs.landmark import Landmark
-from .get_time_distance import get_time
-from .take_most_important import take_most_important
+from ..utils.get_time_distance import get_time
+from ..utils.take_most_important import take_most_important
 from .optimizer import Optimizer
 from ..constants import OPTIMIZER_PARAMETERS_PATH