Repository navigation
v2.12: infill stations, one-seat links, SH-114 realigned, Rail/BRT/All diagrams - #12
Merged
Merged
Conversation
Base network: ten infill stops found by a transfer analysis and tested one by one in the model (Red/Orange at Main / Sherman and Northwest Highway, Red/Blue/Orange at Central / Hall, Blue at Shiloh, Orange at SH-114 / Freeport, TRE at Belt Line and at Riverside with FW Green, TEXRail extension x FW Berry, Silver Line at Marsh, Midlothian at I-20). Belt Line / Royal moves onto the SH-114 crossing (Belt Line / SH-114). 2M: SH-114 Line follows the owner's hand-drawn alignment (freeway, beside TEXRail through Grapevine, Trophy Club and Westlake stations) and runs on over the Green Line to Victory (new run_over edit); Stemmons-Brookhollow BRT starts at Victory; a Commerce / Harwood - Marilla / Pearl walk link. gen_expansion: road_weights, legs that follow rail or run straight. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01GsUvo7SNZomvEVjWUMuYvF
…ns; reschedule run_over dates borrowed track from the borrowing line's opening (the host still owns it). The station-name test checks stations open today, not every stop on today's lines. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01GsUvo7SNZomvEVjWUMuYvF
Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01GsUvo7SNZomvEVjWUMuYvF
Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01GsUvo7SNZomvEVjWUMuYvF
The diagram view gets a version toggle beside Map / Diagram: Rail (metro, regional rail, streetcar; the default), BRT (every BRT line, the 2M arterial grid included) and All (rail and the plan's BRT corridors, as before). Each version is laid out on its own, so the bus grid no longer bends the rail lines. The choice is remembered per viewer and kept in the URL (#diagram/rail); a trip that rides a mode the version leaves out says so and offers the version that shows it. Straightness rules in dfwt/schematic.py, applied to every version: - strokes: at each station the edge ends that most lines run straight through are joined (the default plan's routings first); - stations are pulled into line along their strokes, and every stroke that runs along one of the four axes in the real geography is laid exactly on it, heaviest first, edge by edge while that agrees with those laid already (Sherman-Morrison updates), so the Fort Worth trunk is drawn north-south; - junction ports keep through lines opposite and axis edges on their axis; - the chain DP charges per turn and extra for a turn straight back (zig-zag); - phase 3 also straightens jogs, and never lets two stations swap places; - the chaotic placement runs for two deterministic variants and keeps the one with the best quality() (bends, zig-zags, sharp turns, crossings beyond the geography's, edges drawn backwards). 2M lines, before (one all-modes diagram) -> after: rail lines 242 bends / 71 zig-zags -> 123 / 39 in the Rail version; all lines 309 / 88 -> 196 / 47 in the All version. Layouts run on one BLAS thread and are cached in the temp folder. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01GsUvo7SNZomvEVjWUMuYvF
Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01GsUvo7SNZomvEVjWUMuYvF
On the merged network (infill stations, the SH-114 Line run over the Green Line's track, T&P Station and Fort Worth T&P now separate nodes) laying strokes on their axes dragged whole stretches across other lines: the Rail version drew 101 crossings against 79 in the real geography (test_lines_are_straight). - _smooth: after laying a stroke on its axis, count the crossings of the station-to-station segments (_n_crossings, vectorized); if the stroke added any, lay it again edge by edge and leave out the edges that would. - Phase 3: a round is undone for crowding only where stations got closer than before the round, so one squeezed spot elsewhere no longer undoes every round. Rail version, quality on the merged network: crossings 101 -> 79 (geography 79), bends 322 -> 297, zig-zags 111 -> 102, score 845 -> 672; 2M lines 171 -> 154 bends. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01GsUvo7SNZomvEVjWUMuYvF
…s, not fewer transfers) Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01GsUvo7SNZomvEVjWUMuYvF
Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01GsUvo7SNZomvEVjWUMuYvF
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Transfers analysis and infill stations
reports/TRANSFERS.md).run_overedit); the Stemmons-Brookhollow BRT starts at Victory.SH-114 Line (owner's hand-drawn realignment)
gen_expansion: newroad_weightsoption, and per-leg"follow": "rail"and"follow": "straight".Diagram
Results (full build)
Both plans stay within budget and no stage opens after 2100.
Testing
run_overand the diagram layout rules.python -m dfwt validate: no errors. The two errors in the archived v1/v2 scenarios are unchanged from main.Generated by Claude Code