Bound the frontier. I.e., do beam search.

[slidingtile] / sliding_tile_lib_test.cc

diff --git a/sliding_tile_lib_test.cc b/sliding_tile_lib_test.cc
index 8e6cb89b96b1e8b58f0fca65f6994fd54da2964e..25b0e76f55dcc4455cba1daa9dac8e45dfd9daa6 100644 (file)
--- a/sliding_tile_lib_test.cc
+++ b/sliding_tile_lib_test.cc
@@ -6,7 +6,7 @@
 #include <sstream>
 
 using testing::Field;
 #include <sstream>
 
 using testing::Field;

-using testing::ElementsAreArray;
+using testing::Pointee;

 
 TEST(Step, Adjacency) {
        const signed char LEFT  = -1;
 
 TEST(Step, Adjacency) {
        const signed char LEFT  = -1;


@@ -37,13 +37,33 @@ TEST(Step, Adjacency) {
   }
 }
 
   }
 }
 

+TEST(Board, Equal) {
+  Board b1{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}};
+  Board b2{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}};
+  EXPECT_TRUE(b1 == b2);
+  EXPECT_FALSE(b1 != b2);
+  EXPECT_EQ(b1, b2);
+  EXPECT_FALSE(b1 < b2);
+  EXPECT_FALSE(b2 < b1);
+}
+
+TEST(Board, NotEqual) {
+  Board b1{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}};
+  Board b2{{1,2,3,4,5,6,7,8,10,9,11,12,13,14,15,0}};
+  EXPECT_FALSE(b1 == b2);
+  EXPECT_TRUE(b1 != b2);
+  EXPECT_NE(b1, b2);
+  EXPECT_TRUE(b1 < b2);
+  EXPECT_FALSE(b2 < b1);
+}
+

 TEST(Board, GoodInput) {
   std::istringstream is{"15,14,9,13,3,1,12,8,0,11,6,4,7,5,2,10"};
   Board b;
   is >> b;
   EXPECT_FALSE(is.fail());
   EXPECT_TRUE(is.eof());
 TEST(Board, GoodInput) {
   std::istringstream is{"15,14,9,13,3,1,12,8,0,11,6,4,7,5,2,10"};
   Board b;
   is >> b;
   EXPECT_FALSE(is.fail());
   EXPECT_TRUE(is.eof());

-  EXPECT_THAT(b.board, ElementsAreArray({15,14,9,13,3,1,12,8,0,11,6,4,7,5,2,10}));
+  EXPECT_EQ((Board{{15,14,9,13,3,1,12,8,0,11,6,4,7,5,2,10}}), b);

 }
 
 TEST(Board, ShortInput) {
 }
 
 TEST(Board, ShortInput) {


@@ -122,20 +142,20 @@ TEST(Board, MaxDistance) {
 
 TEST(Step, TwoSuccessors) {
   auto s = std::make_shared<Step>(Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}}, nullptr});
 
 TEST(Step, TwoSuccessors) {
   auto s = std::make_shared<Step>(Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}}, nullptr});

-  std::vector<Step*> suc = s->successors(s);
+  std::vector<std::shared_ptr<Step>> suc = s->successors(s);

   EXPECT_THAT(suc, testing::UnorderedElementsAre(
   EXPECT_THAT(suc, testing::UnorderedElementsAre(

-    Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,5,6,7,8,9,10,11,12,13,14,0,15}))),
-    Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,5,6,7,8,9,10,11,0,13,14,15,12})))));
+    Pointee(Field(&Step::board, Board{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,0,15}})),
+    Pointee(Field(&Step::board, Board{{1,2,3,4,5,6,7,8,9,10,11,0,13,14,15,12}}))));

 }
 
 TEST(Step, FourSuccessors) {
   auto s = std::make_shared<Step>(Step{{{1,2,3,4,5,0,6,7,8,9,10,11,12,13,14,15}}, nullptr});
 }
 
 TEST(Step, FourSuccessors) {
   auto s = std::make_shared<Step>(Step{{{1,2,3,4,5,0,6,7,8,9,10,11,12,13,14,15}}, nullptr});

-  std::vector<Step*> suc = s->successors(s);
+  std::vector<std::shared_ptr<Step>> suc = s->successors(s);

   EXPECT_THAT(suc, testing::UnorderedElementsAre(
   EXPECT_THAT(suc, testing::UnorderedElementsAre(

-    Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,0,5,6,7,8,9,10,11,12,13,14,15}))),
-    Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,5,6,0,7,8,9,10,11,12,13,14,15}))),
-    Field(&Step::board, Field(&Board::board, ElementsAreArray({1,0,3,4,5,2,6,7,8,9,10,11,12,13,14,15}))),
-    Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,5,9,6,7,8,0,10,11,12,13,14,15})))));
+    Pointee(Field(&Step::board, Board{{1,2,3,4,0,5,6,7,8,9,10,11,12,13,14,15}})),
+    Pointee(Field(&Step::board, Board{{1,2,3,4,5,6,0,7,8,9,10,11,12,13,14,15}})),
+    Pointee(Field(&Step::board, Board{{1,0,3,4,5,2,6,7,8,9,10,11,12,13,14,15}})),
+    Pointee(Field(&Step::board, Board{{1,2,3,4,5,9,6,7,8,0,10,11,12,13,14,15}}))));

 }
 
 TEST(Step, Output) {
 }
 
 TEST(Step, Output) {