Prefer keeps the say at its own POP only, and the direct ranks stop slowing the game day
Review of #205: - Prefer no longer switches the carrier-direct rule off for the whole network. A POP with a Prefer-marked transit port keeps what Prefer says; every other POP keeps the rule. compute(), traceroute and the reference loop in the tests all use the same per-POP rule, and a new test covers it (New York and Chicago, Prefer on one POP's Tell-Ya port). - dayTick() cost. The harness is neutral (the same page on both sides differs by 1%), but the cost was real: the four extra rank passes inside compute()'s main loop made V8 deoptimise compute() 954 times in 30 game days against 46 on main. The direct ranks now run in a small function of their own, in the plain way the reference loop does (their lists are one carrier's ports), so the main loop is the one main has, and the setup moved out of compute(). 61 deopts instead of 954. - Italian: "Porta qui" read as "port here" next to "Porta più vicina"; it is "Instrada qui" now, and "Ogni POP instrada il traffico..." matches. - Help text: says that real BGP carries the traffic from every POP (the shorter AS path beats IGP distance), that Carry here does that here, and that Nearest port is the default. All six languages.
This commit is contained in:
parent
b8845413d3
commit
eb78d7104e
14 changed files with 77 additions and 23 deletions
|
|
@ -3,13 +3,16 @@
|
|||
// Without Auto-TE, an exit whose shortest path from this POP is already full fits nothing, so it counts as
|
||||
// unusable, like a full exit (#210).
|
||||
module.exports = `
|
||||
// A carrier's own port (dr) is also a plain transit exit. A POP with a Prefer-marked transit port keeps what Prefer
|
||||
// says, and a port not set to carry only takes its own POP's traffic.
|
||||
const PH=new Set(E.filter(x=>x.k==='t'&&x.pref==='high').map(x=>CIDX[x.city]));
|
||||
const dr=(e,f)=>{if(e.k!=='t'||PH.has(f.ci)||eff(e,f.n)!==3)return 0;const t=directTier(e.net,f.n);return t?DIRECT_RANK[t][e.carry?0:1]:0;};
|
||||
for(const pass of PASSES||[null])for(const rank of RANKS){
|
||||
for(f of flows){
|
||||
if(f.rem<=1e-6||(rank===0&&!f.cache)||(pass&&!pass(f)))continue;
|
||||
Dv=SDi[f.ci];Pv=SPi[f.ci];PP=walked[f.ci]||(walked[f.ci]=[]);vis++;
|
||||
// A carrier's own port (dr) is also a plain transit exit; one not set to carry only takes its own POP's traffic.
|
||||
const candidates=E.filter(e=>e.used<e.cap&&e.ok(f.n)&&
|
||||
((TR?eff(e,f.n):base(e,f.n))===rank||(dr(e,f.n)||-1)===rank)&&
|
||||
((TR?eff(e,f.n):base(e,f.n))===rank||(dr(e,f)||-1)===rank)&&
|
||||
(rank!==DIRECT_RANK[1][1]&&rank!==DIRECT_RANK[2][1]||CIDX[e.city]===f.ci)&&Dv[CIDX[e.city]]<Infinity&&!gone(e))
|
||||
.sort((a,b)=>(a.pref==='high'?0:1)-(b.pref==='high'?0:1)||Dv[CIDX[a.city]]-Dv[CIDX[b.city]]);
|
||||
for(let i=0;i<candidates.length&&f.rem>1e-6;){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue