reverting

global_func/exposure_spread.py

@@ -175,23 +175,6 @@ def check_salary_eligibility(current_lineup_salary, current_player, new_player,
     salary_diff = calculate_salary_difference(current_player, new_player, column_name, projections_df, type_var)
     return current_lineup_salary + salary_diff <= salary_max
 
-
-def _showdown_slot_columns(columns):
-    """CPT + FLEX* — full Showdown roster slots (no duplicate player across slots)."""
-    return [c for c in columns if c == 'CPT' or (isinstance(c, str) and str(c).startswith('FLEX'))]
-
-
-def _lineup_player_names(row_series, df_columns, type_var, specific_columns):
-    """Names already in the lineup for duplicate / opponent checks (all Showdown slots when Showdown)."""
-    if type_var == 'Showdown':
-        slots = _showdown_slot_columns(df_columns)
-        if slots:
-            return set(row_series.loc[slots].values)
-    if specific_columns:
-        return set(row_series[specific_columns].values)
-    return set(row_series.values)
-
-
 def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary_below, comp_salary_above, ignore_stacks, remove_teams, specific_replacements, specific_exclusions, specific_columns, projections_df, sport_var, type_var, salary_max, stacking_sports, opp_map=None):
     """
     Added parameter:
@@ -229,11 +212,15 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
         player_pos_list = player_positions.split('/')
         return any(pos in target_positions for pos in player_pos_list)
 
-    def check_opponent_conflict(candidate_player, existing_players, opp_map):
-        """Check if candidate is an opponent of any player already in the lineup (existing_players is a set of names)."""
+    def check_opponent_conflict(candidate_player, current_row_data, opp_map):
+        """Check if candidate player is an opponent of any player in the current row"""
         if not opp_map:
             return False  # No conflicts if opp_map doesn't exist
-
+        
+        # Get all players currently in the row
+        existing_players = set(current_row_data.values)
+        
+        # Check if candidate is opponent of any existing player
         for existing_player in existing_players:
             if opp_map.get(existing_player) == candidate_player:
                 return True  # Conflict found
@@ -311,17 +298,14 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
                     )
                 comparable_players = comparable_players[remove_mask]
 
-            # Occupied player names (full CPT+FLEX for Showdown, not only specific_columns)
-            existing_players = _lineup_player_names(
-                working_frame.loc[row], working_frame.columns, type_var, specific_columns
-            )
-
+            # Get the current row data to check for existing players
             if specific_columns != []:
-                row_data = working_frame.loc[row][specific_columns]
-                working_columns = specific_columns
+                current_row_data = working_frame.loc[row][specific_columns]
             else:
-                row_data = working_frame.loc[row]
-                working_columns = working_frame.columns
+                current_row_data = working_frame.loc[row]
+            
+            # Filter out players that are already present in this row
+            existing_players = set(current_row_data.values)
             try:
                 comparable_players = comparable_players[~comparable_players['player_names'].isin(existing_players)]
                 comparable_player_list = comparable_players['player_names'].tolist()
@@ -329,15 +313,22 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
                 comparable_player_list = []
 
             if comparable_player_list:
+                if specific_columns != []:
+                    row_data = working_frame.loc[row][specific_columns]
+                    working_columns = specific_columns
+                else:
+                    row_data = working_frame.loc[row]
+                    working_columns = working_frame.columns
+                
                 replacement_made = False
-
+                
                 if exposure_target == 0:
                     for col in working_columns:
-                        if working_frame.at[row, col] == exposure_player:
+                        if row_data[col] == exposure_player:
                             suitable_replacements = []
                             for candidate in comparable_player_list:
                                 # NEW: Check for opponent conflicts
-                                if check_opponent_conflict(candidate, existing_players, opp_map):
+                                if check_opponent_conflict(candidate, current_row_data, opp_map):
                                     continue  # Skip this candidate
                                 
                                 replacement_player_positions = projections_df[projections_df['player_names'] == candidate]['position'].iloc[0].split('/')
@@ -354,19 +345,14 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
                                 insert_player = random.choice(suitable_replacements)
                                 working_frame.at[row, col] = insert_player
                                 replacement_made = True
-                                existing_players = _lineup_player_names(
-                                    working_frame.loc[row], working_frame.columns, type_var, specific_columns
-                                )
-                                comparable_player_list = [
-                                    p for p in comparable_player_list if p not in existing_players
-                                ]
+                                comparable_player_list = [p for p in comparable_player_list if p != insert_player]
                 else:
                     for col in working_columns:
-                        if working_frame.at[row, col] == exposure_player:
+                        if row_data[col] == exposure_player:
                             # Filter candidates to exclude opponent conflicts
                             valid_candidates = [
-                                candidate for candidate in comparable_player_list
-                                if not check_opponent_conflict(candidate, existing_players, opp_map)
+                                candidate for candidate in comparable_player_list 
+                                if not check_opponent_conflict(candidate, current_row_data, opp_map)
                             ]
                             
                             if not valid_candidates:
@@ -398,11 +384,14 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
         while change_counter < math.ceil(lineups_to_add) and random_row_indices_replace:
             row = random_row_indices_replace.pop(0)
             
-            existing_players = _lineup_player_names(
-                working_frame.loc[row], working_frame.columns, type_var, specific_columns
-            )
-
-            if check_opponent_conflict(exposure_player, existing_players, opp_map):
+            # Get current row data first to check for opponent conflicts
+            if specific_columns != []:
+                current_row_data = working_frame.loc[row][specific_columns]
+            else:
+                current_row_data = working_frame.loc[row]
+            
+            # NEW: Check if exposure_player conflicts with existing players
+            if check_opponent_conflict(exposure_player, current_row_data, opp_map):
                 continue  # Skip this row, can't add exposure_player here
             
             if specific_replacements != []:
@@ -436,8 +425,8 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
             comparable_players = comparable_players[comparable_players['player_names'] != exposure_player]
 
             comparable_player_list = comparable_players['player_names'].tolist()
-
-            if exposure_player in existing_players:
+            
+            if exposure_player in working_frame.loc[row].values:
                 comparable_player_list = []
 
             if comparable_player_list:
@@ -449,10 +438,9 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
                     working_columns = working_frame.columns
 
                 for col in working_columns:
-                    cell = working_frame.at[row, col]
-                    if cell in comparable_player_list:
+                    if row_data[col] in comparable_player_list:
                         current_lineup_salary = working_frame.loc[row]['salary']
-                        current_player = cell
+                        current_player = row_data[col]
                         
                         if check_salary_eligibility(current_lineup_salary, current_player, exposure_player, col, projections_df, type_var, salary_max):
                             if type_var == 'Classic':