Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -929,61 +929,49 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             'noise': calculate_noise_score(breed_info.get('Breed', ''), user_prefs.noise_tolerance)
         }
         
-        weights = {
-            'space': 0.28,      
-            'exercise': 0.18,   
-            'grooming': 0.12,   
-            'experience': 0.22, 
-            'health': 0.12,     
-            'noise': 0.08      
-        }
+        # 當有孩童時，將 family_safety 加入為一個普通分數項目
+        if user_prefs.has_children:
+            family_safety = calculate_family_safety_score(breed_info, user_prefs.children_age)
+            scores['family_safety'] = family_safety
+            # 調整權重以包含家庭安全分數
+            weights = {
+                'space': 0.22,        # 降低其他權重以容納family_safety
+                'exercise': 0.15,
+                'grooming': 0.10,
+                'experience': 0.18,
+                'health': 0.10,
+                'noise': 0.05,
+                'family_safety': 0.20  # 給予適當的權重
+            }
+        else:
+            # 原本的權重
+            weights = {
+                'space': 0.28,
+                'exercise': 0.18,
+                'grooming': 0.12,
+                'experience': 0.22,
+                'health': 0.12,
+                'noise': 0.08
+            }
 
-        # 計算基礎加權分數
+        # 計算加權分數
         weighted_score = sum(score * weights[category] for category, score in scores.items())
 
-        # 如果有孩童，加入家庭安全考量
-        if user_prefs.has_children:
-            try:
-                family_safety = calculate_family_safety_score(breed_info, user_prefs.children_age)
-                # family_safety 作為調整因子，而不是新的分數項目
-                # 這裡的 0.4 表示 family_safety 最多可以降低 60% 的分數
-                safety_modifier = (family_safety * 0.6) + 0.4
-                weighted_score *= safety_modifier
-            except Exception as e:
-                print(f"Family safety calculation error: {str(e)}")
-                # 發生錯誤時使用較保守的預設值
-                weighted_score *= 0.7
-
         # 加入品種加分的影響
-        try:
-            breed_bonus = calculate_breed_bonus(breed_info, user_prefs)
-            # breed_bonus 作為加成效果，但限制其影響範圍
-            bonus_modifier = 1 + (breed_bonus * 0.3)  # 品種加分最多提升 30%
-            weighted_score *= bonus_modifier
-        except Exception as e:
-            print(f"Breed bonus calculation error: {str(e)}")
+        breed_bonus = calculate_breed_bonus(breed_info, user_prefs)
+        weighted_score *= (1 + breed_bonus * 0.2)  # 品種加分的影響限制在 20%
 
+        # 保持原有的 amplify_score 函數
         def amplify_score(score):
-            """
-            優化後的分數放大函數，確保分數範圍合理且結果一致。
-            主要目的是將分數轉換到更容易理解的範圍，並增加差異性。
-            """
-            # 基礎調整 - 降低基準點使差異更明顯
             adjusted = (score - 0.25) * 1.8
-            
-            # 使用較溫和的指數來放大差異，但不會過度誇大
             amplified = pow(adjusted, 2.2) / 3.5 + score
             
-            # 處理高分區間，避免分數過度集中
             if amplified > 0.85:
                 amplified = 0.85 + (amplified - 0.85) * 0.6
             
-            # 確保分數在合理範圍內（0.45-0.95）
             final_score = max(0.45, min(0.95, amplified))
-            
             return round(final_score, 3)
 
-        # 計算最終分數
         final_score = amplify_score(weighted_score)
         
         # 準備回傳結果
@@ -999,22 +987,5 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
     #     return {k: 0.5 for k in ['space', 'exercise', 'grooming', 'experience', 'health', 'noise', 'overall']}
 
     except Exception as e:
-        print(f"Critical error in compatibility score calculation:")
-        print(f"Error type: {type(e).__name__}")
-        print(f"Error message: {str(e)}")
-        print(f"Breed info: {breed_info}")
-        print(f"User preferences: {user_prefs.__dict__}")
-        
-        # 嘗試返回已計算的分數，若完全失敗則返回預設值
-        try:
-            return scores
-        except:
-            return {
-                'space': 0.7,
-                'exercise': 0.7,
-                'grooming': 0.7,
-                'experience': 0.7,
-                'health': 0.7,
-                'noise': 0.7,
-                'overall': 0.7
-            }
+        print(f"Error in calculate_compatibility_score: {str(e)}")
+        return {k: 0.7 for k in ['space', 'exercise', 'grooming', 'experience', 'health', 'noise', 'overall']}