James McCool commited on
Commit
f23bbcc
·
1 Parent(s): c61e4e0

Revert Assist Projection to Weighted Assist Percentage Calculation

Browse files

Modify the assist projection method to:
- Use 'wAssist%' directly for both win and loss scenarios
- Remove the previous assist base scaling approach
- Simplify the projection calculation while maintaining core logic

Files changed (1) hide show
  1. app.py +2 -2
app.py CHANGED
@@ -365,7 +365,7 @@ def init_team_data(game_count, team, opponent, win_loss_settings, kill_predictio
365
  team_data['Death_Proj'] = team_data.apply(lambda row: row['wDeath%'] * opp_pos_deaths_boost_win.get(row['position'], 1), axis=1)
366
  team_data['Assist_Base'] = team_data.apply(lambda row: row['wAssist%'] * opp_pos_assists_boost_win.get(row['position'], 1), axis=1)
367
  assist_scale = min(1.0, team_data['Kill_Proj'].sum() / team_data['Assist_Base'].sum()) if team_data['Assist_Base'].sum() > 0 else 1.0
368
- team_data['Assist_Proj'] = team_data['Assist_Base'] * assist_scale
369
  team_data['CS_Proj'] = team_data.apply(lambda row: row['wCS'] * opp_pos_cs_boost_win.get(row['position'], 1), axis=1)
370
  team_data = team_data[['playername', 'teamname', 'position', 'Kill_Proj', 'Death_Proj', 'Assist_Proj', 'CS_Proj']]
371
  else:
@@ -373,7 +373,7 @@ def init_team_data(game_count, team, opponent, win_loss_settings, kill_predictio
373
  team_data['Death_Proj'] = team_data.apply(lambda row: row['lDeath%'] * opp_pos_deaths_boost_loss.get(row['position'], 1), axis=1)
374
  team_data['Assist_Base'] = team_data.apply(lambda row: row['lAssist%'] * opp_pos_kills_boost_loss.get(row['position'], 1), axis=1)
375
  assist_scale = min(1.0, team_data['Kill_Proj'].sum() / team_data['Assist_Base'].sum()) if team_data['Assist_Base'].sum() > 0 else 1.0
376
- team_data['Assist_Proj'] = team_data['Assist_Base'] * assist_scale
377
  team_data['CS_Proj'] = team_data.apply(lambda row: row['lCS'] * opp_pos_cs_boost_loss.get(row['position'], 1), axis=1)
378
  team_data = team_data[['playername', 'teamname', 'position', 'Kill_Proj', 'Death_Proj', 'Assist_Proj', 'CS_Proj']]
379
 
 
365
  team_data['Death_Proj'] = team_data.apply(lambda row: row['wDeath%'] * opp_pos_deaths_boost_win.get(row['position'], 1), axis=1)
366
  team_data['Assist_Base'] = team_data.apply(lambda row: row['wAssist%'] * opp_pos_assists_boost_win.get(row['position'], 1), axis=1)
367
  assist_scale = min(1.0, team_data['Kill_Proj'].sum() / team_data['Assist_Base'].sum()) if team_data['Assist_Base'].sum() > 0 else 1.0
368
+ team_data['Assist_Proj'] = team_data['wAssist%'] * assist_scale
369
  team_data['CS_Proj'] = team_data.apply(lambda row: row['wCS'] * opp_pos_cs_boost_win.get(row['position'], 1), axis=1)
370
  team_data = team_data[['playername', 'teamname', 'position', 'Kill_Proj', 'Death_Proj', 'Assist_Proj', 'CS_Proj']]
371
  else:
 
373
  team_data['Death_Proj'] = team_data.apply(lambda row: row['lDeath%'] * opp_pos_deaths_boost_loss.get(row['position'], 1), axis=1)
374
  team_data['Assist_Base'] = team_data.apply(lambda row: row['lAssist%'] * opp_pos_kills_boost_loss.get(row['position'], 1), axis=1)
375
  assist_scale = min(1.0, team_data['Kill_Proj'].sum() / team_data['Assist_Base'].sum()) if team_data['Assist_Base'].sum() > 0 else 1.0
376
+ team_data['Assist_Proj'] = team_data['wAssist%'] * assist_scale
377
  team_data['CS_Proj'] = team_data.apply(lambda row: row['lCS'] * opp_pos_cs_boost_loss.get(row['position'], 1), axis=1)
378
  team_data = team_data[['playername', 'teamname', 'position', 'Kill_Proj', 'Death_Proj', 'Assist_Proj', 'CS_Proj']]
379