Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -1995,8 +1995,12 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
             
             # 空間權重調整邏輯保持不變
             if extremities['space'][0] == 'highly_restricted':
-                adjustments['space'] = 2.5
-                adjustments['noise'] = 2.0
+                 if extremities['exercise'][0] in ['high', 'extremely_high']:
+                    adjustments['space'] = 1.8  # 降低空間限制的權重
+                    adjustments['exercise'] = 2.5  # 提高運動能力的權重
+                else:
+                    adjustments['space'] = 2.5
+                    adjustments['noise'] = 2.0
             elif extremities['space'][0] == 'restricted':
                 adjustments['space'] = 1.8
                 adjustments['noise'] = 1.5
@@ -2005,6 +2009,12 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
                 adjustments['exercise'] = 1.4
             
             # 改進運動需求權重調整
+            if extremities['exercise'][0] in ['high', 'extremely_high']:
+                # 提高運動量高時的基礎分數
+                base_exercise_adjustment = 2.2
+                if user_prefs.living_space == 'apartment':
+                    base_exercise_adjustment = 2.5  # 特別獎勵公寓住戶的高運動量
+                adjustments['exercise'] = base_exercise_adjustment
             if extremities['exercise'][0] in ['extremely_low', 'extremely_high']:
                 base_adjustment = 2.5
                 if extremities['exercise'][0] == 'extremely_high':
@@ -2047,6 +2057,15 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
                     for key in ['grooming', 'health', 'noise']:
                         if key not in adjustments:
                             adjustments[key] = 1.2
+
+            def ensure_minimum_score(score):
+                if all([
+                    extremities['exercise'][0] in ['high', 'extremely_high'],
+                    breed_matches_exercise_needs(),  # 檢查品種是否適合該運動量
+                    score < 0.85
+                ]):
+                    return 0.85
+                return score
             
             adjust_for_combinations()
             return adjustments