From 3338e13855b8a08e68f2642250e8c8c24f65f856 Mon Sep 17 00:00:00 2001
From: swifteralex <swifteralexc@gmail.com>
Date: Sun, 6 Jun 2021 12:33:33 -0700
Subject: [PATCH 1/5] Added failing test for generate_solutions() that should
 pass

---
 tests/test_solver.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/test_solver.py b/tests/test_solver.py
index 524d287..d0ee2ba 100644
--- a/tests/test_solver.py
+++ b/tests/test_solver.py
@@ -1,6 +1,7 @@
 import pytest
 from nonogram_solver import solver
 from nonogram_solver.nonogram import Nonogram
+from nonogram_solver.solver import generate_solutions
 import numpy as np
 
 
@@ -73,3 +74,23 @@ def test_nonogram_solver_manual(simple_nonogram_from_string_box):
          [0, 0, 1, 1, 0],
          [-1, -1, -1, 0, 1],
          [-1, -1, 0, 0, 1]]))
+
+
+def test_generate_solutions_ship_example():
+    n_rows = 10
+    n_cols = 10
+    col_clues = [[1], [2, 2], [2, 2, 3], [10], [2, 3], [2, 3], [2, 2, 3], [10], [2, 2, 3], [2]]
+    row_clues = [[1, 1], [3, 3], [3, 3], [1, 1], [3, 4], [3, 4], [1, 1], [10], [9], [7]]
+    puzzle = -1 * np.ones((n_rows, n_cols))
+    generate_solutions(n_rows, n_cols, row_clues, col_clues, puzzle)
+    assert np.all(puzzle == np.array(
+        [[0, 0, 0, 1, 0, 0, 0, 1, 0, 0],
+         [0, 0, 1, 1, 1, 0, 1, 1, 1, 0],
+         [0, 0, 1, 1, 1, 0, 1, 1, 1, 0],
+         [0, 0, 0, 1, 0, 0, 0, 1, 0, 0],
+         [0, 1, 1, 1, 0, 1, 1, 1, 1, 0],
+         [0, 1, 1, 1, 0, 1, 1, 1, 1, 0],
+         [0, 0, 0, 1, 0, 0, 0, 1, 0, 0],
+         [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+         [0, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+         [0, 0, 1, 1, 1, 1, 1, 1, 1, 0]]))

From d9bf30659a2358e71d33af09373050b6e7c26b60 Mon Sep 17 00:00:00 2001
From: swifteralex <swifteralexc@gmail.com>
Date: Sun, 6 Jun 2021 12:45:38 -0700
Subject: [PATCH 2/5] Formatting

---
 tests/test_solver.py | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/tests/test_solver.py b/tests/test_solver.py
index d0ee2ba..cbbf514 100644
--- a/tests/test_solver.py
+++ b/tests/test_solver.py
@@ -79,8 +79,28 @@ def test_nonogram_solver_manual(simple_nonogram_from_string_box):
 def test_generate_solutions_ship_example():
     n_rows = 10
     n_cols = 10
-    col_clues = [[1], [2, 2], [2, 2, 3], [10], [2, 3], [2, 3], [2, 2, 3], [10], [2, 2, 3], [2]]
-    row_clues = [[1, 1], [3, 3], [3, 3], [1, 1], [3, 4], [3, 4], [1, 1], [10], [9], [7]]
+    col_clues = [
+        [1],
+        [2, 2],
+        [2, 2, 3],
+        [10],
+        [2, 3],
+        [2, 3],
+        [2, 2, 3],
+        [10],
+        [2, 2, 3],
+        [2]]
+    row_clues = [
+        [1, 1],
+        [3, 3],
+        [3, 3],
+        [1, 1],
+        [3, 4],
+        [3, 4],
+        [1, 1],
+        [10], 
+        [9],
+        [7]]
     puzzle = -1 * np.ones((n_rows, n_cols))
     generate_solutions(n_rows, n_cols, row_clues, col_clues, puzzle)
     assert np.all(puzzle == np.array(

From ad1e806546e0beb00afa78fd816bbff2f46800d9 Mon Sep 17 00:00:00 2001
From: swifteralex <swifteralexc@gmail.com>
Date: Sun, 6 Jun 2021 12:49:19 -0700
Subject: [PATCH 3/5] Trying to build

---
 .travis.yml | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5178adc..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: python
-python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-install: 
-  - "pip install -r requirements.txt"
-  - "python setup.py install"
-script: py.test
-email: false
\ No newline at end of file

From 3b2d6a594a979205ad447d7ec206b7399c8c9dcd Mon Sep 17 00:00:00 2001
From: swifteralex <swifteralexc@gmail.com>
Date: Sun, 6 Jun 2021 12:49:40 -0700
Subject: [PATCH 4/5] Trying to build

---
 .travis.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..5178adc
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+install: 
+  - "pip install -r requirements.txt"
+  - "python setup.py install"
+script: py.test
+email: false
\ No newline at end of file

From bd5dfe1bd110e29c31150e88e23fbf0511df578b Mon Sep 17 00:00:00 2001
From: swifteralex <swifteralexc@gmail.com>
Date: Sun, 6 Jun 2021 13:05:37 -0700
Subject: [PATCH 5/5] Trying to build

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0b7c935..7660fa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,4 @@
 
 # build files
 build/*
-dist/*
\ No newline at end of file
+dist/*