Specified default solver for coordinate solvetest

11 files changed, 15 insertions, 4 deletions

diff --git a/tools/400_solvetest_optimal/solvetest.c b/tools/400_solvetest_optimal/solvetest.c
index 0b6575f..6c078a2 100644
--- a/tools/400_solvetest_optimal/solvetest.c
+++ b/tools/400_solvetest_optimal/solvetest.c
@@ -1,3 +1,4 @@
+#define SOLVER       "h48h7k2"
 #define NISSFLAG     NISSY_NISSFLAG_NORMAL
 #define MINMOVES     0
 #define MAXMOVES     20
diff --git a/tools/401_solvetest_opt0_EO_FB/solvetest.c b/tools/401_solvetest_opt0_EO_FB/solvetest.c
index 5b30590..1d4553a 100644
--- a/tools/401_solvetest_opt0_EO_FB/solvetest.c
+++ b/tools/401_solvetest_opt0_EO_FB/solvetest.c
@@ -1,3 +1,4 @@
+#define SOLVER       "coord_EO_UF"
 #define NISSFLAG     NISSY_NISSFLAG_ALL
 #define MINMOVES     0
 #define MAXMOVES     20
diff --git a/tools/402_solvetest_opt0_EO_RL/solvetest.c b/tools/402_solvetest_opt0_EO_RL/solvetest.c
index 5b30590..e1c71dd 100644
--- a/tools/402_solvetest_opt0_EO_RL/solvetest.c
+++ b/tools/402_solvetest_opt0_EO_RL/solvetest.c
@@ -1,3 +1,4 @@
+#define SOLVER       "coord_EO_UR"
 #define NISSFLAG     NISSY_NISSFLAG_ALL
 #define MINMOVES     0
 #define MAXMOVES     20
diff --git a/tools/403_solvetest_opt0_EO_UD/solvetest.c b/tools/403_solvetest_opt0_EO_UD/solvetest.c
index 5b30590..14ec152 100644
--- a/tools/403_solvetest_opt0_EO_UD/solvetest.c
+++ b/tools/403_solvetest_opt0_EO_UD/solvetest.c
@@ -1,3 +1,4 @@
+#define SOLVER       "coord_EO_FD"
 #define NISSFLAG     NISSY_NISSFLAG_ALL
 #define MINMOVES     0
 #define MAXMOVES     20
diff --git a/tools/404_solvetest_opt0_DR_UD/solvetest.c b/tools/404_solvetest_opt0_DR_UD/solvetest.c
index 2a04424..5f70d7c 100644
--- a/tools/404_solvetest_opt0_DR_UD/solvetest.c
+++ b/tools/404_solvetest_opt0_DR_UD/solvetest.c
@@ -1,3 +1,4 @@
+#define SOLVER       "coord_DR_UF"
 #define NISSFLAG     NISSY_NISSFLAG_LINEAR
 #define MINMOVES     0
 #define MAXMOVES     20
diff --git a/tools/405_solvetest_opt0_DR_RL/solvetest.c b/tools/405_solvetest_opt0_DR_RL/solvetest.c
index 2a04424..d9b6180 100644
--- a/tools/405_solvetest_opt0_DR_RL/solvetest.c
+++ b/tools/405_solvetest_opt0_DR_RL/solvetest.c
@@ -1,3 +1,4 @@
+#define SOLVER       "coord_DR_RF"
 #define NISSFLAG     NISSY_NISSFLAG_LINEAR
 #define MINMOVES     0
 #define MAXMOVES     20
diff --git a/tools/406_solvetest_opt0_DR_FB/solvetest.c b/tools/406_solvetest_opt0_DR_FB/solvetest.c
index 2a04424..6491a18 100644
--- a/tools/406_solvetest_opt0_DR_FB/solvetest.c
+++ b/tools/406_solvetest_opt0_DR_FB/solvetest.c
@@ -1,3 +1,4 @@
+#define SOLVER       "coord_DR_FD"
 #define NISSFLAG     NISSY_NISSFLAG_LINEAR
 #define MINMOVES     0
 #define MAXMOVES     20
diff --git a/tools/407_solvetest_opt1_DRSLICE_UD/solvetest.c b/tools/407_solvetest_opt1_DRSLICE_UD/solvetest.c
index 0e4ecef..02e3efd 100644
--- a/tools/407_solvetest_opt1_DRSLICE_UD/solvetest.c
+++ b/tools/407_solvetest_opt1_DRSLICE_UD/solvetest.c
@@ -1,3 +1,4 @@
+#define SOLVER       "coord_DRSLICE_UF"
 #define NISSFLAG     NISSY_NISSFLAG_NORMAL
 #define MINMOVES     0
 #define MAXMOVES     20
diff --git a/tools/408_solvetest_opt1_DRSLICE_RL/solvetest.c b/tools/408_solvetest_opt1_DRSLICE_RL/solvetest.c
index 0e4ecef..47efcb4 100644
--- a/tools/408_solvetest_opt1_DRSLICE_RL/solvetest.c
+++ b/tools/408_solvetest_opt1_DRSLICE_RL/solvetest.c
@@ -1,3 +1,4 @@
+#define SOLVER       "coord_DRSLICE_LF"
 #define NISSFLAG     NISSY_NISSFLAG_NORMAL
 #define MINMOVES     0
 #define MAXMOVES     20
diff --git a/tools/409_solvetest_opt1_DRSLICE_FB/solvetest.c b/tools/409_solvetest_opt1_DRSLICE_FB/solvetest.c
index 0e4ecef..996581c 100644
--- a/tools/409_solvetest_opt1_DRSLICE_FB/solvetest.c
+++ b/tools/409_solvetest_opt1_DRSLICE_FB/solvetest.c
@@ -1,3 +1,4 @@
+#define SOLVER       "coord_DRSLICE_BU"
 #define NISSFLAG     NISSY_NISSFLAG_NORMAL
 #define MINMOVES     0
 #define MAXMOVES     20
diff --git a/tools/solvetest.h b/tools/solvetest.h
index f9087b7..4c72ca5 100644
--- a/tools/solvetest.h
+++ b/tools/solvetest.h
@@ -122,12 +122,13 @@ int main(int argc, char **argv) {
         char filename[7+NISSY_SIZE_DATAID], dataid[NISSY_SIZE_DATAID];
 
         if (argc < 2) {
-                printf("Error: not enough arguments. "
-                    "A solver must be given.\n");
-                return 1;
+                solver = SOLVER;
+                printf("No solver given, using default %s\n", solver);
+        } else {
+                solver = argv[1];
+                printf("Using user-specified solver %s\n", solver);
         }
 
-        solver = argv[1];
         srand(time(NULL));
         nissy_setlogger(log_stderr, NULL);