Sea routing: Suez and Panama crossings, great circles, fastest design back on par
After #133 the coastline router treated Egypt and Panama as solid land, so Marseille–Singapore sailed round Africa (21,440 km instead of 12,175) and Miami–Lima round Cape Horn (17,700 km for a 4,220 km hop). Real systems cross both by land: Port Said to Suez beside the canal, and Panama (PAN AM). These are now overland edges in the sea graph, priced as the distance they cover. The Red Sea Crisis shuts Suez, and routes are cached per set of open passages, also in the survey worker. Long open-water legs follow the great circle where it stays at sea, instead of a straight line on the map. The low-latency design may land further off and backhaul overland, and may follow the corridor of the fastest in-service cable on the pair when that is shorter, so it matches Hibernia again (London–New York 25.3 ms, Halifax–London 20.9 ms) and beats cables that take detours (Lagos–Bude 32.2 against 37.6 ms). Tests: main's expectations restored where #133 had loosened them (Marseille–Singapore needs no upgrades, New York–Sydney needs terminals, express equals the fastest cable); the marine check knows the passages; new checks for Suez, Panama, the crisis and the corridor rule.
This commit is contained in:
parent
656e904e05
commit
56f2d446ea
5 changed files with 105 additions and 39 deletions
|
|
@ -4,7 +4,11 @@ const { load } = require('./harness');
|
|||
|
||||
// Check the surveyed part independently against the original coastline segments.
|
||||
// City markers may sit inland: their two short shore approaches are excluded.
|
||||
function assertMarine(path, start, end, coast) {
|
||||
// The overland passages (beside the Suez Canal, across Panama) are the only places a surveyed route may cross land.
|
||||
// A piece lies on a passage when both its ends sit on the straight line between that passage's two sea cells.
|
||||
const onLine = (x, [p, q]) => { const dx = q[0] - p[0], dy = q[1] - p[1], t = ((x[0] - p[0]) * dx + (x[1] - p[1]) * dy) / (dx * dx + dy * dy); return t > -1e-6 && t < 1 + 1e-6 && Math.hypot(p[0] + t * dx - x[0], p[1] + t * dy - x[1]) < 1e-6; };
|
||||
const isPass = (a, b, passes) => passes.some(P => onLine(a, P) && onLine(b, P));
|
||||
function assertMarine(path, start, end, coast, passes = []) {
|
||||
const at = p => path.findIndex(q => Math.abs(p[0] - q[0]) < 1e-8 && Math.abs(p[1] - q[1]) < 1e-8);
|
||||
const first = at(start), last = at(end);
|
||||
assert.ok(first >= 0 && last >= first, 'both shore approaches appear in the saved path');
|
||||
|
|
@ -13,6 +17,7 @@ function assertMarine(path, start, end, coast) {
|
|||
for (let i = first + 1; i <= last; i++) {
|
||||
const a = path[i - 1], b = [...path[i]];
|
||||
b[0] += 360 * Math.round((a[0] - b[0]) / 360);
|
||||
if (isPass(path[i - 1], path[i], passes)) continue;
|
||||
for (const [p, q] of edges) {
|
||||
const shift = 360 * Math.round((a[0] - p[0]) / 360), c = [p[0] + shift, p[1]], d = [q[0] + shift, q[1]];
|
||||
assert.ok(!(turn(a, b, c) * turn(a, b, d) < -1e-12 && turn(c, d, a) * turn(c, d, b) < -1e-12),
|
||||
|
|
@ -25,12 +30,14 @@ test('surveyed designs avoid land, use real path lengths and improve latency', (
|
|||
const { ev, dom, errors } = load();
|
||||
try {
|
||||
const coast = JSON.parse(ev('JSON.stringify(COAST_LL)'));
|
||||
const passes = JSON.parse(ev('JSON.stringify([...seaPasses().entries()].flatMap(([u,L])=>L.map(P=>[seaPoint(u),seaPoint(P.to)])))'));
|
||||
for (const [a, b] of [['lag', 'bde'], ['cbo', 'nyc'], ['lax', 'tok'], ['mrs', 'sin'], ['cai', 'pmo']]) {
|
||||
const quotes = JSON.parse(ev(`JSON.stringify(Object.keys(SEA_DESIGNS).map(d=>seaQuote('${a}','${b}',d)))`));
|
||||
for (let i = 0; i < quotes.length; i++) {
|
||||
const q = quotes[i];
|
||||
assert.ok(Number.isFinite(q.km) && q.pts.length > 2);
|
||||
assertMarine(q.pts, ...q.shore, coast);
|
||||
// the fastest design may follow the corridor of an existing cable instead, which is drawn as that cable is
|
||||
if (!q.cor) assertMarine(q.pts, ...q.shore, coast, passes);
|
||||
assert.equal(q.km, ev(`seaLength(${JSON.stringify(q.pts)})`));
|
||||
if (i) {
|
||||
assert.ok(q.km <= quotes[i - 1].km, 'premium surveys never lengthen the route');
|
||||
|
|
@ -44,8 +51,14 @@ test('surveyed designs avoid land, use real path lengths and improve latency', (
|
|||
}
|
||||
assert.ok(ev("seaQuote('cai','pmo').km<3000"), 'Cairo approaches the Mediterranean rather than routing out of the Red Sea');
|
||||
assert.equal(ev("cablesFor('cbo','nyc').length"), 0, 'route works without an existing cable');
|
||||
assert.ok(ev("seaQuote('cbo','nyc').km > kmBetween('cbo','nyc')*1.3"), 'the route detours around Africa');
|
||||
assert.ok(ev("seaQuote('mrs','sin').pts.some(p=>p[0]>-7&&p[0]<-4&&p[1]>35&&p[1]<37)"), 'the Mediterranean route passes Gibraltar');
|
||||
assert.ok(ev("seaQuote('cbo','nyc').km > kmBetween('cbo','nyc')*1.1"), 'the route detours through the Mediterranean');
|
||||
// Europe to Asia crosses Egypt beside the Suez Canal, like real cables, instead of sailing round Africa
|
||||
assert.ok(ev("seaQuote('mrs','sin').km") < 13000, `Marseille–Singapore via Suez (${ev("seaQuote('mrs','sin').km")} km)`);
|
||||
assert.ok(ev("seaQuote('mrs','sin').pts.some(p=>p[0]>31.5&&p[0]<33.5&&p[1]>29.5&&p[1]<31.5)"), 'the route crosses at Suez');
|
||||
assert.equal(JSON.stringify(ev("subNeed(ownCabKm('mrs','sin'))")), '[]', 'no upgrades needed for Marseille–Singapore');
|
||||
// the Caribbean and the Pacific meet across Panama
|
||||
assert.ok(ev("seaQuote('mia','lim').km") < 6000, `Miami–Lima via Panama (${ev("seaQuote('mia','lim').km")} km)`);
|
||||
assert.ok(ev("seaQuote('mia','lim').pts.some(p=>p[0]>-80.5&&p[0]<-79&&p[1]>8.5&&p[1]<9.8)"), 'the route crosses Panama');
|
||||
assert.ok(ev("seaQuote('lax','tok').pts.some((p,i,a)=>i&&Math.abs(p[0]-a[i-1][0])>180)"), 'Pacific route wraps the date line');
|
||||
assert.deepEqual(errors, []);
|
||||
} finally { dom.window.close(); }
|
||||
|
|
@ -118,3 +131,29 @@ test('background surveys deduplicate requests and do not replace a later dialog'
|
|||
assert.equal(ev('SEA_SURVEY.pending.size'), 0);
|
||||
} finally { dom.window.close(); }
|
||||
});
|
||||
|
||||
test('the fastest design is as fast as the fastest cable, and the Red Sea Crisis closes Suez', () => {
|
||||
const { ev, errors, dom } = load();
|
||||
try {
|
||||
// where a cable already runs, the low-latency design follows its corridor if that is shorter than its own survey
|
||||
for (const [a, b] of [['lon', 'nyc'], ['hfx', 'lon']]) {
|
||||
const best = ev(`Math.min(...cablesFor('${a}','${b}').map(c=>linkLat({kind:'wave',km:c.km,cable:c.cid})))`);
|
||||
const q = JSON.parse(ev(`JSON.stringify(seaQuote('${a}','${b}','express'))`));
|
||||
assert.ok(q.ms <= best + 1e-9, `${a}–${b}: ${q.ms.toFixed(2)} ms against ${best.toFixed(2)} ms`);
|
||||
assert.equal(q.km, ev(`seaLength(${JSON.stringify(q.pts)})`), 'map and price use the same path');
|
||||
}
|
||||
// and where the existing cable takes a detour, the survey beats it
|
||||
assert.ok(ev("seaQuote('lag','bde','express').ms") < ev("Math.min(...cablesFor('lag','bde').map(c=>linkLat({kind:'wave',km:c.km,cable:c.cid})))"));
|
||||
// the crisis shuts the canal for your own cables too, and the cache keeps the two cases apart
|
||||
const open = ev("seaQuote('mrs','sin').km");
|
||||
ev("ACT.startScn({id:'redsea',sure:1})");
|
||||
const shut = ev("seaQuote('mrs','sin').km");
|
||||
assert.ok(shut > open + 5000, `round Africa in the crisis (${shut} km against ${open} km)`);
|
||||
assert.ok(ev("seaQuote('mrs','sin','express').km") > open + 5000, 'the fastest design cannot borrow a cut cable');
|
||||
assert.ok(ev("seaQuote('mrs','sin').pts.some(p=>p[0]>-7&&p[0]<-4&&p[1]>35&&p[1]<37)"), 'out through Gibraltar');
|
||||
ev("ACT.start({})");
|
||||
assert.equal(ev("seaQuote('mrs','sin').km"), open, 'back to Suez in a normal game');
|
||||
assert.deepEqual(errors, []);
|
||||
} finally { dom.window.close(); }
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue