Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -792,24 +792,24 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             # 根據品種大小調整美容工作量
             size_adjustments = {
                 "Giant": {
-                    "low": -0.35,     # 大型犬的美容工作量顯著增加
-                    "medium": -0.20,
-                    "high": -0.10
-                },
-                "Large": {
-                    "low": -0.25,
-                    "medium": -0.15,
+                    "low": -0.20,     # 大型犬的美容工作量顯著增加
+                    "medium": -0.10,
                     "high": -0.05
                 },
-                "Medium": {
+                "Large": {
                     "low": -0.15,
-                    "medium": -0.10,
+                    "medium": -0.05,
                     "high": 0
                 },
-                "Small": {
+                "Medium": {
                     "low": -0.10,
                     "medium": -0.05,
                     "high": 0
+                },
+                "Small": {
+                    "low": -0.05,
+                    "medium": 0,
+                    "high": 0
                 }
             }
         
@@ -1016,13 +1016,13 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             
             # 嚴重健康問題 - 加重扣分
             severe_conditions = {
-                'hip dysplasia': -0.25,           # 髖關節發育不良，影響生活品質
-                'heart disease': -0.25,           # 心臟疾病，需要長期治療
-                'progressive retinal atrophy': -0.20,  # 進行性視網膜萎縮，導致失明
-                'bloat': -0.22,                   # 胃扭轉，致命風險
-                'epilepsy': -0.20,                # 癲癇，需要長期藥物控制
-                'degenerative myelopathy': -0.20,  # 脊髓退化，影響行動能力
-                'von willebrand disease': -0.18    # 血液凝固障礙
+                'hip dysplasia': -0.20,           # 髖關節發育不良，影響生活品質
+                'heart disease': -0.15,           # 心臟疾病，需要長期治療
+                'progressive retinal atrophy': -0.15,  # 進行性視網膜萎縮，導致失明
+                'bloat': -0.18,                   # 胃扭轉，致命風險
+                'epilepsy': -0.15,                # 癲癇，需要長期藥物控制
+                'degenerative myelopathy': -0.15,  # 脊髓退化，影響行動能力
+                'von willebrand disease': -0.12    # 血液凝固障礙
             }
             
             # 中度健康問題 - 適度扣分
@@ -1280,16 +1280,11 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
 
         # 計算環境適應性加成
         adaptability_bonus = calculate_environmental_fit(breed_info, user_prefs)
-
-
-        
-        # if user_prefs.living_space == "apartment" and breed_info['Size'] in ["Giant", "Large"]:
-        #     final_score *= 0.7  # 大型犬在公寓環境下的顯著懲罰
         
         if (breed_info.get('Exercise Needs') == "Very High" and 
             user_prefs.living_space == "apartment" and 
             user_prefs.exercise_time < 90):
-            final_score *= 0.75  # 高運動需求但條件不足的懲罰
+            final_score *= 0.85  # 高運動需求但條件不足的懲罰
 
         # 整合最終分數和加成
         combined_score = (final_score * 0.9) + (adaptability_bonus * 0.1)
@@ -2147,11 +2142,11 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
             for metric, score in critical_failures:
                 if metric in ['space', 'exercise']:
                     # 降低空間和運動失敗的懲罰程度
-                    penalty = (critical_thresholds[metric] - score) * 0.12  # 從0.15降低到0.12
+                    penalty = (critical_thresholds[metric] - score) * 0.08  
                     space_exercise_penalty += penalty
                 else:
                     # 其他失敗的懲罰保持較高
-                    penalty = (critical_thresholds[metric] - score) * 0.25  # 從0.3降低到0.25
+                    penalty = (critical_thresholds[metric] - score) * 0.20  
                     other_penalty += penalty
     
             # 計算總懲罰，但使用更溫和的方式