Add Düsseldorf with the Altbier-IX (#108)
Networks follow PeeringDB's 14 Düsseldorf facilities: NTT, Tell-Ya, Cogentle, Drizzle, Voda-Phony, Doitsche Telekomm and the Crowdflare, Amazin', Microsnoft and BiteDance clouds (NetChill and Akamaybe are everywhere already). No nudge needed: 27+ map units from Frankfurt, Amsterdam and Brussels. The #16 shark test compared .land, which ignores Cairo's land2, so a valid overland Mumbai-Cairo ask counted as crossing an ocean once the extra city shifted the seeded draws. It now uses isSub like the game.
This commit is contained in:
parent
b0684bca82
commit
13e5a5d94b
6 changed files with 23 additions and 13 deletions
|
|
@ -199,7 +199,8 @@ test('#16 shark-averse customers only ask for routes that can stay on land', ()
|
|||
let shark = 0, bad = [];
|
||||
for (let i = 0; i < 1500; i++) {
|
||||
const o = JSON.parse(ev("S.offers=[];spawnOffer();JSON.stringify(S.offers.filter(o=>(o.reqs||[]).includes('sharks')).map(o=>[o.city,o.city2]))"));
|
||||
for (const [a, b] of o) { shark++; if (ev(`CITY['${a}'].land!==CITY['${b}'].land`)) bad.push(a + '-' + b); }
|
||||
// isSub, not .land: Cairo sits on two landmasses, so Mumbai to Cairo stays on land.
|
||||
for (const [a, b] of o) { shark++; if (ev(`isSub('${a}','${b}')`)) bad.push(a + '-' + b); }
|
||||
}
|
||||
assert.ok(shark > 0, 'the requirement still shows up');
|
||||
assert.deepEqual(bad, [], 'never across an ocean');
|
||||
|
|
|
|||
|
|
@ -507,7 +507,7 @@ test('#79 Benelux: Brussels red tape, the Flanders duopoly, Oostkamp trawlers an
|
|||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('Stuttgart sits between Frankfurt and Zurich, and Hamburg and Munich are on the map', () => {
|
||||
test('Stuttgart sits between Frankfurt and Zurich, and Hamburg, Munich and Düsseldorf are on the map', () => {
|
||||
const { ev, errors } = load();
|
||||
const y = c => ev(`CITY.${c}.y`), x = c => ev(`CITY.${c}.x`);
|
||||
assert.ok(y('fra') < y('stg') && y('stg') < y('zrh'), 'north to south: Frankfurt, Stuttgart, Zurich');
|
||||
|
|
@ -518,6 +518,10 @@ test('Stuttgart sits between Frankfurt and Zurich, and Hamburg and Munich are on
|
|||
assert.ok(y('ham') < y('ber') && y('ham') < y('fra'), 'Hamburg is up north');
|
||||
assert.equal(ev("CITY.ham.ix"), 'Moin-IX');
|
||||
assert.equal(ev("NET.lvl.pops.includes('ham')&&NET.dtk.pops.includes('ham')"), true);
|
||||
assert.ok(x('dus') < x('fra') && x('dus') > x('ams') && y('dus') > y('ams') && y('dus') < y('fra'), 'Düsseldorf: between Amsterdam and Frankfurt');
|
||||
assert.equal(ev("CITY.dus.ix"), 'Altbier-IX');
|
||||
assert.ok(ev("kmBetween('dus','ams')") < ev("kmBetween('fra','ams')"), 'closer to Amsterdam than Frankfurt is');
|
||||
for (const n of ['ntt', 'tly', 'cog', 'drz', 'vdp', 'dtk', 'nfx', 'akm', 'cfl', 'amz', 'msf', 'bdc']) assert.ok(ev(`NET.${n}.pops.includes('dus')`), `${n} is in Düsseldorf, as on PeeringDB`);
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue