Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -1455,23 +1455,20 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             )
         }
 
-        # 檢查關鍵不適配情況
-        critical_issues = check_critical_matches(scores, user_prefs)
-        if critical_issues['has_critical']:
-            return apply_critical_penalty(scores, critical_issues)
-
-        # 計算環境適應性加成
-        adaptability_bonus = calculate_environmental_fit(breed_info, user_prefs)
-        
-        # 計算最終加權分數
-        final_score = calculate_final_weighted_score(
+        final_score = calculate_breed_compatibility_score(
             scores=scores,
             user_prefs=user_prefs,
-            breed_info=breed_info,
-            adaptability_bonus=adaptability_bonus
+            breed_info=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