Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -631,7 +631,7 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             return max(0.05, min(1.0, final_score))
 
 
-        def calculate_exercise_score(breed_needs: str, exercise_time: int, exercise_type: str) -> float:
+        def calculate_exercise_score(breed_needs: str, exercise_time: int, exercise_type: str, breed_size: str, living_space: str) -> float:
             """
             計算品種運動需求與使用者運動條件的匹配度。此函數特別著重：
             1. 不同品種的運動耐受度差異
@@ -746,6 +746,10 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
                 final_score = (time_score * 0.7) + (type_score * 0.3)
             else:
                 final_score = (time_score * 0.65) + (type_score * 0.35)
+
+            if breed_info['Size'] in ['Large', 'Giant'] and user_prefs.living_space == 'apartment':
+                if exercise_time >= 120:
+                    final_score = min(1.0, final_score * 1.2)  
         
             # 極端情況的最終調整
             if breed_needs.upper() == 'LOW' and exercise_time > breed_level['max'] * 2:
@@ -1571,43 +1575,6 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
                         trait_penalty -= penalty * 0.5  # 專家反而因應對特殊特徵而加分
     
             return max(0.2, min(1.0, base_score - trait_penalty))
-    
-        # 第三部分：生活環境評估
-        # def evaluate_living_conditions():
-        #     size = breed_info['Size']
-        #     exercise_needs = breed_info.get('Exercise Needs', 'MODERATE').upper()
-            
-        #     # 空間需求矩陣
-        #     space_requirements = {
-        #         'apartment': {
-        #             'Small': 1.0, 'Medium': 0.4, 'Large': 0.2, 'Giant': 0.1
-        #         },
-        #         'house_small': {
-        #             'Small': 0.9, 'Medium': 1.0, 'Large': 0.5, 'Giant': 0.3
-        #         },
-        #         'house_large': {
-        #             'Small': 0.8, 'Medium': 0.9, 'Large': 1.0, 'Giant': 1.0
-        #         }
-        #     }
-            
-        #     # 基礎空間分數
-        #     space_score = space_requirements.get(user_prefs.living_space, 
-        #                                        space_requirements['house_small'])[size]
-    
-        #     # 活動空間需求調整
-        #     if exercise_needs in ['HIGH', 'VERY HIGH']:
-        #         if user_prefs.living_space != 'house_large':
-        #             space_score *= 0.8
-    
-        #     # 院子可用性評估
-        #     yard_scores = {
-        #         'no_yard': 0.7,
-        #         'shared_yard': 0.85,
-        #         'private_yard': 1.0
-        #     }
-        #     space_score *= yard_scores.get(user_prefs.yard_access, 0.8)
-    
-        #     return space_score
 
         def evaluate_living_conditions() -> float:
             """
@@ -1625,15 +1592,15 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
             space_requirements = {
                 'apartment': {
                     'Small': 1.0,
-                    'Medium': 0.7,    # 從0.4提升到0.7
-                    'Large': 0.6,     # 從0.2提升到0.6
-                    'Giant': 0.5      # 從0.1提升到0.5
+                    'Medium': 0.8,    
+                    'Large': 0.7,     
+                    'Giant': 0.6      
                 },
                 'house_small': {
                     'Small': 0.9,
                     'Medium': 1.0,
-                    'Large': 0.8,     # 從0.5提升到0.8
-                    'Giant': 0.7      # 從0.3提升到0.7
+                    'Large': 0.8,     
+                    'Giant': 0.7      
                 },
                 'house_large': {
                     'Small': 0.8,
@@ -1803,11 +1770,11 @@ def calculate_breed_compatibility_score(scores: dict, user_prefs: UserPreference
             # 空間權重調整 - 更平衡的調整方式
             if extremities['space'][0] == 'restricted':
                 if extremities['exercise'][0] in ['high', 'extremely_high']:
-                    adjustments['space'] = 1.5       # 從1.8降低到1.5
-                    adjustments['exercise'] = 1.8    # 從2.5降低到1.8
+                    adjustments['space'] = 1.3       
+                    adjustments['exercise'] = 2.0    
                 else:
-                    adjustments['space'] = 1.6       # 從2.5降低到1.6
-                    adjustments['noise'] = 1.5       # 保持合理的噪音權重
+                    adjustments['space'] = 1.6       
+                    adjustments['noise'] = 1.5       
     
             # 運動需求權重調整 - 更合理的運動評估
             if extremities['exercise'][0] in ['extremely_high', 'extremely_low']: