From d23050b811902afcf130d15c434d3ae37c8ffd24 Mon Sep 17 00:00:00 2001
From: Helldragon67 <kilian.scheidecker@orange.fr>
Date: Wed, 24 Jul 2024 10:34:34 +0200
Subject: [PATCH] fixed parameters folder

---
 backend/src/amenities/nature.am                  | 12 ------------
 backend/src/amenities/sightseeing.am             | 11 -----------
 backend/src/parameters/landmarks_manager.params  |  8 --------
 backend/src/parameters/optimizer.params          |  5 -----
 backend/src/parameters/optimizer_parameters.yaml |  2 +-
 backend/src/tester.py                            |  6 +++---
 6 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 backend/src/amenities/nature.am
 delete mode 100644 backend/src/amenities/sightseeing.am
 delete mode 100644 backend/src/parameters/landmarks_manager.params
 delete mode 100644 backend/src/parameters/optimizer.params

diff --git a/backend/src/amenities/nature.am b/backend/src/amenities/nature.am
deleted file mode 100644
index 5102c02..0000000
--- a/backend/src/amenities/nature.am
+++ /dev/null
@@ -1,12 +0,0 @@
-'leisure'='park'
-geological
-'natural'='geyser'
-'natural'='hot_spring'
-'natural'='arch'
-'natural'='volcano'
-'natural'='stone'
-'tourism'='alpine_hut'
-'tourism'='viewpoint'
-'tourism'='zoo'
-'tourism'='artwork'
-'waterway'='waterfall'
\ No newline at end of file
diff --git a/backend/src/amenities/sightseeing.am b/backend/src/amenities/sightseeing.am
deleted file mode 100644
index 053f9c9..0000000
--- a/backend/src/amenities/sightseeing.am
+++ /dev/null
@@ -1,11 +0,0 @@
-'tourism'='museum'
-'tourism'='attraction'
-'tourism'='gallery'
-'tourism'='artwork'
-historic
-'amenity'='planetarium'
-'amenity'='place_of_worship'
-'amenity'='fountain'
-'water'='reflecting_pool'
-# 'tourism'='attraction' might be a bit too broad
-# historic as well
\ No newline at end of file
diff --git a/backend/src/parameters/landmarks_manager.params b/backend/src/parameters/landmarks_manager.params
deleted file mode 100644
index e0cbe35..0000000
--- a/backend/src/parameters/landmarks_manager.params
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "city bbox side" : 5000,
-  "radius close to" : 50,
-  "church coeff" : 0.8,
-  "park coeff" : 1.2,
-  "tag coeff" : 10,
-  "N important" : 40
-}
\ No newline at end of file
diff --git a/backend/src/parameters/optimizer.params b/backend/src/parameters/optimizer.params
deleted file mode 100644
index b971821..0000000
--- a/backend/src/parameters/optimizer.params
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "detour factor" : 1.4,
-  "average walking speed" : 4.8,
-  "max landmarks" : 7
-}
\ No newline at end of file
diff --git a/backend/src/parameters/optimizer_parameters.yaml b/backend/src/parameters/optimizer_parameters.yaml
index 515d028..efd2547 100644
--- a/backend/src/parameters/optimizer_parameters.yaml
+++ b/backend/src/parameters/optimizer_parameters.yaml
@@ -1,3 +1,3 @@
 detour_factor: 1.4
 average_walking_speed: 4.8
-max_landmarks: 40
+max_landmarks: 7
diff --git a/backend/src/tester.py b/backend/src/tester.py
index 156b2a5..cd75435 100644
--- a/backend/src/tester.py
+++ b/backend/src/tester.py
@@ -35,13 +35,13 @@ def test(start_coords: tuple[float, float], finish_coords: tuple[float, float] =
                     nature=Preference(
                                   name='nature', 
                                   type='nature',
-                                  score = 0),
+                                  score = 5),
                     shopping=Preference(
                                   name='shopping', 
                                   type='shopping',
-                                  score = 0),
+                                  score = 5),
 
-                    max_time_minute=45,
+                    max_time_minute=180,
                     detour_tolerance_minute=0
                     )