diff --git a/backend/src/parameters/landmark_parameters.yaml b/backend/src/parameters/landmark_parameters.yaml index 983b9c8..aa68e2f 100644 --- a/backend/src/parameters/landmark_parameters.yaml +++ b/backend/src/parameters/landmark_parameters.yaml @@ -7,5 +7,5 @@ tag_exponent: 1.15 image_bonus: 10 viewpoint_bonus: 15 wikipedia_bonus: 6 -N_important: 50 +N_important: 40 pay_bonus: -1 diff --git a/backend/src/parameters/optimizer_parameters.yaml b/backend/src/parameters/optimizer_parameters.yaml index 6dc49d2..77efa02 100644 --- a/backend/src/parameters/optimizer_parameters.yaml +++ b/backend/src/parameters/optimizer_parameters.yaml @@ -1,5 +1,5 @@ detour_factor: 1.4 -detour_corridor_width: 200 +detour_corridor_width: 300 average_walking_speed: 4.8 max_landmarks: 10 max_landmarks_refiner: 20 diff --git a/backend/src/tester.py b/backend/src/tester.py index acfec75..cc4118c 100644 --- a/backend/src/tester.py +++ b/backend/src/tester.py @@ -24,8 +24,8 @@ def test(start_coords: tuple[float, float], finish_coords: tuple[float, float] = nature=Preference(type='nature', score = 5), shopping=Preference(type='shopping', score = 5), - max_time_minute=1000, - detour_tolerance_minute=0 + max_time_minute=120, + detour_tolerance_minute=10 ) # Create start and finish @@ -70,9 +70,9 @@ def test(start_coords: tuple[float, float], finish_coords: tuple[float, float] = return linked_tour -test(tuple((48.8344400, 2.3220540))) # Café Chez César +# test(tuple((48.8344400, 2.3220540))) # Café Chez César # test(tuple((48.8375946, 2.2949904))) # Point random -# test(tuple((47.377859, 8.540585))) # Zurich HB -# test(tuple((45.7576485, 4.8330241))) # Lyon Bellecour +test(tuple((47.377859, 8.540585))) # Zurich HB +# test(tuple((45.758217, 4.831814))) # Lyon Bellecour # test(tuple((48.5848435, 7.7332974))) # Strasbourg Gare # test(tuple((48.2067858, 16.3692340))) # Vienne diff --git a/backend/src/utils/landmarks_manager.py b/backend/src/utils/landmarks_manager.py index d914c74..6e81237 100644 --- a/backend/src/utils/landmarks_manager.py +++ b/backend/src/utils/landmarks_manager.py @@ -318,6 +318,7 @@ class LandmarkManager: if "viewpoint" in tag: score += self.viewpoint_bonus + duration = 10 if "image" in tag: score += self.image_bonus @@ -334,7 +335,6 @@ class LandmarkManager: if tag == "building" and elem.tag('building') in ['retail', 'supermarket', 'parking']: skip = True break - # Get additional information # if tag == 'wikipedia' : @@ -352,14 +352,14 @@ class LandmarkManager: score = score_function(score) if "place_of_worship" in elem.tags().values() : score = int(score*self.church_coeff) - duration = 20 + duration = 15 elif "museum" in elem.tags().values() : score = int(score*self.church_coeff) duration = 60 else : - duration = 30 + duration = 5 # Generate the landmark and append it to the list landmark = Landmark( diff --git a/backend/src/utils/optimizer.py b/backend/src/utils/optimizer.py index b20412e..38fc375 100644 --- a/backend/src/utils/optimizer.py +++ b/backend/src/utils/optimizer.py @@ -193,7 +193,7 @@ class Optimizer: for j, spot2 in enumerate(landmarks) : t = get_time(spot1.location, spot2.location) + spot1.duration dist_table[j] = t - closest = sorted(dist_table)[:22] + closest = sorted(dist_table)[:20] for i, dist in enumerate(dist_table) : if dist not in closest : dist_table[i] = 32700