Update scoring_calculation_system.py

scoring_calculation_system.py

@@ -929,52 +929,53 @@ def calculate_compatibility_score(breed_info: dict, user_prefs: UserPreferences)
             'noise': calculate_noise_score(breed_info.get('Breed', ''), user_prefs.noise_tolerance)
         }
         
-        # 當有孩童時，將 family_safety 加入為一個普通分數項目
+        # 基本權重設定
+        weights = {
+            'space': 0.28,      
+            'exercise': 0.18,   
+            'grooming': 0.12,   
+            'experience': 0.22, 
+            'health': 0.12,     
+            'noise': 0.08      
+        }
+
+        # 如果有孩童，我們需要調整各個分數，而不是增加新的分數項目
         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
-            }
+            
+            # 根據家庭安全分數調整其他分數
+            # 空間適應性調整：大型犬在有幼童時需要更多考慮
+            scores['space'] *= (0.7 + (family_safety * 0.3))
+            
+            # 經驗需求調整：有孩童時經驗要求提高
+            scores['experience'] *= (0.6 + (family_safety * 0.4))
+            
+            # 運動需求調整：過於活潑的品種需要更謹慎
+            scores['exercise'] *= (0.8 + (family_safety * 0.2))
+            
+            # 噪音容忍度調整：對幼童更敏感
+            scores['noise'] *= (0.7 + (family_safety * 0.3))
 
-        # 計算加權分數
+        # 計算加權總分
         weighted_score = sum(score * weights[category] for category, score in scores.items())
 
-        # 加入品種加分的影響
+        # 加入品種額外加分的影響
         breed_bonus = calculate_breed_bonus(breed_info, user_prefs)
-        weighted_score *= (1 + breed_bonus * 0.2)  # 品種加分的影響限制在 20%
+        # 如果有孩童，品種加分的影響要考慮家庭因素
+        if user_prefs.has_children:
+            breed_bonus *= family_safety
+        weighted_score *= (1 + breed_bonus * 0.2)
 
-        # 保持原有的 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
-            
             final_score = max(0.45, min(0.95, amplified))
             return round(final_score, 3)
 
         final_score = amplify_score(weighted_score)
-        
-        # 準備回傳結果
+
         scores = {k: round(v, 4) for k, v in scores.items()}
         scores['overall'] = round(final_score, 4)