Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -1202,31 +1202,32 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
 
         def calculate_weighted_score(scores: dict, user_prefs: UserPreferences, breed_info: dict) -> float:
             """
-            優化的加權分數計算函數
+            計算加權分數的函數
             
-            主要改進：
-            1. 動態權重調整
-            2. 品種特性加成
-            3. 更平衡的分數分配
+            Parameters:
+            scores: dict - 包含各項評分的字典
+            user_prefs: UserPreferences - 使用者偏好設定
+            breed_info: dict - 品種資訊
+            
+            Returns:
+            float: 加權後的最終分數
             """
             # 基礎權重設定
             base_weights = {
-                'space': 0.25,      # 稍微降低空間權重
-                'exercise': 0.20,   # 提高運動權重
-                'grooming': 0.15,   # 略微提高美容權重
-                'experience': 0.18, # 降低經驗權重，避免過度主導
+                'space': 0.25,      
+                'exercise': 0.20,   
+                'grooming': 0.15,   
+                'experience': 0.18, 
                 'health': 0.12,     
-                'noise': 0.10      # 提高噪音權重
+                'noise': 0.10      
             }
             
             # 根據使用者經驗調整權重
             if user_prefs.experience_level == 'beginner':
-                # 新手更注重易照顧程度
                 base_weights['experience'] *= 1.2
                 base_weights['health'] *= 1.1
                 base_weights['grooming'] *= 0.9
             elif user_prefs.experience_level == 'advanced':
-                # 專家更注重運動和訓練潛力
                 base_weights['exercise'] *= 1.2
                 base_weights['experience'] *= 0.8
                 
@@ -1247,16 +1248,16 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             total_weight = sum(base_weights.values())
             weights = {k: v/total_weight for k, v in base_weights.items()}
             
-            # 計算基礎加權分數
-            weighted_base = sum(score * weights[category] for category, score in scores.items())
+            # 計算加權分數
+            weighted_score = sum(score * weights[category] for category, score in scores.items())
             
             # 計算品種特性加成
             breed_bonus = calculate_breed_characteristic_bonus(breed_info, user_prefs)
             
             # 混合基礎分數和特性加成
-            final_score = (weighted_base * 0.85) + (breed_bonus * 0.15)
+            final_score = (weighted_score * 0.85) + (breed_bonus * 0.15)
             
-            return final_score
+            return min(0.95, max(0.55, final_score))
         
         def calculate_breed_characteristic_bonus(breed_info: dict, user_prefs: UserPreferences) -> float:
             """
@@ -1311,7 +1312,7 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
 
         # 執行計算流程
         penalty = check_critical_issues(scores, breed_info)
-        weighted_score = calculate_weighted_score(scores)
+        weighted_score = calculate_weighted_score(scores, user_prefs, breed_info)
         final_score = calculate_final_score(weighted_score, penalty)
 
         # 準備返回結果