Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -1646,69 +1646,96 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
             exercise_time = user_prefs.exercise_time
             exercise_type = user_prefs.exercise_type
             temperament = breed_info.get('Temperament', '').lower()
-            
-            # 定義品種運動特性
-            exercise_patterns = {
-                'sprint_type': {  # 短跑型，如 Whippet
-                    'keywords': ['fast', 'speed', 'agile', 'sprint'],
-                    'ideal_time': (30, 90),
-                    'ideal_type': 'active_training',
-                    'time_penalties': {
-                        'over': 0.7,    # 運動時間過長的懲罰
-                        'under': 0.6    # 運動時間不足的懲罰
+            description = breed_info.get('Description', '').lower()
+    
+            # 定義更細緻的品種運動特性
+            breed_exercise_patterns = {
+                'sprint_type': {  # 如 Whippet, Saluki
+                    'identifiers': ['fast', 'speed', 'sprint', 'racing', 'coursing'],
+                    'ideal_exercise': {
+                        'active_training': 1.0,    # 適合高強度訓練
+                        'moderate_activity': 0.6,   # 不太適合持續運動
+                        'light_walks': 0.4         # 不適合純散步
+                    },
+                    'time_ranges': {
+                        'ideal': (30, 90),         # 理想運動時間
+                        'acceptable': (20, 120)     # 可接受範圍
                     }
                 },
-                'endurance_type': {  # 耐力型，如 Border Collie
-                    'keywords': ['herding', 'working', 'energetic', 'tireless'],
-                    'ideal_time': (90, 180),
-                    'ideal_type': 'moderate_activity',
-                    'time_penalties': {
-                        'over': 0.9,    # 耐力型對超時較寬容
-                        'under': 0.5    # 但對運動不足較敏感
+                'endurance_type': {  # 如 Border Collie, German Shepherd
+                    'identifiers': ['herding', 'working', 'tireless', 'energetic', 'stamina'],
+                    'ideal_exercise': {
+                        'active_training': 0.9,    # 適合高強度訓練
+                        'moderate_activity': 1.0,   # 最適合持續運動
+                        'light_walks': 0.5         # 不適合純散步
+                    },
+                    'time_ranges': {
+                        'ideal': (90, 180),        # 理想運動時間
+                        'acceptable': (60, 240)     # 可接受範圍
                     }
                 },
-                'moderate_type': {  # 一般型
-                    'keywords': ['playful', 'active', 'friendly'],
-                    'ideal_time': (60, 120),
-                    'ideal_type': 'moderate_activity',
-                    'time_penalties': {
-                        'over': 0.8,
-                        'under': 0.7
+                'moderate_type': {  # 如 Labrador, Golden Retriever
+                    'identifiers': ['friendly', 'playful', 'adaptable', 'versatile'],
+                    'ideal_exercise': {
+                        'active_training': 0.8,
+                        'moderate_activity': 1.0,
+                        'light_walks': 0.7
+                    },
+                    'time_ranges': {
+                        'ideal': (60, 120),
+                        'acceptable': (45, 180)
                     }
                 }
             }
     
             # 判斷品種的運動類型
-            breed_type = 'moderate_type'  # 預設值
-            for pattern_type, pattern in exercise_patterns.items():
-                if any(keyword in temperament for keyword in pattern['keywords']):
-                    breed_type = pattern_type
-                    break
+            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
+                return 'moderate_type'  # 預設類型
     
-            pattern = exercise_patterns[breed_type]
-            min_time, max_time = pattern['ideal_time']
+            breed_type = determine_breed_type()
+            pattern = breed_exercise_patterns[breed_type]
     
             # 計算時間匹配度
-            if min_time <= exercise_time <= max_time:
-                time_score = 1.0
-            elif exercise_time < min_time:
-                time_score = pattern['time_penalties']['under']
-            else:
-                time_score = pattern['time_penalties']['over']
+            def calculate_time_match():
+                ideal_min, ideal_max = pattern['time_ranges']['ideal']
+                accept_min, accept_max = pattern['time_ranges']['acceptable']
+                
+                if ideal_min <= exercise_time <= ideal_max:
+                    return 1.0
+                elif exercise_time < accept_min:
+                    return max(0.3, 1 - ((accept_min - exercise_time) / accept_min))
+                elif exercise_time > accept_max:
+                    return max(0.3, 1 - ((exercise_time - accept_max) / accept_max))
+                else:
+                    # 在可接受範圍內，但不在理想範圍
+                    if exercise_time < ideal_min:
+                        return 0.7 + (0.3 * (exercise_time - accept_min) / (ideal_min - accept_min))
+                    else:
+                        return 0.7 + (0.3 * (accept_max - exercise_time) / (accept_max - ideal_max))
     
-            # 運動類型匹配度
-            type_scores = {
-                'light_walks': 0.7,
-                'moderate_activity': 0.9,
-                'active_training': 1.0
-            }
-            type_score = type_scores.get(exercise_type, 0.7)
+            # 計算運動類型匹配度
+            type_score = pattern['ideal_exercise'].get(exercise_type, 0.5)
     
             # 特殊情況處理
-            if breed_type == 'sprint_type' and exercise_time > 120:
-                if exercise_type != 'active_training':
-                    type_score *= 0.6  # 衝刺型品種不適合長時間中低強度運動
+            def apply_special_adjustments(time_score, type_score):
+                if breed_type == 'sprint_type':
+                    if exercise_time > pattern['time_ranges']['acceptable'][1]:
+                        return (time_score * 0.5, type_score * 0.6)
+                        
+                if breed_type == 'endurance_type':
+                    if exercise_time < pattern['time_ranges']['ideal'][0]:
+                        return (time_score * 0.6, type_score * 0.7)
+                        
+                return (time_score, type_score)
+    
+            time_score = calculate_time_match()
+            time_score, type_score = apply_special_adjustments(time_score, type_score)
     
+            # 最終運動匹配度計算
             return (time_score * 0.6) + (type_score * 0.4)
     
         # 第二部分：專業技能需求評估