Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -486,7 +486,7 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
                     },
                     "Medium": {
                         "apartment": {
-                            "no_yard": 0.35,      # 中型犬在公寓較受限
+                            "no_yard": 0.35,      
                             "shared_yard": 0.45,
                             "private_yard": 0.55
                         },
@@ -503,9 +503,9 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
                     },
                     "Large": {
                         "apartment": {
-                            "no_yard": 0.35,      
-                            "shared_yard": 0.45,
-                            "private_yard": 0.55
+                            "no_yard": 0.45,      
+                            "shared_yard": 0.55,
+                            "private_yard": 0.65
                         },
                         "house_small": {
                             "no_yard": 0.55,
@@ -520,9 +520,9 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
                     },
                     "Giant": {
                         "apartment": {
-                            "no_yard": 0.15,      # 巨型犬在公寓基本不適合
-                            "shared_yard": 0.25,
-                            "private_yard": 0.35
+                            "no_yard": 0.40,      
+                            "shared_yard": 0.50,
+                            "private_yard": 0.60
                         },
                         "house_small": {
                             "no_yard": 0.40,
@@ -605,10 +605,10 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             def apply_extreme_case_adjustments(score):
                 # 處理極端情況
                 if size == "Giant" and living_space == "apartment":
-                    return score * 0.75  # 巨型犬在公寓給予較低分數
+                    return score * 0.85  
                 
                 if size == "Large" and living_space == "apartment" and exercise_needs == "Very High":
-                    return score * 0.85  # 高運動需求的大型犬在公寓更不適合
+                    return score * 0.85  
                     
                 if size == "Small" and living_space == "house_large" and exercise_needs == "Low":
                     return score * 0.9  # 低運動需求的小型犬在大房子可能過於寬敞
@@ -727,9 +727,9 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             def calculate_time_score():
                 if exercise_time >= breed_level['ideal']:
                     if exercise_time > breed_level['max']:
-                        # 超出最大值的懲罰更明顯
-                        excess = (exercise_time - breed_level['max']) / 30
-                        return max(0.4, 1.0 - (excess * 0.2))
+                        excess = (exercise_time - breed_level['max']) / breed_level['max']
+                        bonus = min(0.15, excess * 0.3)
+                        return min(1.0, 1.0 + bonus)
                     return 1.0  # 理想範圍內給予滿分
                 elif exercise_time >= breed_level['min']:
                     # 在最小值和理想值之間使用更陡峭的曲線