web solve is back to home setup and solve prioritizes electrum and steel over brass again

This commit is contained in:
Pagwin 2026-06-11 16:57:47 -04:00
parent 36e3117966
commit 023fdefe89
No known key found for this signature in database
GPG key ID: 81137023740CA260
2 changed files with 5 additions and 4 deletions

View file

@ -1566,9 +1566,9 @@ def solve(
return v * v
prodEE = m.NewIntVar(0, Eprod(capE), "prodEE")
m.AddMultiplicationEquality(prodEE, [finalE])
m.AddMultiplicationEquality(prodEE, [finalE, finalE])
prodSS = m.NewIntVar(0, Sprod(capS), "prodSS")
m.AddMultiplicationEquality(prodSS, [finalS])
m.AddMultiplicationEquality(prodSS, [finalS, finalS])
prodBB = m.NewIntVar(0, Bprod(capB), "prodBB")
m.AddMultiplicationEquality(prodBB, [finalB])
prodEB = m.NewIntVar(0, Eprod(capE) * Bprod(capB), "prodEB")

View file

@ -159,8 +159,9 @@ def solve_handler():
max_res=solve.MAX_RES,
max_vat=solve.MAX_VAT,
# min to avoid bricking stuff
time_limit=min(time_limit, 60.0),
num_workers=1,
# time_limit=min(time_limit, 60.0),
time_limit=time_limit,
num_workers=8,
verbose=verbose,
fixed_choices=fixed_choices,
resource_constraints=resource_constraints,