updates

solver.py

@@ -102,12 +102,6 @@ def run_milp_model(data: dict):
     vice_captain = pulp.LpVariable.dicts("vice_captain", (players, gws), cat="Binary")
     transfer_in = pulp.LpVariable.dicts("transfer_in", (players, gws), cat="Binary")
     transfer_out = pulp.LpVariable.dicts("transfer_out", (players, gws), cat="Binary")
-    fh_gws = [w for w in gws if chip_gws.get(w) == "fh"]
-    squad_fh = (
-        pulp.LpVariable.dicts("squad_fh", (players, fh_gws), cat="Binary")
-        if fh_gws
-        else {}
-    )
     itb = pulp.LpVariable.dicts("itb", all_gws, lowBound=0, cat="Continuous")
     fts = pulp.LpVariable.dicts(
         "fts", all_gws, lowBound=1, upBound=max_ft, cat="Integer"
@@ -298,12 +292,11 @@ def run_milp_model(data: dict):
         eff_prev = effective_prev[w]
         chip = chip_gws.get(w)
 
-        sq = squad_fh if chip == "fh" else squad
-        prob += pulp.lpSum(sq[p][w] for p in players) == 15
-        prob += pulp.lpSum(sq[p][w] for p in players if positions[p] == "G") == 2
-        prob += pulp.lpSum(sq[p][w] for p in players if positions[p] == "D") == 5
-        prob += pulp.lpSum(sq[p][w] for p in players if positions[p] == "M") == 5
-        prob += pulp.lpSum(sq[p][w] for p in players if positions[p] == "F") == 3
+        prob += pulp.lpSum(squad[p][w] for p in players) == 15
+        prob += pulp.lpSum(squad[p][w] for p in players if positions[p] == "G") == 2
+        prob += pulp.lpSum(squad[p][w] for p in players if positions[p] == "D") == 5
+        prob += pulp.lpSum(squad[p][w] for p in players if positions[p] == "M") == 5
+        prob += pulp.lpSum(squad[p][w] for p in players if positions[p] == "F") == 3
 
         prob += pulp.lpSum(lineup[p][w] for p in players) == 11
         prob += pulp.lpSum(lineup[p][w] for p in players if positions[p] == "G") == 1
@@ -317,38 +310,31 @@ def run_milp_model(data: dict):
         prob += pulp.lpSum(vice_captain[p][w] for p in players) == 1
 
         for p in players:
-            prob += lineup[p][w] <= (squad_fh[p][w] if chip == "fh" else squad[p][w])
+            prob += lineup[p][w] <= squad[p][w]
             prob += captain[p][w] <= lineup[p][w]
             prob += vice_captain[p][w] <= lineup[p][w]
             prob += captain[p][w] + vice_captain[p][w] <= 1
-            if chip != "fh":
-                prob += (
-                    squad[p][w]
-                    == squad[p][eff_prev] + transfer_in[p][w] - transfer_out[p][w]
-                )
-            else:
-                # Force normal transfers to 0 on FH
-                prob += transfer_in[p][w] == 0
-                prob += transfer_out[p][w] == 0
+            prob += (
+                squad[p][w]
+                == squad[p][eff_prev] + transfer_in[p][w] - transfer_out[p][w]
+            )
 
         for t in set(teams.values()):
-            sq = squad_fh if chip == "fh" else squad
             prob += (
-                pulp.lpSum(sq[p][w] for p in players if teams[p] == t) <= max_per_team
+                pulp.lpSum(squad[p][w] for p in players if teams[p] == t)
+                <= max_per_team
             )
 
         if gws.index(w) >= len(gws) - no_transfer_last_gws and chip not in ("wc", "fh"):
             prob += pulp.lpSum(transfer_in[p][w] for p in players) == 0
 
         if chip == "fh":
-            # FH budget: liquidate current squad at fh_sell_price, spend on fh squad at buy_price
-            prob += pulp.lpSum(
-                fh_sell_price[p] * squad[p][eff_prev] for p in players
-            ) + itb[eff_prev] >= pulp.lpSum(
-                buy_prices[p] * squad_fh[p][w] for p in players
+            prob += (
+                itb[eff_prev]
+                + pulp.lpSum(fh_sell_price[p] * squad[p][eff_prev] for p in players)
+                - pulp.lpSum(buy_prices[p] * squad[p][w] for p in players)
+                == itb[w]
             )
-            # ITB carries over unchanged (no real transfers happened)
-            prob += itb[w] == itb[eff_prev]
         else:
             prob += (
                 itb[eff_prev]
@@ -551,25 +537,13 @@ def run_milp_model(data: dict):
                 for p in players
                 if lineup[p][w].varValue is not None and lineup[p][w].varValue > 0.5
             ]
-            gw_bench_raw = (
-                [
-                    p
-                    for p in players
-                    if chip == "fh"
-                    and squad_fh.get(p, {}).get(w) is not None
-                    and squad_fh[p][w].varValue is not None
-                    and squad_fh[p][w].varValue > 0.5
-                    and (lineup[p][w].varValue is None or lineup[p][w].varValue < 0.5)
-                ]
-                if chip == "fh"
-                else [
-                    p
-                    for p in players
-                    if squad[p][w].varValue is not None
-                    and squad[p][w].varValue > 0.5
-                    and (lineup[p][w].varValue is None or lineup[p][w].varValue < 0.5)
-                ]
-            )
+            gw_bench_raw = [
+                p
+                for p in players
+                if squad[p][w].varValue is not None
+                and squad[p][w].varValue > 0.5
+                and (lineup[p][w].varValue is None or lineup[p][w].varValue < 0.5)
+            ]
 
             # Safe extractions with fallbacks so indexing never crashes the loop
             gw_cap_list = [

solver_engine.py

@@ -182,10 +182,10 @@ def prep_solver_data(payload_data: dict):
             raw_ev = p["evs"].get(gw, p["evs"].get(str(gw), 0))
             ev_matrix[pid][gw] = float(raw_ev) * decay_factor
             raw_ev_matrix[pid][gw] = float(raw_ev)
-        fh_sell_price = {
-            pid: sell_prices[pid] if pid in current_squad_ids else buy_prices[pid]
-            for pid in buy_prices
-        }
+    fh_sell_price = {
+        pid: sell_prices[pid] if pid in current_squad_ids else buy_prices[pid]
+        for pid in buy_prices
+    }
 
     # --- CROSS-PLAY FIXTURE PREP ---
     global _FIXTURE_CACHE