Skip to content

Extract common rendering logic from puzzle solvers into helper functions #188

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

Draft
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Extract common rendering logic from puzzle solvers into helper functions #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c66e25b
Initial plan
Copilot Jan 30, 2026
1572d88
Add add_grid_edges helper and refactor 3 puzzle files
Copilot Jan 30, 2026
8d56347
Add add_block_dot_answer helper and refactor 12 puzzle files
Copilot Jan 30, 2026
b9d6ad0
Fix parameter passing consistency
Copilot Jan 30, 2026
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
80 changes: 80 additions & 0 deletions cspuz_solver_backend/src/board.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,86 @@ impl Board {
}
}

/// Renders grid edges (for puzzles like Slitherlink, Litherslink, Crosswall).
///
/// This helper function adds edge items to the board based on a GridEdges structure.
/// - Vertical edges are rendered at positions (y * 2 + 1, x * 2)
/// - Horizontal edges are rendered at positions (y * 2, x * 2 + 1)
///
/// # Arguments
/// * `edges` - The grid edges to render (with .vertical and .horizontal fields)
/// * `color` - Color to use for the rendered edges
/// * `true_kind` - ItemKind to use when edge value is true
/// * `false_kind` - ItemKind to use when edge value is false
pub fn add_grid_edges(
&mut self,
edges: &graph::GridEdges<Vec<Vec<Option<bool>>>>,
color: &'static str,
true_kind: ItemKind,
false_kind: ItemKind,
) {
let height = self.height;
let width = self.width;

// Render vertical edges
for y in 0..height {
for x in 0..=width {
if let Some(b) = edges.vertical[y][x] {
self.push(Item {
y: y * 2 + 1,
x: x * 2,
color,
kind: if b { true_kind.clone() } else { false_kind.clone() },
});
}
}
}

// Render horizontal edges
for y in 0..=height {
for x in 0..width {
if let Some(b) = edges.horizontal[y][x] {
self.push(Item {
y: y * 2,
x: x * 2 + 1,
color,
kind: if b { true_kind.clone() } else { false_kind.clone() },
});
}
}
}
}

/// Renders Block/Dot items based on boolean answer grid (for region-based puzzles).
///
/// This helper function adds Block or Dot items to the board for cells that have
/// determined values in the answer grid.
///
/// # Arguments
/// * `is_black` - Answer grid with Option<bool> values
/// * `color` - Color to use for the rendered items
pub fn add_block_dot_answer(
&mut self,
is_black: &Vec<Vec<Option<bool>>>,
color: &'static str,
) {
let height = self.height;
let width = self.width;

for y in 0..height {
for x in 0..width {
if let Some(b) = is_black[y][x] {
self.push(Item::cell(
y,
x,
color,
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
}

pub fn to_json(&self) -> String {
let kind = "grid";
let height = self.height;
Expand Down
15 changes: 2 additions & 13 deletions cspuz_solver_backend/src/puzzle/akichiwake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,8 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {

board.add_borders(&borders, "black");

for y in 0..height {
for x in 0..width {
if let Some(is_black) = &is_black {
if let Some(b) = is_black[y][x] {
board.push(Item::cell(
y,
x,
"green",
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
if let Some(is_black) = &is_black {
board.add_block_dot_answer(is_black, "green");
}
let rooms = graph::borders_to_rooms(&borders);
assert_eq!(rooms.len(), clues.len());
Expand Down
15 changes: 2 additions & 13 deletions cspuz_solver_backend/src/puzzle/aqre.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,8 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {

board.add_borders(&borders, "black");

for y in 0..height {
for x in 0..width {
if let Some(is_black) = &is_black {
if let Some(b) = is_black[y][x] {
board.push(Item::cell(
y,
x,
"green",
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
if let Some(is_black) = &is_black {
board.add_block_dot_answer(is_black, "green");
}
let rooms = graph::borders_to_rooms(&borders);
assert_eq!(rooms.len(), clues.len());
Expand Down
13 changes: 1 addition & 12 deletions cspuz_solver_backend/src/puzzle/chocona.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,7 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {
board.add_borders(&borders, "black");

if let Some(is_black) = &is_black {
for y in 0..height {
for x in 0..width {
if let Some(b) = is_black[y][x] {
board.push(Item::cell(
y,
x,
"green",
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
board.add_block_dot_answer(is_black, "green");
}
let rooms = graph::borders_to_rooms(&borders);
assert_eq!(rooms.len(), clues.len());
Expand Down
15 changes: 2 additions & 13 deletions cspuz_solver_backend/src/puzzle/cocktail.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,8 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {

board.add_borders(&borders, "black");

if let Some(is_black) = is_black {
for y in 0..height {
for x in 0..width {
if let Some(b) = is_black[y][x] {
board.push(Item::cell(
y,
x,
"green",
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
if let Some(is_black) = &is_black {
board.add_block_dot_answer(is_black, "green");
}

let rooms = graph::borders_to_rooms(&borders);
Expand Down
27 changes: 2 additions & 25 deletions cspuz_solver_backend/src/puzzle/crosswall.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,8 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {
}
}

if let Some(is_line) = ans {
for y in 0..height {
for x in 0..=width {
if let Some(b) = is_line.vertical[y][x] {
board.push(Item {
y: y * 2 + 1,
x: x * 2,
color: "green",
kind: if b { ItemKind::Wall } else { ItemKind::Cross },
})
}
}
}
for y in 0..=height {
for x in 0..width {
if let Some(b) = is_line.horizontal[y][x] {
board.push(Item {
y: y * 2,
x: x * 2 + 1,
color: "green",
kind: if b { ItemKind::Wall } else { ItemKind::Cross },
})
}
}
}
if let Some(is_line) = &ans {
board.add_grid_edges(is_line, "green", ItemKind::Wall, ItemKind::Cross);
}

Ok(board)
Expand Down
15 changes: 2 additions & 13 deletions cspuz_solver_backend/src/puzzle/double_lits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,8 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {

board.add_borders(&borders, "black");

if let Some(is_black) = ans {
for y in 0..height {
for x in 0..width {
if let Some(b) = is_black[y][x] {
board.push(Item::cell(
y,
x,
"green",
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
if let Some(is_black) = &ans {
board.add_block_dot_answer(is_black, "green");
}

Ok(board)
Expand Down
15 changes: 2 additions & 13 deletions cspuz_solver_backend/src/puzzle/heyawake_internal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,8 @@ pub fn solve(url: &str, is_ayeheya: bool) -> Result<Board, &'static str> {

board.add_borders(&borders, "black");

for y in 0..height {
for x in 0..width {
if let Some(is_black) = &is_black {
if let Some(b) = is_black[y][x] {
board.push(Item::cell(
y,
x,
"green",
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
if let Some(is_black) = &is_black {
board.add_block_dot_answer(is_black, "green");
}
let rooms = graph::borders_to_rooms(&borders);
assert_eq!(rooms.len(), clues.len());
Expand Down
13 changes: 1 addition & 12 deletions cspuz_solver_backend/src/puzzle/inverse_litso.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,7 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {
board.add_borders(&borders, "black");

if let Some(is_black) = &is_black {
for y in 0..height {
for x in 0..width {
if let Some(b) = is_black[y][x] {
board.push(Item::cell(
y,
x,
"green",
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
board.add_block_dot_answer(is_black, "green");
}

Ok(board)
Expand Down
25 changes: 1 addition & 24 deletions cspuz_solver_backend/src/puzzle/litherslink.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,7 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {
}
}
if let Some(is_line) = &ans {
for y in 0..height {
for x in 0..=width {
if let Some(b) = is_line.vertical[y][x] {
board.push(Item {
y: y * 2 + 1,
x: x * 2,
color: "green",
kind: if b { ItemKind::Wall } else { ItemKind::Cross },
})
}
}
}
for y in 0..=height {
for x in 0..width {
if let Some(b) = is_line.horizontal[y][x] {
board.push(Item {
y: y * 2,
x: x * 2 + 1,
color: "green",
kind: if b { ItemKind::Wall } else { ItemKind::Cross },
})
}
}
}
board.add_grid_edges(is_line, "green", ItemKind::Wall, ItemKind::Cross);
}

Ok(board)
Expand Down
13 changes: 1 addition & 12 deletions cspuz_solver_backend/src/puzzle/lits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,7 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {
board.add_borders(&borders, "black");

if let Some(is_black) = &ans {
for y in 0..height {
for x in 0..width {
if let Some(b) = is_black[y][x] {
board.push(Item::cell(
y,
x,
"green",
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
board.add_block_dot_answer(is_black, "green");
}

Ok(board)
Expand Down
13 changes: 1 addition & 12 deletions cspuz_solver_backend/src/puzzle/norinori.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,7 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {
board.add_borders(&borders, "black");

if let Some(is_black) = &ans {
for y in 0..height {
for x in 0..width {
if let Some(b) = is_black[y][x] {
board.push(Item::cell(
y,
x,
"green",
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
board.add_block_dot_answer(is_black, "green");
}

Ok(board)
Expand Down
13 changes: 1 addition & 12 deletions cspuz_solver_backend/src/puzzle/nuritwin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,7 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {
board.add_borders(&borders, "black");

if let Some(is_black) = &ans {
for y in 0..height {
for x in 0..width {
if let Some(b) = is_black[y][x] {
board.push(Item::cell(
y,
x,
"green",
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
board.add_block_dot_answer(is_black, "green");
}
let rooms = graph::borders_to_rooms(&borders);
assert_eq!(rooms.len(), clues.len());
Expand Down
13 changes: 1 addition & 12 deletions cspuz_solver_backend/src/puzzle/shimaguni.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,7 @@ pub fn solve(url: &str) -> Result<Board, &'static str> {
board.add_borders(&borders, "black");

if let Some(is_black) = &is_black {
for y in 0..height {
for x in 0..width {
if let Some(b) = is_black[y][x] {
board.push(Item::cell(
y,
x,
"green",
if b { ItemKind::Block } else { ItemKind::Dot },
));
}
}
}
board.add_block_dot_answer(is_black, "green");
}
let rooms = graph::borders_to_rooms(&borders);
assert_eq!(rooms.len(), clues.len());
Expand Down
Loading