Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -1704,19 +1704,19 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
             }
         
             def determine_breed_type():
-                """
-                根據品種的描述和性格特徵判斷其運動類型。
-                就像體育教練要先了解運動員的特點才能制定訓練計劃。
-                """
+                """改進品種運動類型的判斷，更精確識別工作犬"""
                 # 優先檢查特殊運動類型的標識符
                 for breed_type, pattern in breed_exercise_patterns.items():
                     if any(identifier in temperament or identifier in description 
                           for identifier in pattern['identifiers']):
                         return breed_type
                 
-                # 如果沒有特殊標識，根據運動需求級別判斷
-                if exercise_needs in ['VERY HIGH', 'HIGH']:
-                    return 'endurance_type'
+                # 改進：根據運動需求和工作犬特徵進行更細緻的判斷
+                if (exercise_needs in ['VERY HIGH', 'HIGH'] or
+                    any(trait in temperament.lower() for trait in 
+                        ['herding', 'working', 'intelligent', 'athletic', 'tireless'])):
+                    if user_prefs.experience_level == 'advanced':
+                        return 'endurance_type'  # 優先判定為耐力型
                 elif exercise_needs == 'LOW':
                     return 'moderate_type'
                 
@@ -1754,27 +1754,28 @@ 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):
-                """
-                處理特殊情況，確保運動方式真正符合品種需求。
-                就像確保訓練計劃不會違背運動員的特點。
-                """
-                # 短跑型品種的特殊處理
+                """處理特殊情況，加強工作犬的評估"""
+                # 短跑型品種邏輯保持不變
                 if breed_type == 'sprint_type':
                     if exercise_time > pattern['time_ranges']['penalty_start']:
-                        # 時間過長的嚴重懲罰
                         time_score *= 0.5
-                        # 如果同時運動類型不適合，更嚴重的懲罰
                         if exercise_type != 'active_training':
                             type_score *= 0.4
-                            
-                # 耐力型品種的特殊處理
+                
+                # 改進耐力型品種的評估
                 elif breed_type == 'endurance_type':
                     if exercise_time < pattern['time_ranges']['penalty_start']:
-                        time_score *= 0.6
-                    # 運動強度不足的懲罰
-                    if exercise_type == 'light_walks' and exercise_time > 90:
-                        type_score *= 0.5
-                        
+                        time_score *= 0.5  # 加重時間不足的懲罰
+                    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)
+                
                 return time_score, type_score
         
             # 執行評估流程
@@ -1969,10 +1970,10 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
             return extremities
     
         def calculate_weight_adjustments(extremities):
-            """根據條件極端度計算權重調整"""
+            """根據條件極端度計算權重調整，特別加強對工作犬的評估"""
             adjustments = {}
             
-            # 空間權重調整邏輯
+            # 空間權重調整邏輯保持原樣，因為邏輯合理
             if extremities['space'][0] == 'highly_restricted':
                 adjustments['space'] = 2.5
                 adjustments['noise'] = 2.0
@@ -1980,43 +1981,55 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
                 adjustments['space'] = 1.8
                 adjustments['noise'] = 1.5
             elif extremities['space'][0] == 'spacious':
-                adjustments['space'] = 0.8    # 降低空間權重
-                adjustments['exercise'] = 1.4  # 提升運動重要性
-                
-            # 運動需求權重調整
+                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  # 提高工作犬的運動權重
             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':
-                adjustments['experience'] = 1.8
-                
+                # 提高進階飼主對工作犬的權重
+                if any(trait in breed_info.get('Temperament', '').lower() 
+                       for trait in ['herding', 'working', 'intelligent']):
+                    adjustments['experience'] = 2.2
+                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] == 'low' and 
+                
+                # 新增：進階飼主 + 大空間 + 高運動量 + 工作犬
+                if (extremities['experience'][0] == 'high' and 
                     extremities['space'][0] == 'spacious' and
-                    extremities['exercise'][0] in ['high', 'extremely_high']):
-                    adjustments['experience'] = adjustments.get('experience', 1.0) * 1.4
-                    
-                # 空間充足時降低其權重
+                    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
+                
                 if extremities['space'][0] == 'spacious':
                     for key in ['grooming', 'health', 'noise']:
                         if key not in adjustments:
                             adjustments[key] = 1.2
-                            
+            
             adjust_for_combinations()
             return adjustments