-
Notifications
You must be signed in to change notification settings - Fork 9
Add solver for mintonette #203
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.
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,222 @@ | ||
| use crate::util; | ||
| use cspuz_rs::graph; | ||
| use cspuz_rs::serializer::{ | ||
| problem_to_url_pzprxs, url_to_problem, Choice, Combinator, Dict, Grid, HexInt, Optionalize, | ||
| Spaces, | ||
| }; | ||
| use cspuz_rs::solver::{any, count_true, Solver, TRUE}; | ||
|
|
||
| pub fn solve_mintonette( | ||
| clues: &[Vec<Option<i32>>], | ||
| ) -> Option<graph::BoolGridEdgesIrrefutableFacts> { | ||
| let (h, w) = util::infer_shape(clues); | ||
|
|
||
| let mut solver = Solver::new(); | ||
| let mut clue_pos = vec![]; | ||
| let is_turn = &solver.bool_var_2d((h, w)); | ||
| let is_line = &graph::BoolGridEdges::new(&mut solver, (h - 1, w - 1)); | ||
| solver.add_answer_key_bool(&is_line.horizontal); | ||
| solver.add_answer_key_bool(&is_line.vertical); | ||
|
|
||
| for y in 0..h { | ||
| for x in 0..w { | ||
| solver.add_expr(is_turn.at((y, x)).iff( | ||
| (is_line.vertical.at_offset((y, x), (-1, 0), false) | ||
| | is_line.vertical.at_offset((y, x), (0, 0), false)) | ||
| & (is_line.horizontal.at_offset((y, x), (0, -1), false) | ||
| | is_line.horizontal.at_offset((y, x), (0, 0), false)), | ||
| )); | ||
| if let Some(n) = clues[y][x] { | ||
| clue_pos.push((y, x, n)); | ||
| solver.add_expr(is_line.vertex_neighbors((y, x)).count_true().eq(1)); | ||
| } else { | ||
| solver.add_expr(is_line.vertex_neighbors((y, x)).count_true().eq(2)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if clue_pos.len() % 2 == 1 { | ||
| return None; | ||
| } | ||
|
|
||
| let mut blocks = vec![]; | ||
| for &(y, x, _) in &clue_pos { | ||
| let block = solver.bool_var_2d((h, w)); | ||
| graph::active_vertices_connected_2d(&mut solver, &block); | ||
| solver.add_expr(block.at((y, x))); | ||
| blocks.push(block); | ||
| } | ||
|
|
||
| for i in 0..blocks.len() { | ||
| for j in (i + 1)..blocks.len() { | ||
| let (yi, xi, ni) = clue_pos[i]; | ||
| let (yj, xj, nj) = clue_pos[j]; | ||
|
|
||
| if (ni != nj) & (ni > -1) & (nj > -1) { | ||
| solver.add_expr(!(blocks[i].at((yj, xj)))); | ||
| solver.add_expr(!(blocks[j].at((yi, xi)))); | ||
| } | ||
| if ni > -1 { | ||
| solver.add_expr((blocks[i].clone() & is_turn).count_true().eq(ni)); | ||
| } | ||
| if nj > -1 { | ||
| solver.add_expr((blocks[j].clone() & is_turn).count_true().eq(nj)); | ||
| } | ||
| } | ||
| } | ||
| for y in 0..h { | ||
| for x in 0..w { | ||
| let mut indicators = vec![]; | ||
| for i in 0..blocks.len() { | ||
| indicators.push(blocks[i].at((y, x))); | ||
| } | ||
| solver.add_expr(count_true(indicators).eq(2)); | ||
| } | ||
| } | ||
|
|
||
| for y in 0..h { | ||
| for x in 0..w { | ||
| if y < h - 1 { | ||
| let diff = blocks | ||
| .iter() | ||
| .map(|block| block.at((y, x)) ^ block.at((y + 1, x))) | ||
| .collect::<Vec<_>>(); | ||
| solver.add_expr(any(diff).imp(!is_line.vertical.at((y, x)))); | ||
| } | ||
| if x < w - 1 { | ||
| let diff = blocks | ||
| .iter() | ||
| .map(|block| block.at((y, x)) ^ block.at((y, x + 1))) | ||
| .collect::<Vec<_>>(); | ||
| solver.add_expr(any(diff).imp(!is_line.horizontal.at((y, x)))); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| let mut aux_graph = graph::Graph::new((h - 1) * (w - 1) + 1 + (h - 1) * w + h * (w - 1)); | ||
| let mut indicator = vec![TRUE; (h - 1) * (w - 1) + 1]; | ||
|
|
||
| for y in 0..h { | ||
| for x in 0..w - 1 { | ||
| let v1 = if y == 0 { | ||
| (h - 1) * (w - 1) | ||
| } else { | ||
| (y - 1) * (w - 1) + x | ||
| }; | ||
| let v2 = if y == h - 1 { | ||
| (h - 1) * (w - 1) | ||
| } else { | ||
| y * (w - 1) + x | ||
| }; | ||
|
|
||
| let e = indicator.len(); | ||
| aux_graph.add_edge(e, v1); | ||
| aux_graph.add_edge(e, v2); | ||
|
|
||
| indicator.push(!is_line.horizontal.at((y, x))); | ||
| } | ||
| } | ||
|
|
||
| for y in 0..h - 1 { | ||
| for x in 0..w { | ||
| let v1 = if x == 0 { | ||
| (h - 1) * (w - 1) | ||
| } else { | ||
| y * (w - 1) + x - 1 | ||
| }; | ||
| let v2 = if x == w - 1 { | ||
| (h - 1) * (w - 1) | ||
| } else { | ||
| y * (w - 1) + x | ||
| }; | ||
|
|
||
| let e = indicator.len(); | ||
| aux_graph.add_edge(e, v1); | ||
| aux_graph.add_edge(e, v2); | ||
|
|
||
| indicator.push(!is_line.vertical.at((y, x))); | ||
| } | ||
| } | ||
|
|
||
| graph::active_vertices_connected(&mut solver, &indicator, &aux_graph); | ||
|
|
||
| solver.irrefutable_facts().map(|f| f.get(is_line)) | ||
| } | ||
|
|
||
| type Problem = Vec<Vec<Option<i32>>>; | ||
|
|
||
| fn combinator() -> impl Combinator<Problem> { | ||
| Grid::new(Choice::new(vec![ | ||
| Box::new(Optionalize::new(HexInt)), | ||
| Box::new(Spaces::new(None, 'g')), | ||
| Box::new(Dict::new(Some(-1), ".")), | ||
| ])) | ||
| } | ||
|
|
||
| pub fn serialize_problem(problem: &Problem) -> Option<String> { | ||
| problem_to_url_pzprxs(combinator(), "mintonette", problem.clone()) | ||
| } | ||
|
|
||
| pub fn deserialize_problem(url: &str) -> Option<Problem> { | ||
| url_to_problem(combinator(), &["mintonette"], url) | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| fn problem_for_tests() -> Problem { | ||
| let height = 6; | ||
| let width = 6; | ||
| let mut ret = vec![vec![None; width]; height]; | ||
| ret[0][3] = Some(1); | ||
| ret[0][4] = Some(2); | ||
| ret[1][0] = Some(1); | ||
| ret[1][1] = Some(7); | ||
| ret[1][2] = Some(0); | ||
| ret[1][3] = Some(2); | ||
| ret[4][2] = Some(-1); | ||
| ret[4][3] = Some(-1); | ||
| ret[4][4] = Some(-1); | ||
| ret[4][5] = Some(-1); | ||
| ret[5][1] = Some(-1); | ||
| ret[5][2] = Some(-1); | ||
|
|
||
| ret | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_mintonette_problem() { | ||
| let problem = problem_for_tests(); | ||
| let ans = solve_mintonette(&problem); | ||
| assert!(ans.is_some()); | ||
| let ans = ans.unwrap(); | ||
|
|
||
| let expected = graph::GridEdges { | ||
| horizontal: crate::util::tests::to_option_bool_2d([ | ||
| [1, 1, 1, 0, 1], | ||
| [0, 0, 0, 1, 1], | ||
| [1, 0, 0, 1, 1], | ||
| [1, 0, 0, 0, 1], | ||
| [1, 0, 0, 0, 0], | ||
| [1, 0, 1, 1, 1], | ||
| ]), | ||
| vertical: crate::util::tests::to_option_bool_2d([ | ||
| [1, 0, 0, 0, 0, 1], | ||
| [0, 1, 1, 0, 0, 0], | ||
| [1, 0, 1, 1, 0, 1], | ||
| [0, 1, 1, 1, 1, 0], | ||
| [1, 0, 0, 0, 0, 1], | ||
| ]), | ||
| }; | ||
|
|
||
| assert_eq!(ans, expected); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_mintonette_serializer() { | ||
| let problem = problem_for_tests(); | ||
| let url = "https://pzprxs.vercel.app/p?mintonette/6/6/i12g1702v....g..i"; | ||
| util::tests::serializer_test(problem, url, serialize_problem, deserialize_problem); | ||
| } | ||
| } | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| use crate::board::{Board, BoardKind, Item, ItemKind}; | ||
| use crate::uniqueness::check_uniqueness; | ||
| use cspuz_rs_puzzles::puzzles::mintonette; | ||
|
|
||
| pub fn solve(url: &str) -> Result<Board, &'static str> { | ||
| let problem = mintonette::deserialize_problem(url).ok_or("invalid url")?; | ||
| let ans = mintonette::solve_mintonette(&problem); | ||
|
|
||
| let height = problem.len(); | ||
| let width = problem[0].len(); | ||
| let mut board = Board::new(BoardKind::Grid, height, width, check_uniqueness(&ans)); | ||
| for y in 0..height { | ||
| for x in 0..width { | ||
| if let Some(clue) = problem[y][x] { | ||
| board.push(Item::cell(y, x, "black", ItemKind::Circle)); | ||
| if clue > -1 { | ||
| board.push(Item::cell(y, x, "black", ItemKind::Num(clue))); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if let Some(ans) = ans { | ||
| board.add_lines_irrefutable_facts(&ans, "green", None); | ||
| } | ||
|
|
||
| Ok(board) | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::solve; | ||
| use crate::board::*; | ||
| use crate::compare_board_and_check_no_solution_case; | ||
| use crate::uniqueness::Uniqueness; | ||
|
|
||
| #[test] | ||
| #[rustfmt::skip] | ||
| fn test_solve() { | ||
| compare_board_and_check_no_solution_case!( | ||
| solve("https://pzprxs.vercel.app/p?mintonette/4/4/h..n12.2"), | ||
| Board { | ||
| kind: BoardKind::Grid, | ||
| height: 4, | ||
| width: 4, | ||
| data: vec![ | ||
| Item { y: 1, x: 5, color: "black", kind: ItemKind::Circle }, | ||
| Item { y: 1, x: 7, color: "black", kind: ItemKind::Circle }, | ||
| Item { y: 7, x: 1, color: "black", kind: ItemKind::Circle }, | ||
| Item { y: 7, x: 1, color: "black", kind: ItemKind::Num(1) }, | ||
| Item { y: 7, x: 3, color: "black", kind: ItemKind::Circle }, | ||
| Item { y: 7, x: 3, color: "black", kind: ItemKind::Num(2) }, | ||
| Item { y: 7, x: 5, color: "black", kind: ItemKind::Circle }, | ||
| Item { y: 7, x: 7, color: "black", kind: ItemKind::Circle }, | ||
| Item { y: 7, x: 7, color: "black", kind: ItemKind::Num(2) }, | ||
| Item { y: 2, x: 1, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 2, x: 3, color: "green", kind: ItemKind::Cross }, | ||
| Item { y: 2, x: 5, color: "green", kind: ItemKind::Cross }, | ||
| Item { y: 2, x: 7, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 4, x: 1, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 4, x: 3, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 4, x: 5, color: "green", kind: ItemKind::Cross }, | ||
| Item { y: 4, x: 7, color: "green", kind: ItemKind::Cross }, | ||
| Item { y: 6, x: 1, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 6, x: 3, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 6, x: 5, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 6, x: 7, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 1, x: 2, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 1, x: 4, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 1, x: 6, color: "green", kind: ItemKind::Cross }, | ||
| Item { y: 3, x: 2, color: "green", kind: ItemKind::Cross }, | ||
| Item { y: 3, x: 4, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 3, x: 6, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 5, x: 2, color: "green", kind: ItemKind::Cross }, | ||
| Item { y: 5, x: 4, color: "green", kind: ItemKind::Cross }, | ||
| Item { y: 5, x: 6, color: "green", kind: ItemKind::Line }, | ||
| Item { y: 7, x: 2, color: "green", kind: ItemKind::Cross }, | ||
| Item { y: 7, x: 4, color: "green", kind: ItemKind::Cross }, | ||
| Item { y: 7, x: 6, color: "green", kind: ItemKind::Cross }, | ||
| ], | ||
| uniqueness: Uniqueness::Unique, | ||
| }, | ||
| ); | ||
| } | ||
| } |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess these constraints are added too many times because they are in a doubly nested loop
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah that's true. I had copied part of what araf did. I shall remove the second one then