Added disconnection (#229)

Author: ReverM

cspuz_rs_puzzles/src/puzzles/disco.rs

@@ -0,0 +1,120 @@
+use cspuz_rs::graph;
+use cspuz_rs::serializer::{
+    problem_to_url_with_context_pzprxs, url_to_problem, Combinator, Context, Rooms, Size,
+};
+use cspuz_rs::solver::Solver;
+
+pub fn solve_disco(
+    borders: &graph::InnerGridEdges<Vec<Vec<bool>>>,
+) -> Option<Vec<Vec<Option<bool>>>> {
+    let h = borders.vertical.len();
+    assert!(h > 0);
+    let w = borders.vertical[0].len() + 1;
+
+    let mut solver = Solver::new();
+    let is_black = &solver.bool_var_2d((h, w));
+    solver.add_answer_key_bool(is_black);
+    graph::active_vertices_connected_2d(&mut solver, is_black);
+
+    let group_a = &solver.bool_var_2d((h, w));
+    let group_b = &solver.bool_var_2d((h, w));
+    solver.add_expr(!(group_a & group_b));
+    solver.add_expr((group_a | group_b).iff(is_black));
+
+    solver.add_expr(!is_black.conv2d_and((2, 2)));
+
+    let rooms = graph::borders_to_rooms(borders);
+
+    for i in 0..rooms.len() {
+        if (rooms[i].len() as i32) < 3 {
+            return None;
+        }
+
+        solver.add_expr(group_a.select(&rooms[i]).count_true().ge(1));
+        solver.add_expr(group_b.select(&rooms[i]).count_true().ge(1));
+        graph::active_vertices_connected_2d_region(&mut solver, group_a, &rooms[i]);
+        graph::active_vertices_connected_2d_region(&mut solver, group_b, &rooms[i]);
+    }
+
+    for y in 0..h {
+        for x in 0..w {
+            if y < h - 1 && !borders.horizontal[y][x] {
+                solver.add_expr(!(group_a.at((y, x)) & group_b.at((y + 1, x))));
+                solver.add_expr(!(group_b.at((y, x)) & group_a.at((y + 1, x))));
+            }
+            if x < w - 1 && !borders.vertical[y][x] {
+                solver.add_expr(!(group_a.at((y, x)) & group_b.at((y, x + 1))));
+                solver.add_expr(!(group_b.at((y, x)) & group_a.at((y, x + 1))));
+            }
+        }
+    }
+    solver.irrefutable_facts().map(|f| f.get(is_black))
+}
+
+type Problem = graph::InnerGridEdges<Vec<Vec<bool>>>;
+
+fn combinator() -> impl Combinator<Problem> {
+    Size::new(Rooms)
+}
+pub fn serialize_problem(problem: &Problem) -> Option<String> {
+    let height = problem.vertical.len();
+    let width = problem.vertical[0].len() + 1;
+    problem_to_url_with_context_pzprxs(
+        combinator(),
+        "disco",
+        problem.clone(),
+        &Context::sized(height, width),
+    )
+}
+
+pub fn deserialize_problem(url: &str) -> Option<Problem> {
+    url_to_problem(combinator(), &["disco"], url)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn problem_for_tests() -> Problem {
+        let ret = graph::InnerGridEdges {
+            horizontal: crate::util::tests::to_bool_2d([
+                [0, 1, 0, 1, 0],
+                [1, 1, 0, 0, 1],
+                [0, 1, 1, 1, 1],
+                [1, 0, 0, 0, 0],
+            ]),
+            vertical: crate::util::tests::to_bool_2d([
+                [0, 1, 1, 0],
+                [1, 0, 0, 1],
+                [0, 1, 0, 0],
+                [1, 0, 1, 0],
+                [0, 0, 1, 0],
+            ]),
+        };
+        ret
+    }
+
+    #[test]
+    fn test_disco_problem() {
+        let problem = problem_for_tests();
+        let ans = solve_disco(&problem);
+        assert!(ans.is_some());
+        let ans = ans.unwrap();
+
+        let expected = crate::util::tests::to_option_bool_2d([
+            [0, 1, 0, 1, 0],
+            [1, 1, 1, 1, 1],
+            [0, 1, 0, 0, 1],
+            [1, 1, 1, 0, 1],
+            [1, 0, 1, 1, 0],
+        ]);
+        assert_eq!(ans, expected);
+    }
+
+    #[test]
+    fn test_disco_serializer() {
+        let problem = problem_for_tests();
+        let url = "https://pzprxs.vercel.app/p?disco/5/5/d552apfg";
+        crate::util::tests::serializer_test(problem, url, serialize_problem, deserialize_problem);
+    }
+}

cspuz_rs_puzzles/src/puzzles/mod.rs

@@ -36,6 +36,7 @@ pub mod cross_the_streams;
 pub mod crosswall;
 pub mod curvedata;
 pub mod dbchoco;
+pub mod disco;
 pub mod dominion;
 pub mod doppelblock;
 pub mod double_lits;

cspuz_solver_backend/src/puzzle/disco.rs

@@ -0,0 +1,102 @@
+use crate::board::{Board, BoardKind, Item, ItemKind};
+use crate::uniqueness::check_uniqueness;
+use cspuz_rs_puzzles::puzzles::disco;
+
+pub fn solve(url: &str) -> Result<Board, &'static str> {
+    let borders = disco::deserialize_problem(url).ok_or("invalid url")?;
+    let ans = disco::solve_disco(&borders);
+
+    let height = borders.horizontal.len() + 1;
+    let width = if borders.horizontal.is_empty() {
+        0
+    } else {
+        borders.horizontal[0].len()
+    };
+    let mut board = Board::new(BoardKind::Grid, height, width, check_uniqueness(&ans));
+
+    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 },
+                    ));
+                }
+            }
+        }
+    }
+
+    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?disco/5/5/d552apfg"),
+            Board {
+                kind: BoardKind::Grid,
+                height: 5,
+                width: 5,
+                data: vec![
+                    Item { y: 2, x: 3, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 1, x: 4, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 1, x: 6, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 2, x: 7, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 4, x: 1, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 3, x: 2, color: "black", kind: ItemKind::BoldWall },         
+                    Item { y: 4, x: 3, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 3, x: 8, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 4, x: 9, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 6, x: 3, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 5, x: 4, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 6, x: 5, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 6, x: 7, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 6, x: 9, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 8, x: 1, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 7, x: 2, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 7, x: 6, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 9, x: 6, color: "black", kind: ItemKind::BoldWall },
+                    Item { y: 1, x: 1, color: "green", kind: ItemKind::Dot },
+                    Item { y: 1, x: 3, color: "green", kind: ItemKind::Block },
+                    Item { y: 1, x: 5, color: "green", kind: ItemKind::Dot },
+                    Item { y: 1, x: 7, color: "green", kind: ItemKind::Block },
+                    Item { y: 1, x: 9, color: "green", kind: ItemKind::Dot },
+                    Item { y: 3, x: 1, color: "green", kind: ItemKind::Block },
+                    Item { y: 3, x: 3, color: "green", kind: ItemKind::Block },
+                    Item { y: 3, x: 5, color: "green", kind: ItemKind::Block },
+                    Item { y: 3, x: 7, color: "green", kind: ItemKind::Block },
+                    Item { y: 3, x: 9, color: "green", kind: ItemKind::Block },
+                    Item { y: 5, x: 1, color: "green", kind: ItemKind::Dot },
+                    Item { y: 5, x: 3, color: "green", kind: ItemKind::Block },
+                    Item { y: 5, x: 5, color: "green", kind: ItemKind::Dot },
+                    Item { y: 5, x: 7, color: "green", kind: ItemKind::Dot },
+                    Item { y: 5, x: 9, color: "green", kind: ItemKind::Block },
+                    Item { y: 7, x: 1, color: "green", kind: ItemKind::Block },
+                    Item { y: 7, x: 3, color: "green", kind: ItemKind::Block },
+                    Item { y: 7, x: 5, color: "green", kind: ItemKind::Block },
+                    Item { y: 7, x: 7, color: "green", kind: ItemKind::Dot },
+                    Item { y: 7, x: 9, color: "green", kind: ItemKind::Block },
+                    Item { y: 9, x: 1, color: "green", kind: ItemKind::Block },
+                    Item { y: 9, x: 3, color: "green", kind: ItemKind::Dot },
+                    Item { y: 9, x: 5, color: "green", kind: ItemKind::Block },
+                    Item { y: 9, x: 7, color: "green", kind: ItemKind::Block },
+                    Item { y: 9, x: 9, color: "green", kind: ItemKind::Dot },
+                ],
+                uniqueness: Uniqueness::Unique,
+            },
+        );
+    }
+}

cspuz_solver_backend/src/puzzle/mod.rs

@@ -119,6 +119,7 @@ puzzle_list!(puzz_link,
     (cross_the_streams, ["cts"], "Cross the Streams", "Cross the Streams"),
     (curvedata, ["curvedata"], "Curve Data", "カーブデータ", enumerable),
     (dbchoco, ["dbchoco"], "Double Choco", "ダブルチョコ"),
+    (disco, ["disco"], "Disconnection", "ディスコネクション"),
     (dominion, ["dominion"], "Dominion", "ドミニオン"),
     (doppelblock, ["doppelblock"], "Doppelblock", "ビトゥイーン・サム"),
     (doubleback, ["doubleback"], "Double Back", "Double Back"),