The merge kept main's version of compute(), the link actions and panels, the traceroute exit list and the CHANGELOG, so the city panel called a carryCtl() that no longer existed and routing never ranked a carrier's own port. Put the ranking back into compute() on top of the current rank lists and island split, along with setCarry, carryCtl, the traceroute carry flag, the reference loop in the routing test and the CHANGELOG bullet. Drop a stale label main had removed and sort the dictionaries. The tests follow main too: saves are read from their slot, RouteScript needs the core to run, Not That Telecom stands in for Cogentle (whose share is now small), and the flood test uses a smaller sacrificial PNI and IX flood because a carrier's own traffic now takes its share of the one transit port first.
22 lines
1.3 KiB
JavaScript
22 lines
1.3 KiB
JavaScript
// Deliberately scan all exits for every flow, without byRank, local-city
|
|
// shortcuts or first-group selection. Stable sorting preserves E order on ties.
|
|
// 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 = `
|
|
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)&&
|
|
(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;){
|
|
let j=i+1;while(j<candidates.length&&(candidates[j].pref==='high')===(candidates[i].pref==='high')&&
|
|
Math.abs(Dv[CIDX[candidates[j].city]]-Dv[CIDX[candidates[i].city]])<1e-6)j++;
|
|
sendGroup(candidates.slice(i,j));i=j;
|
|
}
|
|
}
|
|
}
|
|
`;
|