## Problem Houses and boats (multis) were pathed correctly only by **delegation to the slow path**: `StepCache.TryGetMask` returns `Fallthrough_Multi` for any multi-covered cell, and `GetSuccessors` ran `CheckMovement` **8× per cell** (each re-resolving the tile stack via `GetStaticAndMultiTiles`) — a sustained per-step cost near every house/boat. There was also no automated test pinning multi pathfinding. This branch is the full multi-pathfinding effort in phases on one branch. ## Phase 1 — characterization tests (the oracle) Implementation-agnostic invariants: a cache-on≡cache-off whole-path invariant, a per-cell sweep vs `CheckMovement` over footprint+halo (incl. destination Z), hand-verified routing (around walls, demolish-reopens, foundation-redesign-honored), classic-house / foundation / boat fixtures, non-vacuity guards. These gate every later phase byte-for-byte. ## Phase 2 — live single-pass synthesizer `StepProbe.ComputeMultiMaskAt` synthesizes a covered cell's full 8-direction `StepMask` in one pass (the existing surface/step logic over `GetStaticAndMultiTiles` instead of 8× `CheckMovement`). `GetSuccessors` routes `Fallthrough_Multi` cells through it. No new cache, no `.swb` change. **~1.5×**, zero added allocations. ## Phase 3 / 3.1 — warm per-`multiID` interior cache (airtight) `MultiMaskCache` caches each fixed multi's local-frame `StepMask` for **interior** cells (cell + all 8 neighbours covered → terrain-neighbour-free → position-invariant), keyed by `multiID & 0x3FFF`, built lazily from the MCL. Interior cells become ~20 ns lookups. The cache is gated on a **per-instance footprint-clean flag** (`BaseMulti.PathInteriorCacheState`): an instance whose whole footprint terrain is below its floor (`maxTerrain < minFloor`) serves from the cache; a **dirty** instance (terrain intrudes — a contrived/GM placement) **degrades to live-synth, never a wrong mask**. This closes a cross-instance soundness gap (the cached mask depends on neighbour terrain too) found in a holistic review. The gate resets whenever the footprint's world-terrain relationship can change — **location, map, or ItemID** (a boat's heading swaps the MCL). **Boats are cached too.** Their per-`multiID` deck masks are movement-invariant (built once per heading), so a sailing boat never rebuilds them; only the cheap clean-flag rescan repeats per move (and only when pathed near). Narrow existing boats have little interior; wide galleons (`multi.mul`) would gain Castle-class. `HouseFoundation` (per-instance runtime `DesignState`) is the one type that stays on the live path. ## Verification - `UOContent.Tests` **454/454**, `Server.Tests` **708/708**, 0 failures. - The Phase-1 oracle (`MultiPathInvariantTests`, cache-on ≡ cache-off) stays **byte-identical** with the synthesizer + interior cache active. - Tests pin: footprint-cleanliness (clean vs sunk), dirty/cluttered placement degrades to live-synth while still pathing, clean placement serves, and the gate resets on move/ItemID change. ## Performance (modernuo/ModernUO-Benchmarks#8, full-fixture) Houses at **Green Acres** (flat staff region → clean footprints, the legit-placement case): | Route | Slow path | Phase 3.1 (interior cache) | Speedup | |-------|----------:|---------------------------:|--------:| | `around_a` (29 steps) | 238.3 µs | **49.1 µs** | **4.85×** | | `around_b` (29 steps) | 224.3 µs | **49.5 µs** | **4.53×** | ~130 of ~167 multi cells/route serve from the cache (~20 ns) vs 37 live-synth. Per-cell, the slow path's 8× `CheckMovement` grows with multi complexity (GuildHouse ~857 ns → Castle ~1,194 ns), the synthesizer is a flat ~780 ns, and the cache serve is ~20 ns — so big/tall multis (and wide galleons) gain most. Identical allocations throughout.
87 lines
2.9 KiB
C#
87 lines
2.9 KiB
C#
using Server.Engines.Pathing.Cache;
|
|
using Server.Items;
|
|
using Xunit;
|
|
using Xunit.Abstractions;
|
|
|
|
namespace Server.Tests.Pathfinding;
|
|
|
|
[Collection("Sequential Pathfinding Tests")]
|
|
public class BoatPathTests
|
|
{
|
|
private readonly ITestOutputHelper _output;
|
|
|
|
public BoatPathTests(ITestOutputHelper output) => _output = output;
|
|
|
|
// Open water in the south-Britain bay (Trammel), used by the existing swim-bake test.
|
|
private const int MapId = 1;
|
|
private const int WaterX = 1450;
|
|
private const int WaterY = 1770;
|
|
|
|
[Fact]
|
|
public void BoatDeck_HasWalkableSurfaceCells()
|
|
{
|
|
StepCache.Instance.Clear();
|
|
var map = Map.Maps[MapId];
|
|
|
|
// SmallBoat North heading = multiID 0x0. A deck is made of surface tiles.
|
|
var boat = new TestMulti(0x0);
|
|
map.GetAverageZ(WaterX, WaterY, out _, out var z, out _);
|
|
boat.MoveToWorld(new Point3D(WaterX, WaterY, (sbyte)z), map);
|
|
|
|
try
|
|
{
|
|
var floor = MultiArt.FindFloorCell(boat);
|
|
Assert.True(floor.HasValue, "non-vacuity: boat deck must have surface (floor) tiles");
|
|
|
|
// The deck cell falls through to the live multi-aware path.
|
|
var mask = StepCache.Instance.TryGetMask(map, floor.Value.X, floor.Value.Y, (sbyte)z);
|
|
Assert.Equal(CacheHitKind.Fallthrough_Multi, mask.HitKind);
|
|
_output.WriteLine($"boat deck floor cell at ({floor.Value.X},{floor.Value.Y})");
|
|
}
|
|
finally
|
|
{
|
|
boat.Delete();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void BoatDeck_FootprintShape_IsPositionInvariant()
|
|
{
|
|
// The property Phase 2's local-frame, movement-invariant boat cache must preserve:
|
|
// the deck's covered-cell shape (in local coords) is identical at two world positions.
|
|
var map = Map.Maps[MapId];
|
|
|
|
var a = new TestMulti(0x0);
|
|
map.GetAverageZ(WaterX, WaterY, out _, out var za, out _);
|
|
a.MoveToWorld(new Point3D(WaterX, WaterY, (sbyte)za), map);
|
|
var shapeA = LocalShape(a);
|
|
a.Delete();
|
|
|
|
var b = new TestMulti(0x0);
|
|
map.GetAverageZ(WaterX + 5, WaterY + 3, out _, out var zb, out _);
|
|
b.MoveToWorld(new Point3D(WaterX + 5, WaterY + 3, (sbyte)zb), map);
|
|
var shapeB = LocalShape(b);
|
|
b.Delete();
|
|
|
|
Assert.Equal(shapeA, shapeB);
|
|
Assert.NotEmpty(shapeA);
|
|
_output.WriteLine($"boat local deck shape stable across positions: {shapeA.Count} cells");
|
|
}
|
|
|
|
private static System.Collections.Generic.HashSet<(int lx, int ly)> LocalShape(BaseMulti multi)
|
|
{
|
|
var mcl = multi.Components;
|
|
var set = new System.Collections.Generic.HashSet<(int, int)>();
|
|
for (var lx = 0; lx < mcl.Width; lx++)
|
|
{
|
|
for (var ly = 0; ly < mcl.Height; ly++)
|
|
{
|
|
if (mcl.Tiles[lx][ly].Length > 0)
|
|
{
|
|
set.Add((lx, ly));
|
|
}
|
|
}
|
|
}
|
|
return set;
|
|
}
|
|
}
|