Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -1160,10 +1160,19 @@ def check_critical_matches(scores: dict, user_prefs: UserPreferences) -> dict:
     return critical_issues
 
 def apply_critical_penalty(scores: dict, critical_issues: dict) -> dict:
-    """當發現關鍵不適配時，調整分數"""
+    """
+    當發現關鍵不適配時，調整分數
+    
+    首先計算基礎整體分數，然後根據不同的關鍵問題應用懲罰係數
+    """
     penalized_scores = scores.copy()
-    penalty_factor = 0.6
+    penalty_factor = 0.6  # 基礎懲罰因子
     
+    # 先計算基礎整體分數（使用簡單平均）
+    base_overall = sum(scores.values()) / len(scores)
+    penalized_scores['overall'] = base_overall
+    
+    # 根據不同的關鍵問題應用懲罰
     for reason in critical_issues['reasons']:
         if reason == 'space_incompatible':
             penalized_scores['overall'] *= penalty_factor
@@ -1175,6 +1184,10 @@ def apply_critical_penalty(scores: dict, critical_issues: dict) -> dict:
             penalized_scores['overall'] *= penalty_factor
             penalized_scores['experience'] *= penalty_factor
     
+    # 確保所有分數都在有效範圍內
+    for key in penalized_scores:
+        penalized_scores[key] = max(0.1, min(1.0, penalized_scores[key]))
+    
     return penalized_scores
 
 def calculate_environmental_fit(breed_info: dict, user_prefs: UserPreferences) -> float: