diff --git "a/database_queries.py" "b/database_queries.py" --- "a/database_queries.py" +++ "b/database_queries.py" @@ -166,7 +166,7 @@ def init_DK_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -175,7 +175,7 @@ def init_DK_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -185,7 +185,7 @@ def init_DK_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -229,7 +229,7 @@ def init_DK_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -238,7 +238,7 @@ def init_DK_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -248,7 +248,7 @@ def init_DK_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -293,14 +293,14 @@ def init_DK_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max, ) - cursor1 = collection.find({'$and': [filter_query, stack_f]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, stack_f]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, stack_f]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: stack_f = _showdown_seed_filter( salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max, ) - cursor1 = collection.find(stack_f).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(stack_f).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(stack_f).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -308,7 +308,7 @@ def init_DK_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max, ) - cursor1 = collection.find(stack_f).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(stack_f).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(stack_f).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -342,14 +342,14 @@ def init_DK_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -398,7 +398,7 @@ def init_FD_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -407,7 +407,7 @@ def init_FD_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -417,7 +417,7 @@ def init_FD_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -461,7 +461,7 @@ def init_FD_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -470,7 +470,7 @@ def init_FD_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -480,7 +480,7 @@ def init_FD_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -524,7 +524,7 @@ def init_FD_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -533,7 +533,7 @@ def init_FD_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -543,7 +543,7 @@ def init_FD_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -579,14 +579,14 @@ def init_FD_NFL_lineups(type_var, slate_var, prio_var, prio_mix, nfl_db_translat # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -721,7 +721,7 @@ def init_DK_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -729,7 +729,7 @@ def init_DK_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -737,7 +737,7 @@ def init_DK_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -778,7 +778,7 @@ def init_DK_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -786,7 +786,7 @@ def init_DK_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -794,7 +794,7 @@ def init_DK_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -835,7 +835,7 @@ def init_DK_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -843,7 +843,7 @@ def init_DK_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -851,7 +851,7 @@ def init_DK_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -884,14 +884,14 @@ def init_DK_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -937,7 +937,7 @@ def init_FD_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -945,7 +945,7 @@ def init_FD_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -953,7 +953,7 @@ def init_FD_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -994,7 +994,7 @@ def init_FD_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -1002,7 +1002,7 @@ def init_FD_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1010,7 +1010,7 @@ def init_FD_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1051,7 +1051,7 @@ def init_FD_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, @@ -1059,7 +1059,7 @@ def init_FD_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1067,7 +1067,7 @@ def init_FD_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1101,14 +1101,14 @@ def init_FD_NBA_lineups(type_var, slate_var, prio_var, prio_mix, nba_db_translat # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -1220,14 +1220,14 @@ def init_DK_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1235,7 +1235,7 @@ def init_DK_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1275,14 +1275,14 @@ def init_DK_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1290,7 +1290,7 @@ def init_DK_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1330,14 +1330,14 @@ def init_DK_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1345,7 +1345,7 @@ def init_DK_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1378,14 +1378,14 @@ def init_DK_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -1430,14 +1430,14 @@ def init_FD_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1445,7 +1445,7 @@ def init_FD_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1485,14 +1485,14 @@ def init_FD_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1500,7 +1500,7 @@ def init_FD_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1540,14 +1540,14 @@ def init_FD_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1555,7 +1555,7 @@ def init_FD_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1589,14 +1589,14 @@ def init_FD_NHL_lineups(type_var, slate_var, prio_var, prio_mix, nhl_db_translat # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -1708,14 +1708,14 @@ def init_DK_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1723,7 +1723,7 @@ def init_DK_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1763,14 +1763,14 @@ def init_DK_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1778,7 +1778,7 @@ def init_DK_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1818,14 +1818,14 @@ def init_DK_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1833,7 +1833,7 @@ def init_DK_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1866,14 +1866,14 @@ def init_DK_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -1918,14 +1918,14 @@ def init_FD_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1933,7 +1933,7 @@ def init_FD_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1973,14 +1973,14 @@ def init_FD_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -1988,7 +1988,7 @@ def init_FD_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -2028,14 +2028,14 @@ def init_FD_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat filter_query = {'$or': query_conditions} cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -2043,7 +2043,7 @@ def init_FD_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat else: cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, - }).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + }).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}, 'Team_count': {'$gte': team_count_min if team_count_min is not None else 1, '$lte': team_count_max if team_count_max is not None else 999}, 'Secondary_count': {'$gte': secondary_team_count_min if secondary_team_count_min is not None else 1, '$lte': secondary_team_count_max if secondary_team_count_max is not None else 999}, }).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) @@ -2077,14 +2077,14 @@ def init_FD_MLB_lineups(type_var, slate_var, prio_var, prio_mix, mlb_db_translat # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter_with_players(filter_query, salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find(_showdown_seed_filter(salary_min, salary_max, team_count_min, team_count_max, secondary_team_count_min, secondary_team_count_max)).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2196,14 +2196,14 @@ def init_DK_MMA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2239,14 +2239,14 @@ def init_DK_MMA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2282,14 +2282,14 @@ def init_DK_MMA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2320,14 +2320,14 @@ def init_DK_MMA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2370,14 +2370,14 @@ def init_FD_MMA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2413,14 +2413,14 @@ def init_FD_MMA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2456,14 +2456,14 @@ def init_FD_MMA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2495,14 +2495,14 @@ def init_FD_MMA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2612,14 +2612,14 @@ def init_DK_PGA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2655,14 +2655,14 @@ def init_DK_PGA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2698,14 +2698,14 @@ def init_DK_PGA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2741,14 +2741,14 @@ def init_DK_PGA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2795,14 +2795,14 @@ def init_FD_PGA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2838,14 +2838,14 @@ def init_FD_PGA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2881,14 +2881,14 @@ def init_FD_PGA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -2924,14 +2924,14 @@ def init_FD_PGA_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, sal # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -3052,14 +3052,14 @@ def init_DK_NASCAR_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -3094,14 +3094,14 @@ def init_DK_NASCAR_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -3136,14 +3136,14 @@ def init_DK_NASCAR_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -3179,14 +3179,14 @@ def init_DK_NASCAR_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -3231,14 +3231,14 @@ def init_FD_NASCAR_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -3274,14 +3274,14 @@ def init_FD_NASCAR_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -3317,14 +3317,14 @@ def init_FD_NASCAR_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: @@ -3360,14 +3360,14 @@ def init_FD_NASCAR_lineups(type_var, slate_var, prio_var, prio_mix, lineup_num, # Combine all player conditions with $or if query_conditions: filter_query = {'$or': query_conditions} - cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'$and': [filter_query, {'salary': {'$gte': salary_min, '$lte': salary_max}}]}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: - cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) + cursor1 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('proj', -1).limit(_mix_seed_limit_primary(lineup_num, prio_mix)) cursor2 = collection.find({'salary': {'$gte': salary_min, '$lte': salary_max}}).sort('Own', -1).limit(_mix_seed_limit_secondary(lineup_num, prio_mix)) raw_display = pd.concat([pd.DataFrame(list(cursor1)), pd.DataFrame(list(cursor2))]) else: