Skip to content

fix one more sinkhole (FARHW) #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
memo33 wants to merge 1 commit into
base: staging
Choose a base branch
from
+22 −6
Open

fix one more sinkhole (FARHW) #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Controller/RUL0/5000_RHW/5F00_FARHW/5F90_FARHW_Ramps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1629,9 +1629,9 @@ CheckType = B - dirtroad: 0x02000000

ConsLayout =...........
ConsLayout =...........
ConsLayout =....+|....<
ConsLayout =....+|.....
ConsLayout =....+|.....
ConsLayout =....||....<
ConsLayout =....||.....
ConsLayout =....||.....
ConsLayout =...........
ConsLayout =.....^.....

Expand Down Expand Up @@ -1674,9 +1674,9 @@ CheckType = B - dirtroad: 0x02000000

ConsLayout =...........
ConsLayout =...........
ConsLayout =....|+....<
ConsLayout =....|+.....
ConsLayout =....|+.....
ConsLayout =....||....<
ConsLayout =....||.....
ConsLayout =....||.....
ConsLayout =...........
ConsLayout =....^......

Expand Down
16 changes: 16 additions & 0 deletions src/scripts/syntax-check-rul0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,22 @@ def check_cons_layout(cell_lines, checktype_lines, cons_lines):
bad_cells = [xy for xy, c in cell_layout.items()
if static_cells.get(c) and
(xy not in cons_layout or cons_layout[xy] == '.')] # cell != '.' but constraint == '.'
if not bad_cells:
num_static = sum(static_cells.values()) # True: 1, False: 0
if num_static > 1: # in particular ignores handles of FLEX pieces
# Detects cases where constraint == '+' and the constraint is adjacent to something like '|' or '-'
bad_cells = [(x, y) for (x, y), c in cons_layout.items()
if c == '+' and
(static_c := cell_layout.get((x, y))) != '+' and
static_cells.get(static_c) and
any(adj_c == ('|' if horiz else '-')
for (adj_c, horiz) in [
(cons_layout[adj_xy], horiz)
for (adj_xy, horiz) in [((x+1, y), True), ((x-1, y), True), ((x, y+1), False), ((x, y-1), False)]
if adj_xy in cons_layout
and static_cells.get(cell_layout.get(adj_xy))
])
]
if bad_cells:
raise Exception(f"Potential sinkhole bug in ConsLayout at cells {' '.join(map(str, bad_cells))}:\n{_stringify_layout(cell_lines)} ---\n{_stringify_layout(cons_lines)}")

Expand Down
Loading