Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -601,125 +601,57 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
 
 
         def calculate_experience_score(care_level: str, user_experience: str, temperament: str) -> float:
-            temperament_lower = temperament.lower()
-            
-            # 基礎分數保持現有架構，但調整分數
+            # 基礎分數矩陣 
             base_scores = {
                 "High": {
-                    "beginner": 0.12,
-                    "intermediate": 0.55,    # 從 0.65 降低，留出更多調整空間
-                    "advanced": 0.75         # 從 1.0 降低，確保需要根據特徵調整
+                    "beginner": 0.3,      # 高難度品種對新手較難
+                    "intermediate": 0.6,   
+                    "advanced": 0.8       # 即使是高手也要留有調整空間
                 },
                 "Moderate": {
-                    "beginner": 0.35,
-                    "intermediate": 0.65,    # 適當降低
-                    "advanced": 0.82         # 適當降低
+                    "beginner": 0.5,
+                    "intermediate": 0.7,
+                    "advanced": 0.85
                 },
                 "Low": {
-                    "beginner": 0.72,
-                    "intermediate": 0.80,
-                    "advanced": 0.88         # 仍然保持較高，但有調整空間
+                    "beginner": 0.7,
+                    "intermediate": 0.8,
+                    "advanced": 0.9
                 }
             }
             
-            score = base_scores.get(care_level, base_scores["Moderate"])[user_experience]
-            temperament_adjustments = 0.0
-        
-            if user_experience == "beginner":
-                # 保持原有的 beginner 邏輯，因為它運作良好
-                difficult_traits = {
-                    'stubborn': -0.15,
-                    'independent': -0.12,
-                    'dominant': -0.12,
-                    'strong-willed': -0.10,
-                    'protective': -0.08,
-                    'aloof': -0.08,
-                    'energetic': -0.06
-                }
-                
-                easy_traits = {
-                    'gentle': 0.08,
-                    'friendly': 0.08,
-                    'eager to please': 0.08,
-                    'patient': 0.06,
-                    'adaptable': 0.06,
-                    'calm': 0.05
-                }
-                
-                for trait, penalty in difficult_traits.items():
-                    if trait in temperament_lower:
-                        temperament_adjustments += penalty * 1.2
-                
-                for trait, bonus in easy_traits.items():
-                    if trait in temperament_lower:
-                        temperament_adjustments += bonus
-                        
-            elif user_experience == "intermediate":
-                # 重新設計 intermediate 的評估邏輯
-                challenging_traits = {
-                    'aggressive': -0.18,     # 加重危險特徵的懲罰
-                    'stubborn': -0.12,
-                    'dominant': -0.10,
-                    'protective': -0.08,
-                    'independent': -0.08,
-                    'energetic': -0.06
-                }
-                
-                manageable_traits = {
-                    'intelligent': 0.06,
-                    'trainable': 0.06,
-                    'adaptable': 0.05,
-                    'patient': 0.04
-                }
-                
-                # 計算特徵影響
-                negative_impact = 0
-                positive_impact = 0
-                
-                for trait, penalty in challenging_traits.items():
-                    if trait in temperament_lower:
-                        negative_impact += penalty
-                
-                for trait, bonus in manageable_traits.items():
-                    if trait in temperament_lower:
-                        positive_impact += bonus
-                
-                # 限制正面特徵的累積效果
-                temperament_adjustments = negative_impact + min(0.12, positive_impact)
-                
-            else:  # advanced
-                # 重新設計 advanced 的評估邏輯
-                risk_traits = {
-                    'aggressive': -0.15,     # 即使是 advanced 也要懲罰危險特徵
-                    'nervous': -0.12,
-                    'unpredictable': -0.12,
-                    'territorial': -0.10
-                }
-                
-                skill_traits = {
-                    'intelligent': 0.04,
-                    'trainable': 0.04,
-                    'independent': 0.03,
-                    'protective': 0.03
+            base_score = base_scores.get(care_level, base_scores["Moderate"])[user_experience]
+            
+            # 根據經驗等級有不同的特徵評估標準
+            trait_scores = {
+                "beginner": {
+                    'positive': {'friendly': 0.1, 'gentle': 0.1, 'patient': 0.08},
+                    'negative': {'aggressive': -0.2, 'stubborn': -0.15, 'dominant': -0.15}
+                },
+                "intermediate": {
+                    'positive': {'intelligent': 0.08, 'trainable': 0.08, 'adaptable': 0.06},
+                    'negative': {'aggressive': -0.15, 'stubborn': -0.1, 'dominant': -0.1}
+                },
+                "advanced": {
+                    'positive': {'intelligent': 0.06, 'independent': 0.06, 'protective': 0.05},
+                    'negative': {'aggressive': -0.1, 'nervous': -0.08, 'unpredictable': -0.08}
                 }
-                
-                # 分開計算正面和負面影響
-                negative_impact = 0
-                positive_impact = 0
-                
-                for trait, penalty in risk_traits.items():
-                    if trait in temperament_lower:
-                        negative_impact += penalty
-                
-                for trait, bonus in skill_traits.items():
-                    if trait in temperament_lower:
-                        positive_impact += bonus
-                
-                # 更嚴格地限制調整範圍
-                temperament_adjustments = negative_impact + min(0.10, positive_impact)
+            }
+            
+            temperament_lower = temperament.lower()
+            current_traits = trait_scores[user_experience]
+            
+            # 計算特徵調整
+            trait_adjustment = 0
+            for trait, value in current_traits['positive'].items():
+                if trait in temperament_lower:
+                    trait_adjustment += value
+                    
+            for trait, value in current_traits['negative'].items():
+                if trait in temperament_lower:
+                    trait_adjustment += value
             
-            # 確保最終分數在合理範圍內
-            final_score = max(0.2, min(0.95, score + temperament_adjustments))
+            final_score = max(0.2, min(0.95, base_score + trait_adjustment))
             return final_score