Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -1754,28 +1754,40 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
                         return 0.6 + (0.4 * remaining)
         
             def apply_special_adjustments(time_score, type_score, breed_type, pattern):
-                """處理特殊情況，加強工作犬的評估"""
-                # 短跑型品種邏輯保持不變
+                """
+                處理特殊情況，確保運動方式真正符合品種需求。
+                特別加強：
+                1. 短跑型犬種的長時間運動懲罰
+                2. 耐力型犬種的獎勵機制
+                3. 運動類型匹配的重要性
+                """
+                # 短跑型品種的特殊處理
                 if breed_type == 'sprint_type':
                     if exercise_time > pattern['time_ranges']['penalty_start']:
-                        time_score *= 0.5
+                        # 加重長時間運動的懲罰
+                        penalty_factor = min(0.8, (exercise_time - pattern['time_ranges']['penalty_start']) / 60)
+                        time_score *= max(0.3, 1 - penalty_factor)  # 最低降到0.3
+                        # 運動類型不適合時的額外懲罰
                         if exercise_type != 'active_training':
-                            type_score *= 0.4
-                
-                # 改進耐力型品種的評估
+                            type_score *= 0.3  # 更嚴重的懲罰
+                            
+                # 耐力型品種的特殊處理
                 elif breed_type == 'endurance_type':
                     if exercise_time < pattern['time_ranges']['penalty_start']:
-                        time_score *= 0.5  # 加重時間不足的懲罰
+                        time_score *= 0.5  # 維持運動不足的懲罰
+                    elif exercise_time >= 150:  # 新增：高運動量獎勵
+                        if exercise_type in ['active_training', 'moderate_activity']:
+                            time_bonus = min(0.3, (exercise_time - 150) / 150)
+                            time_score = min(1.0, time_score * (1 + time_bonus))
+                            type_score = min(1.0, type_score * 1.2)
+                    
+                    # 運動強度不足的懲罰
                     if exercise_type == 'light_walks':
                         if exercise_time > 90:
-                            type_score *= 0.4  # 加重強度不足的懲罰
-                    # 新增：進階飼主對工作犬的獎勵
-                    if (user_prefs.experience_level == 'advanced' and
-                        exercise_time >= 150 and
-                        exercise_type in ['active_training', 'moderate_activity']):
-                        time_score = min(1.0, time_score * 1.2)
-                        type_score = min(1.0, type_score * 1.2)
-                
+                            type_score *= 0.4  # 加重懲罰
+                        else:
+                            type_score *= 0.5
+                            
                 return time_score, type_score
         
             # 執行評估流程
@@ -1970,10 +1982,18 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
             return extremities
     
         def calculate_weight_adjustments(extremities):
-            """根據條件極端度計算權重調整，特別加強對工作犬的評估"""
+            """
+            根據條件極端度計算權重調整，特別強化：
+            1. 高運動量時對耐力型犬種的偏好
+            2. 專家級別對工作犬種的偏好
+            3. 條件組合的整體評估
+            """
             adjustments = {}
+            temperament = breed_info.get('Temperament', '').lower()
+            is_working_dog = any(trait in temperament 
+                                for trait in ['herding', 'working', 'intelligent', 'tireless'])
             
-            # 空間權重調整邏輯保持原樣，因為邏輯合理
+            # 空間權重調整邏輯保持不變
             if extremities['space'][0] == 'highly_restricted':
                 adjustments['space'] = 2.5
                 adjustments['noise'] = 2.0
@@ -1984,46 +2004,44 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
                 adjustments['space'] = 0.8
                 adjustments['exercise'] = 1.4
             
-            # 改進運動需求權重調整，考慮工作犬特性
+            # 改進運動需求權重調整
             if extremities['exercise'][0] in ['extremely_low', 'extremely_high']:
-                adjustments['exercise'] = 2.5
-                # 檢查是否為工作犬且運動量高
-                if (extremities['exercise'][0] == 'extremely_high' and
-                    any(trait in breed_info.get('Temperament', '').lower() 
-                        for trait in ['herding', 'working', 'intelligent'])):
-                    adjustments['exercise'] = 3.0  # 提高工作犬的運動權重
+                base_adjustment = 2.5
+                if extremities['exercise'][0] == 'extremely_high':
+                    if is_working_dog:
+                        base_adjustment = 3.0  # 工作犬在高運動量時獲得更高權重
+                adjustments['exercise'] = base_adjustment
             elif extremities['exercise'][0] in ['low', 'high']:
                 adjustments['exercise'] = 1.8
             
-            # 改進經驗需求權重調整，強化專家對工作犬的評估
+            # 改進經驗需求權重調整
             if extremities['experience'][0] == 'low':
                 adjustments['experience'] = 2.2
                 if breed_info.get('Care Level') == 'HIGH':
                     adjustments['experience'] = 2.5
             elif extremities['experience'][0] == 'high':
-                # 提高進階飼主對工作犬的權重
-                if any(trait in breed_info.get('Temperament', '').lower() 
-                       for trait in ['herding', 'working', 'intelligent']):
-                    adjustments['experience'] = 2.2
+                if is_working_dog:
+                    adjustments['experience'] = 2.5  # 提高專家對工作犬的權重
+                    if extremities['exercise'][0] in ['high', 'extremely_high']:
+                        adjustments['experience'] = 2.8  # 特別強化高運動量工作犬
                 else:
                     adjustments['experience'] = 1.8
             
             # 綜合條件影響
             def adjust_for_combinations():
-                # 保持原有邏輯
+                # 保持原有的基礎邏輯
                 if (extremities['space'][0] == 'highly_restricted' and 
                     extremities['exercise'][0] in ['high', 'extremely_high']):
                     adjustments['space'] = adjustments.get('space', 1.0) * 1.3
                     adjustments['exercise'] = adjustments.get('exercise', 1.0) * 1.3
                 
-                # 新增：進階飼主 + 大空間 + 高運動量 + 工作犬
+                # 新增：專家 + 大空間 + 高運動量 + 工作犬的組合
                 if (extremities['experience'][0] == 'high' and 
                     extremities['space'][0] == 'spacious' and
                     extremities['exercise'][0] in ['high', 'extremely_high'] and
-                    any(trait in breed_info.get('Temperament', '').lower() 
-                        for trait in ['herding', 'working', 'intelligent'])):
-                    adjustments['exercise'] = adjustments.get('exercise', 1.0) * 1.5
-                    adjustments['experience'] = adjustments.get('experience', 1.0) * 1.5
+                    is_working_dog):
+                    adjustments['exercise'] = adjustments.get('exercise', 1.0) * 1.4
+                    adjustments['experience'] = adjustments.get('experience', 1.0) * 1.4
                 
                 if extremities['space'][0] == 'spacious':
                     for key in ['grooming', 'health', 'noise']: