Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -1066,81 +1066,76 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             final_score = base_score + barking_penalty + special_adjustments + trainability_bonus
             return max(0.1, min(1.0, final_score))
             
+
+        # 1. 計算基礎分數
         print("\n=== 開始計算品種相容性分數 ===")
         print(f"處理品種: {breed_info.get('Breed', 'Unknown')}")
         print(f"品種信息: {breed_info}")
         print(f"使用者偏好: {vars(user_prefs)}")
 
-        # 1. 計算基礎分數
-        try:
-            print("\n=== 開始計算品種相容性分數 ===")
-            print(f"處理品種: {breed_info.get('Breed', 'Unknown')}")
-            print(f"品種信息: {breed_info}")
-            print(f"使用者偏好: {vars(user_prefs)}")
-    
-            # 計算所有基礎分數並整合到字典中
-            scores = {
-                'space': calculate_space_score(
-                    breed_info['Size'], 
-                    user_prefs.living_space,
-                    user_prefs.yard_access != 'no_yard',
-                    breed_info.get('Exercise Needs', 'Moderate')
-                ),
-                'exercise': calculate_exercise_score(
-                    breed_info.get('Exercise Needs', 'Moderate'),
-                    user_prefs.exercise_time
-                ),
-                'grooming': calculate_grooming_score(
-                    breed_info.get('Grooming Needs', 'Moderate'),
-                    user_prefs.grooming_commitment.lower(),
-                    breed_info['Size']
-                ),
-                'experience': calculate_experience_score(
-                    breed_info.get('Care Level', 'Moderate'),
-                    user_prefs.experience_level,
-                    breed_info.get('Temperament', '')
-                ),
-                'health': calculate_health_score(
-                    breed_info.get('Breed', ''),
-                    user_prefs
-                ),
-                'noise': calculate_noise_score(
-                    breed_info.get('Breed', ''),
-                    user_prefs
-                )
-            }
-    
-            # 檢查關鍵不適配情況
-            critical_issues = check_critical_matches(scores, user_prefs)
-            if critical_issues['has_critical']:
-                return apply_critical_penalty(scores, critical_issues)
-    
-            # 計算環境適應性加成
-            adaptability_bonus = calculate_environmental_fit(breed_info, user_prefs)
-            
-            # 計算最終加權分數
-            final_score = calculate_final_weighted_score(
-                scores=scores,
-                user_prefs=user_prefs,
-                breed_info=breed_info,
-                adaptability_bonus=adaptability_bonus
+        # 計算所有基礎分數並整合到字典中
+        scores = {
+            'space': calculate_space_score(
+                breed_info['Size'], 
+                user_prefs.living_space,
+                user_prefs.yard_access != 'no_yard',
+                breed_info.get('Exercise Needs', 'Moderate')
+            ),
+            'exercise': calculate_exercise_score(
+                breed_info.get('Exercise Needs', 'Moderate'),
+                user_prefs.exercise_time
+            ),
+            'grooming': calculate_grooming_score(
+                breed_info.get('Grooming Needs', 'Moderate'),
+                user_prefs.grooming_commitment.lower(),
+                breed_info['Size']
+            ),
+            'experience': calculate_experience_score(
+                breed_info.get('Care Level', 'Moderate'),
+                user_prefs.experience_level,
+                breed_info.get('Temperament', '')
+            ),
+            'health': calculate_health_score(
+                breed_info.get('Breed', ''),
+                user_prefs
+            ),
+            'noise': calculate_noise_score(
+                breed_info.get('Breed', ''),
+                user_prefs
             )
-    
-            # 更新最終結果
-            scores.update({
-                'overall': final_score,
-                'adaptability_bonus': adaptability_bonus
-            })
-    
-            return scores
-    
-        except Exception as e:
-            print(f"\n!!!!! 發生嚴重錯誤 !!!!!")
-            print(f"錯誤類型: {type(e).__name__}")
-            print(f"錯誤訊息: {str(e)}")
-            print(f"完整錯誤追蹤:")
-            print(traceback.format_exc())
-            return {k: 0.6 for k in ['space', 'exercise', 'grooming', 'experience', 'health', 'noise', 'overall']}
+        }
+
+        # 檢查關鍵不適配情況
+        critical_issues = check_critical_matches(scores, user_prefs)
+        if critical_issues['has_critical']:
+            return apply_critical_penalty(scores, critical_issues)
+
+        # 計算環境適應性加成
+        adaptability_bonus = calculate_environmental_fit(breed_info, user_prefs)
+        
+        # 計算最終加權分數
+        final_score = calculate_final_weighted_score(
+            scores=scores,
+            user_prefs=user_prefs,
+            breed_info=breed_info,
+            adaptability_bonus=adaptability_bonus
+        )
+
+        # 更新最終結果
+        scores.update({
+            'overall': final_score,
+            'adaptability_bonus': adaptability_bonus
+        })
+
+        return scores
+
+    except Exception as e:
+        print(f"\n!!!!! 發生嚴重錯誤 !!!!!")
+        print(f"錯誤類型: {type(e).__name__}")
+        print(f"錯誤訊息: {str(e)}")
+        print(f"完整錯誤追蹤:")
+        print(traceback.format_exc())
+        return {k: 0.6 for k in ['space', 'exercise', 'grooming', 'experience', 'health', 'noise', 'overall']}
 
 def check_critical_matches(scores: dict, user_prefs: UserPreferences) -> dict:
     """評估是否存在極端不適配的情況"""