BUG FIX: override duplicate depth test order.

If two -dto2 9,... were specified in succession then they resulted in two levels with the same .max_depth. This fixes it w a test.
shlomif · Aug 31, 2017 · 092d8ce · 092d8ce
1 parent 116f3fc
commit 092d8ce
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/fc-solve/source/lib.c b/fc-solve/source/lib.c
@@ -2466,7 +2466,7 @@ int DLLEXPORT freecell_solver_user_set_depth_tests_order(
             {
                 break;
             }
-            else if (min_depth <
+            else if (min_depth <=
                      soft_thread->by_depth_moves_order.by_depth_moves[depth_idx]
                          .max_depth)
             {

diff --git a/fc-solve/source/t/lib/FC_Solve/Test/Verify/Data.pm b/fc-solve/source/t/lib/FC_Solve/Test/Verify/Data.pm
@@ -48,6 +48,18 @@ __PACKAGE__->populate(
             args => { deal => 24, theme => [ "--set-pruning", "r:tf", ], },
             msg => "Solving Deal #24 with set-pruning run-to-founds",
         },
+        '110_dto2' => {
+            args => {
+                deal  => 110,
+                theme => [
+                    "--method", "random-dfs",
+                    "-dto2",    "9,[012][4678]",
+                    "-dto2",    "9,[01234678]=asw(1)",
+                    "-seed",    10468
+                ]
+            },
+            msg => "A configuration with which the solver got stuck."
+        },
         '617_jgl' => {
             args => { deal => 617, theme => [ "-l", "john-galt-line" ], },
             msg => "Solving Deal #617 with the john-galt-line",