Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -1660,9 +1660,34 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             
             # 確保最終分數在合理範圍內
             return max(0.15, min(1.0, final_score))
+
+
+def calculate_environmental_fit(breed_info: dict, user_prefs: UserPreferences) -> float:
+    """計算品種與環境的適應性加成"""
+    adaptability_score = 0.0
+    description = breed_info.get('Description', '').lower()
+    temperament = breed_info.get('Temperament', '').lower()
+    
+    # 環境適應性評估
+    if user_prefs.living_space == 'apartment':
+        if 'adaptable' in temperament or 'apartment' in description:
+            adaptability_score += 0.1
+        if breed_info.get('Size') == 'Small':
+            adaptability_score += 0.05
+    elif user_prefs.living_space == 'house_large':
+        if 'active' in temperament or 'energetic' in description:
+            adaptability_score += 0.1
             
+    # 氣候適應性
+    if user_prefs.climate in description or user_prefs.climate in temperament:
+        adaptability_score += 0.05
+        
+    return min(0.2, adaptability_score)
 
-        # 1. 計算基礎分數
+
+def calculate_breed_matching(breed_info: dict, user_prefs: UserPreferences) -> dict:
+    """計算品種的整體評分與匹配度"""
+    try:
         print("\n=== 開始計算品種相容性分數 ===")
         print(f"處理品種: {breed_info.get('Breed', 'Unknown')}")
         print(f"品種信息: {breed_info}")
@@ -1701,27 +1726,24 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             )
         }
 
-        final_score = calculate_breed_compatibility_score(
-            scores=scores,
-            user_prefs=user_prefs,
-            breed_info=breed_info
-        )
-
+        # 計算最終相容性分數
+        final_score = calculate_compatibility_score(scores, user_prefs, breed_info)
+        
         # 計算環境適應性加成
         adaptability_bonus = calculate_environmental_fit(breed_info, user_prefs)
-
+        
         # 整合最終分數和加成
         final_score = (final_score * 0.9) + (adaptability_bonus * 0.1)
         final_score = amplify_score_extreme(final_score)
-
+        
         # 更新並返回完整的評分結果
         scores.update({
             'overall': final_score,
             'adaptability_bonus': adaptability_bonus
         })
-
+        
         return scores
-
+        
     except Exception as e:
         print(f"\n!!!!! 發生嚴重錯誤 !!!!!")
         print(f"錯誤類型: {type(e).__name__}")
@@ -1731,29 +1753,6 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
         return {k: 0.6 for k in ['space', 'exercise', 'grooming', 'experience', 'health', 'noise', 'overall']}
 
 
-def calculate_environmental_fit(breed_info: dict, user_prefs: UserPreferences) -> float:
-    """計算品種與環境的適應性加成"""
-    adaptability_score = 0.0
-    description = breed_info.get('Description', '').lower()
-    temperament = breed_info.get('Temperament', '').lower()
-    
-    # 環境適應性評估
-    if user_prefs.living_space == 'apartment':
-        if 'adaptable' in temperament or 'apartment' in description:
-            adaptability_score += 0.1
-        if breed_info.get('Size') == 'Small':
-            adaptability_score += 0.05
-    elif user_prefs.living_space == 'house_large':
-        if 'active' in temperament or 'energetic' in description:
-            adaptability_score += 0.1
-            
-    # 氣候適應性
-    if user_prefs.climate in description or user_prefs.climate in temperament:
-        adaptability_score += 0.05
-        
-    return min(0.2, adaptability_score)
-
-
 # def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreferences, breed_info: dict) -> float:
 #     """
 #     改進的品種相容性評分系統
@@ -1846,6 +1845,39 @@ def calculate_environmental_fit(breed_info: dict, user_prefs: UserPreferences) -
 #     return min(1.0, max(0.0, (final_score * 0.85) + (breed_bonus * 0.15)))
 
 
+# def amplify_score_extreme(score: float) -> float:
+#     """
+#     改進的分數轉換函數
+#     提供更大的分數範圍和更明顯的差異
+    
+#     轉換邏輯：
+#     - 極差匹配 (0.0-0.3) -> 60-68%
+#     - 較差匹配 (0.3-0.5) -> 68-75%
+#     - 中等匹配 (0.5-0.7) -> 75-85%
+#     - 良好匹配 (0.7-0.85) -> 85-92%
+#     - 優秀匹配 (0.85-1.0) -> 92-95%
+#     """
+#     if score < 0.3:
+#         # 極差匹配：快速線性增長
+#         return 0.60 + (score / 0.3) * 0.08
+#     elif score < 0.5:
+#         # 較差匹配：緩慢增長
+#         position = (score - 0.3) / 0.2
+#         return 0.68 + position * 0.07
+#     elif score < 0.7:
+#         # 中等匹配：穩定線性增長
+#         position = (score - 0.5) / 0.2
+#         return 0.75 + position * 0.10
+#     elif score < 0.85:
+#         # 良好匹配：加速增長
+#         position = (score - 0.7) / 0.15
+#         return 0.85 + position * 0.07
+#     else:
+#         # 優秀匹配：最後衝刺
+#         position = (score - 0.85) / 0.15
+#         return 0.92 + position * 0.03
+
+
 def calculate_compatibility_score(scores: dict, user_prefs: UserPreferences, breed_info: dict) -> float:
     """
     計算品種與使用者的整體相容性分數
@@ -1993,39 +2025,6 @@ def calculate_compatibility_score(scores: dict, user_prefs: UserPreferences, bre
     
     # 確保分數在合理範圍內並保留兩位小數
     return round(max(60.0, min(95.0, final_score)), 2)
-    
-
-# def amplify_score_extreme(score: float) -> float:
-#     """
-#     改進的分數轉換函數
-#     提供更大的分數範圍和更明顯的差異
-    
-#     轉換邏輯：
-#     - 極差匹配 (0.0-0.3) -> 60-68%
-#     - 較差匹配 (0.3-0.5) -> 68-75%
-#     - 中等匹配 (0.5-0.7) -> 75-85%
-#     - 良好匹配 (0.7-0.85) -> 85-92%
-#     - 優秀匹配 (0.85-1.0) -> 92-95%
-#     """
-#     if score < 0.3:
-#         # 極差匹配：快速線性增長
-#         return 0.60 + (score / 0.3) * 0.08
-#     elif score < 0.5:
-#         # 較差匹配：緩慢增長
-#         position = (score - 0.3) / 0.2
-#         return 0.68 + position * 0.07
-#     elif score < 0.7:
-#         # 中等匹配：穩定線性增長
-#         position = (score - 0.5) / 0.2
-#         return 0.75 + position * 0.10
-#     elif score < 0.85:
-#         # 良好匹配：加速增長
-#         position = (score - 0.7) / 0.15
-#         return 0.85 + position * 0.07
-#     else:
-#         # 優秀匹配：最後衝刺
-#         position = (score - 0.85) / 0.15
-#         return 0.92 + position * 0.03
 
 
 def amplify_score_extreme(score: float) -> float: