James McCool commited on
Commit
bbb7092
·
1 Parent(s): 857d91c

Reintroduce trimming dictionary in app.py: move the calculation of maximum values for ownership types back into the submission logic, ensuring accurate threshold inputs during portfolio updates and maintaining consistency in the trimming process.

Browse files
Files changed (1) hide show
  1. app.py +14 -7
app.py CHANGED
@@ -881,13 +881,6 @@ with tab2:
881
  sum(map_dict['own_map'].get(player, 0) for player in row.iloc[1:]),
882
  axis=1
883
  )
884
- trimming_dict_maxes = {
885
- 'Own': st.session_state['portfolio']['Own'].max(),
886
- 'Geomean': st.session_state['portfolio']['Geomean'].max(),
887
- 'Weighted Own': st.session_state['portfolio']['Weighted Own'].max(),
888
- 'median': st.session_state['portfolio']['median'].max(),
889
- 'Finish_percentile': st.session_state['portfolio']['Finish_percentile'].max()
890
- }
891
  col1, col2 = st.columns([2, 8])
892
  with col1:
893
  with st.expander('Macro Filter Options'):
@@ -943,6 +936,13 @@ with tab2:
943
  if submitted:
944
  st.write('initiated')
945
  st.session_state['portfolio'] = predict_dupes(st.session_state['portfolio'], map_dict, site_var, type_var, Contest_Size, strength_var, sport_var)
 
 
 
 
 
 
 
946
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['Dupes'] <= max_dupes]
947
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] >= min_salary]
948
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] <= max_salary]
@@ -978,6 +978,13 @@ with tab2:
978
  with col2:
979
  st.write('initiated')
980
  st.session_state['portfolio'] = predict_dupes(st.session_state['portfolio'], map_dict, site_var, type_var, Contest_Size, strength_var, sport_var)
 
 
 
 
 
 
 
981
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['Dupes'] <= max_dupes]
982
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] >= min_salary]
983
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] <= max_salary]
 
881
  sum(map_dict['own_map'].get(player, 0) for player in row.iloc[1:]),
882
  axis=1
883
  )
 
 
 
 
 
 
 
884
  col1, col2 = st.columns([2, 8])
885
  with col1:
886
  with st.expander('Macro Filter Options'):
 
936
  if submitted:
937
  st.write('initiated')
938
  st.session_state['portfolio'] = predict_dupes(st.session_state['portfolio'], map_dict, site_var, type_var, Contest_Size, strength_var, sport_var)
939
+ trimming_dict_maxes = {
940
+ 'Own': st.session_state['portfolio']['Own'].max(),
941
+ 'Geomean': st.session_state['portfolio']['Geomean'].max(),
942
+ 'Weighted Own': st.session_state['portfolio']['Weighted Own'].max(),
943
+ 'median': st.session_state['portfolio']['median'].max(),
944
+ 'Finish_percentile': st.session_state['portfolio']['Finish_percentile'].max()
945
+ }
946
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['Dupes'] <= max_dupes]
947
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] >= min_salary]
948
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] <= max_salary]
 
978
  with col2:
979
  st.write('initiated')
980
  st.session_state['portfolio'] = predict_dupes(st.session_state['portfolio'], map_dict, site_var, type_var, Contest_Size, strength_var, sport_var)
981
+ trimming_dict_maxes = {
982
+ 'Own': st.session_state['portfolio']['Own'].max(),
983
+ 'Geomean': st.session_state['portfolio']['Geomean'].max(),
984
+ 'Weighted Own': st.session_state['portfolio']['Weighted Own'].max(),
985
+ 'median': st.session_state['portfolio']['median'].max(),
986
+ 'Finish_percentile': st.session_state['portfolio']['Finish_percentile'].max()
987
+ }
988
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['Dupes'] <= max_dupes]
989
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] >= min_salary]
990
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] <= max_salary]