Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -553,77 +553,46 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
         #         return max(0.3, 0.8 * (user_time / breed_need['min']))
 
 
-        def calculate_exercise_score(breed_needs: str, user_prefs: UserPreferences) -> float:
+        def calculate_exercise_score(breed_needs: str, exercise_time: int) -> float:
             """
             優化的運動需求評分系統
             
+            Parameters:
+            breed_needs: str - 品種的運動需求等級
+            exercise_time: int - 使用者可提供的運動時間（分鐘）
+            
             改進：
-            1. 考慮運動類型的匹配度
-            2. 評估活動模式的適配性
-            3. 加入品種特性考量
+            1. 更細緻的運動需求評估
+            2. 更合理的時間匹配計算
+            3. 避免極端評分
             """
             # 基礎運動需求評估
             exercise_needs = {
-                'VERY HIGH': {'min': 120, 'ideal': 150, 'max': 180, 'intensity': 'high'},
-                'HIGH': {'min': 90, 'ideal': 120, 'max': 150, 'intensity': 'moderate_high'},
-                'MODERATE': {'min': 45, 'ideal': 60, 'max': 90, 'intensity': 'moderate'},
-                'LOW': {'min': 20, 'ideal': 30, 'max': 45, 'intensity': 'low'},
-                'VARIES': {'min': 30, 'ideal': 60, 'max': 90, 'intensity': 'moderate'}
+                'VERY HIGH': {'min': 120, 'ideal': 150, 'max': 180},
+                'HIGH': {'min': 90, 'ideal': 120, 'max': 150},
+                'MODERATE': {'min': 45, 'ideal': 60, 'max': 90},
+                'LOW': {'min': 20, 'ideal': 30, 'max': 45},
+                'VARIES': {'min': 30, 'ideal': 60, 'max': 90}
             }
             
             breed_need = exercise_needs.get(breed_needs.strip().upper(), exercise_needs['MODERATE'])
             
             # 基礎時間匹配度計算
-            if user_prefs.exercise_time >= breed_need['ideal']:
-                time_score = 1.0 if user_prefs.exercise_time <= breed_need['max'] else 0.9
-            elif user_prefs.exercise_time >= breed_need['min']:
-                time_score = 0.7 + (user_prefs.exercise_time - breed_need['min']) / (breed_need['ideal'] - breed_need['min']) * 0.3
-            else:
-                time_score = max(0.3, 0.7 * (user_prefs.exercise_time / breed_need['min']))
-        
-            # 運動類型匹配度評估
-            exercise_type_scores = {
-                'light_walks': {
-                    'low': 1.0,
-                    'moderate': 0.8,
-                    'moderate_high': 0.5,
-                    'high': 0.3
-                },
-                'moderate_activity': {
-                    'low': 0.7,
-                    'moderate': 1.0,
-                    'moderate_high': 0.8,
-                    'high': 0.6
-                },
-                'active_training': {
-                    'low': 0.5,
-                    'moderate': 0.8,
-                    'moderate_high': 1.0,
-                    'high': 1.0
-                }
-            }
-            
-            type_score = exercise_type_scores.get(user_prefs.exercise_type, exercise_type_scores['moderate_activity']).get(breed_need['intensity'], 0.7)
-            
-            # 時間可用性調整
-            availability_multiplier = {
-                'limited': 0.85,    # 時間有限，可能影響運動品質
-                'moderate': 1.0,    # 標準參考點
-                'flexible': 1.1     # 更靈活的時間安排有利於滿足狗狗需求
-            }.get(user_prefs.time_availability, 1.0)
-            
-            # 環境因素考量
-            environment_bonus = 0
-            if user_prefs.yard_access != 'no_yard':
-                if breed_needs.strip().upper() in ['VERY HIGH', 'HIGH']:
-                    environment_bonus = 0.1
+            if exercise_time >= breed_need['ideal']:
+                if exercise_time > breed_need['max']:
+                    # 運動時間過長，稍微降低分數
+                    time_score = 0.9
                 else:
-                    environment_bonus = 0.05
-                    
-            # 計算最終分數
-            final_score = (time_score * 0.5 + type_score * 0.3) * availability_multiplier + environment_bonus
+                    time_score = 1.0
+            elif exercise_time >= breed_need['min']:
+                # 在最小需求和理想需求之間，線性計算分數
+                time_score = 0.7 + (exercise_time - breed_need['min']) / (breed_need['ideal'] - breed_need['min']) * 0.3
+            else:
+                # 運動時間不足，但仍根據比例給予分數
+                time_score = max(0.3, 0.7 * (exercise_time / breed_need['min']))
             
-            return min(1.0, max(0.3, final_score))
+            # 確保分數在合理範圍內
+            return min(1.0, max(0.3, time_score))
 
 
         def calculate_grooming_score(breed_needs: str, user_commitment: str, breed_size: str) -> float: