Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -837,60 +837,51 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
         breed_bonus = calculate_breed_bonus(breed_info, user_prefs)
         
         # 調整權重配置
-        base_weights = {
-            'space': 0.25,      
-            'exercise': 0.15,   
-            'grooming': 0.10,   
-            'experience': 0.20, 
-            'health': 0.10,     
-            'noise': 0.05      
+        weights = {
+            'space': 0.28,      
+            'exercise': 0.18,   
+            'grooming': 0.12,   
+            'experience': 0.22, 
+            'health': 0.12,     
+            'noise': 0.08      
         }
         
+        # 計算基礎加權分數
+        weighted_score = sum(score * weights[category] for category, score in scores.items())
+        
+        # 如果有孩童，將 family_safety_score 作為調整因子
         if user_prefs.has_children:
-            # 不直接加入 family_safety 到權重中
-            # 而是作為一個獨立的修正因子
-            family_safety_score = calculate_family_safety_score(breed_info, user_prefs.children_age)
-            
-            # 計算基礎加權分數
-            weighted_score = sum(score * base_weights[category] for category, score in scores.items())
-            
-            # 將 family_safety_score 作為調整因子
-            # 使用較溫和的影響方式
-            safety_adjustment = (family_safety_score * 0.7) + 0.3  # 確保即使最低的安全分數也只會降低 70%
-            adjusted_score = weighted_score * safety_adjustment
-        else:
-            weighted_score = sum(score * base_weights[category] for category, score in scores.items())
-            adjusted_score = weighted_score
+            family_safety = calculate_family_safety_score(breed_info, user_prefs.children_age)
+            
+            # 使用更溫和的安全分數影響
+            # 0.8 是基礎保留率，確保即使最差的安全分數也只會降低 20% 的總分
+            safety_modifier = (family_safety * 0.2) + 0.8
+            
+            # 調整基礎分數
+            weighted_score *= safety_modifier
         
-        # 再加入品種加分的影響
+        # 加入品種額外加分的影響
         breed_bonus = calculate_breed_bonus(breed_info, user_prefs)
-        final_weighted_score = adjusted_score * (1 + breed_bonus)
+        final_weighted_score = weighted_score * (1 + breed_bonus)
         
+        # 最終分數放大函數也需要調整
         def amplify_score(score):
-            """
-            修改放大函數，讓分數差異更明顯
-            """
-            # 基礎調整
-            adjusted = (score - 0.3) * 1.5
+            # 基礎調整，使用更溫和的曲線
+            adjusted = (score - 0.3) * 1.6
             
-            # 使用較溫和的指數
-            amplified = pow(adjusted, 2.8) / 4.5 + score
+            # 使用較小的指數，避免過度放大差異
+            amplified = pow(adjusted, 2.5) / 4.0 + score
             
-            # 高分區間的處理
-            if amplified > 0.90:
-                amplified = 0.90 + (amplified - 0.90) * 0.3
+            # 更寬鬆的高分處理
+            if amplified > 0.85:
+                amplified = 0.85 + (amplified - 0.85) * 0.6
             
-            # 擴大分數範圍（0.45-0.95）
-            final_score = max(0.45, min(0.95, amplified))
+            # 擴大分數範圍（0.50-0.95）
+            final_score = max(0.50, min(0.95, amplified))
             
             return round(final_score, 3)
         
         final_score = amplify_score(final_weighted_score)
-        
-        # 四捨五入所有分數並回傳
-        scores = {k: round(v, 4) for k, v in scores.items()}
-        scores['overall'] = round(final_score, 4)
-        return scores
 
     except Exception as e:
         print(f"Error details: {str(e)}")