Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -674,43 +674,78 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
                     temperament_adjustments -= 0.12  # 加重對特定類型品種的懲罰
                     
             elif user_experience == "intermediate":
-                # 中級玩家的調整更加平衡
-                moderate_traits = {
-                    'intelligent': 0.05,     # 獎勵聰明
-                    'athletic': 0.04,        # 獎勵運動能力
-                    'versatile': 0.04,       # 獎勵多功能性
-                    'stubborn': -0.06,       # 輕微懲罰固執
-                    'independent': -0.05,    # 輕微懲罰獨立性
-                    'protective': -0.04      # 輕微懲罰保護性
+                base_scores = {
+                    "High": {"intermediate": 0.65},
+                    "Moderate": {"intermediate": 0.75},
+                    "Low": {"intermediate": 0.85}
                 }
+                score = base_scores.get(care_level, base_scores["Moderate"])[user_experience]
                 
-                for trait, adjustment in moderate_traits.items():
+                # 中級玩家特徵評估 - 參考 beginner 的邏輯結構
+                challenging_traits = {
+                    'stubborn': -0.10,       # 仍然需要扣分，但比 beginner 輕
+                    'independent': -0.08,    
+                    'dominant': -0.08,       
+                    'protective': -0.06,     
+                    'aggressive': -0.12,     # 仍然嚴重扣分
+                    'nervous': -0.08
+                }
+                
+                positive_traits = {
+                    'intelligent': 0.06,
+                    'trainable': 0.06,
+                    'adaptable': 0.05,
+                    'calm': 0.04,
+                    'friendly': 0.04
+                }
+                
+                # 計算特徵調整
+                for trait, penalty in challenging_traits.items():
                     if trait in temperament_lower:
-                        temperament_adjustments += adjustment
+                        temperament_adjustments += penalty
                         
+                for trait, bonus in positive_traits.items():
+                    if trait in temperament_lower:
+                        if temperament_adjustments + bonus <= 0.12:  # 限制正面特徵累積
+                            temperament_adjustments += bonus
+            
             else:  # advanced
-                # 資深玩家能夠應對挑戰性特徵
-                advanced_traits = {
-                    'stubborn': 0.02,        # 降低加分幅度
-                    'independent': 0.02,     
-                    'intelligent': 0.05,     
-                    'protective': 0.02,      
-                    'strong-willed': 0.02,   
-                    'aggressive': -0.04,     # 新增負面特徵
-                    'nervous': -0.03,        
-                    'dominant': -0.02        
+                base_scores = {
+                    "High": {"advanced": 0.75},     # 降低基礎分數
+                    "Moderate": {"advanced": 0.82},
+                    "Low": {"advanced": 0.88}
                 }
+                score = base_scores.get(care_level, base_scores["Moderate"])[user_experience]
                 
-                for trait, bonus in advanced_traits.items():
+                # 即使是進階玩家也需要考慮的風險特徵
+                risk_traits = {
+                    'aggressive': -0.15,     # 最嚴重的風險特徵
+                    'nervous': -0.12,
+                    'unpredictable': -0.12,
+                    'territorial': -0.10,
+                    'dominant': -0.08,
+                    'strong-willed': -0.06
+                }
+                
+                # 進階玩家可以處理的特徵，但仍需謹慎
+                manageable_traits = {
+                    'intelligent': 0.05,
+                    'trainable': 0.04,
+                    'independent': 0.03,
+                    'protective': 0.02
+                }
+                
+                # 先計算風險特徵
+                for trait, penalty in risk_traits.items():
                     if trait in temperament_lower:
-                        # 加入條件評估
-                        if bonus > 0:  # 正面特徵
-                            # 限制正面特徵的累積加分不超過0.15
-                            if temperament_adjustments + bonus <= 0.15:
-                                temperament_adjustments += bonus
-                        else:  # 負面特徵
-                            # 負面特徵一定要計算
-                            temperament_adjustments += bonus
+                        temperament_adjustments += penalty
+                
+                # 再加上可控制特徵，但有限制
+                positive_adjustment = 0
+                for trait, bonus in manageable_traits.items():
+                    if trait in temperament_lower:
+                        positive_adjustment += bonus
+                temperament_adjustments += min(0.10, positive_adjustment)  # 限制正面特徵的總影響
             
             # 確保最終分數在合理範圍內
             final_score = max(0.2, min(1.0, score + temperament_adjustments))