Split isconsistent() and issolvable()

18 files changed, 15 insertions, 15 deletions

diff --git a/test/00_basic/all.out b/test/00_basic/all.out
index aad167e..892ad22 100644
--- a/test/00_basic/all.out
+++ b/test/00_basic/all.out
@@ -1,6 +1,6 @@
-Solved is consistent
+Solved is solvable
 Solved is solved
-Zero is NOT consistent
+Zero is NOT solvable
 Zero is NOT solved
 Solved and Solved are equal
 Solved and Zero are NOT equal
diff --git a/test/00_basic/basic_tests.c b/test/00_basic/basic_tests.c
index 8c52941..a3ae0b9 100644
--- a/test/00_basic/basic_tests.c
+++ b/test/00_basic/basic_tests.c
@@ -7,7 +7,7 @@
 void
 check(cube_t cube, char *name)
 {
-        printf("%s is%s consistent\n", name, isconsistent(cube) ? "" : " NOT");
+        printf("%s is%s solvable\n", name, issolvable(cube) ? "" : " NOT");
         printf("%s is%s solved\n", name, issolved(cube) ? "" : " NOT");
 }
 
diff --git a/test/01_io/04_inconsistent_ep.out b/test/01_io/04_inconsistent_ep.out
deleted file mode 100644
index cb70902..0000000
--- a/test/01_io/04_inconsistent_ep.out
+++ /dev/null
@@ -1 +0,0 @@
-Cube is inconsistent
diff --git a/test/01_io/04_inconsistent_ep.in b/test/01_io/04_unsolvable_ep.in
index 8483962..8483962 100644
--- a/test/01_io/04_inconsistent_ep.in
+++ b/test/01_io/04_unsolvable_ep.in
diff --git a/test/01_io/04_unsolvable_ep.out b/test/01_io/04_unsolvable_ep.out
new file mode 100644
index 0000000..e35c6e4
--- /dev/null
+++ b/test/01_io/04_unsolvable_ep.out
@@ -0,0 +1 @@
+Cube is not solvable
diff --git a/test/01_io/05_inconsistent_eo.out b/test/01_io/05_inconsistent_eo.out
deleted file mode 100644
index cb70902..0000000
--- a/test/01_io/05_inconsistent_eo.out
+++ /dev/null
@@ -1 +0,0 @@
-Cube is inconsistent
diff --git a/test/01_io/05_inconsistent_eo.in b/test/01_io/05_unsolvable_eo.in
index a92089d..a92089d 100644
--- a/test/01_io/05_inconsistent_eo.in
+++ b/test/01_io/05_unsolvable_eo.in
diff --git a/test/01_io/05_unsolvable_eo.out b/test/01_io/05_unsolvable_eo.out
new file mode 100644
index 0000000..e35c6e4
--- /dev/null
+++ b/test/01_io/05_unsolvable_eo.out
@@ -0,0 +1 @@
+Cube is not solvable
diff --git a/test/01_io/06_inconsistent_cp.out b/test/01_io/06_inconsistent_cp.out
deleted file mode 100644
index cb70902..0000000
--- a/test/01_io/06_inconsistent_cp.out
+++ /dev/null
@@ -1 +0,0 @@
-Cube is inconsistent
diff --git a/test/01_io/06_inconsistent_cp.in b/test/01_io/06_unsolvable_cp.in
index 2085dd5..2085dd5 100644
--- a/test/01_io/06_inconsistent_cp.in
+++ b/test/01_io/06_unsolvable_cp.in
diff --git a/test/01_io/06_unsolvable_cp.out b/test/01_io/06_unsolvable_cp.out
new file mode 100644
index 0000000..e35c6e4
--- /dev/null
+++ b/test/01_io/06_unsolvable_cp.out
@@ -0,0 +1 @@
+Cube is not solvable
diff --git a/test/01_io/07_inconsistent_co.out b/test/01_io/07_inconsistent_co.out
deleted file mode 100644
index cb70902..0000000
--- a/test/01_io/07_inconsistent_co.out
+++ /dev/null
@@ -1 +0,0 @@
-Cube is inconsistent
diff --git a/test/01_io/07_inconsistent_co.in b/test/01_io/07_unsolvable_co.in
index abd74e2..abd74e2 100644
--- a/test/01_io/07_inconsistent_co.in
+++ b/test/01_io/07_unsolvable_co.in
diff --git a/test/01_io/07_unsolvable_co.out b/test/01_io/07_unsolvable_co.out
new file mode 100644
index 0000000..e35c6e4
--- /dev/null
+++ b/test/01_io/07_unsolvable_co.out
@@ -0,0 +1 @@
+Cube is not solvable
diff --git a/test/01_io/io_tests.c b/test/01_io/io_tests.c
index 42ef9b8..913ec1d 100644
--- a/test/01_io/io_tests.c
+++ b/test/01_io/io_tests.c
@@ -17,8 +17,8 @@ int main() {
 
         if (iserror(cube)) {
                 printf("Error reading cube\n");
-        } else if (!isconsistent(cube)) {
-                printf("Cube is inconsistent\n");
+        } else if (!issolvable(cube)) {
+                printf("Cube is not solvable\n");
         } else {
                 writecube(cube, str);
                 printf("%s\n", str);
diff --git a/test/02_move/move_tests.c b/test/02_move/move_tests.c
index ac25de3..333c8ee 100644
--- a/test/02_move/move_tests.c
+++ b/test/02_move/move_tests.c
@@ -29,8 +29,8 @@ int main() {
 
         if (iserror(cube)) {
                 printf("Error moving cube\n");
-        } else if (!isconsistent(cube)) {
-                printf("Moved cube is inconsistent\n");
+        } else if (!issolvable(cube)) {
+                printf("Moved cube is not solvable\n");
         } else {
                 writecube(cube, str);
                 printf("%s\n", str);
diff --git a/test/03_inverse/inverse_tests.c b/test/03_inverse/inverse_tests.c
index 5fab71a..c8d8d95 100644
--- a/test/03_inverse/inverse_tests.c
+++ b/test/03_inverse/inverse_tests.c
@@ -16,8 +16,8 @@ int main() {
 
         if (iserror(inv)) {
                 printf("Error inverting cube\n");
-        } else if (!isconsistent(inv)) {
-                printf("Inverted cube is inconsistent\n");
+        } else if (!issolvable(inv)) {
+                printf("Inverted cube is not solvable\n");
         } else {
                 writecube(inv, str);
                 printf("%s\n", str);
diff --git a/test/04_compose/compose_tests.c b/test/04_compose/compose_tests.c
index ae34f6d..575c2c9 100644
--- a/test/04_compose/compose_tests.c
+++ b/test/04_compose/compose_tests.c
@@ -19,8 +19,8 @@ int main() {
 
         if (iserror(c3)) {
                 printf("Error composing cubes\n");
-        } else if (!isconsistent(c3)) {
-                printf("Composed cube is inconsistent\n");
+        } else if (!issolvable(c3)) {
+                printf("Composed cube is not solvable\n");
         } else {
                 writecube(c3, str);
                 printf("%s\n", str);