Keep a count of live Steps

diff --git a/sliding_tile_lib.cc b/sliding_tile_lib.cc
index 9f6bfc9ff62dffa6b776a74350ed1ad110384d65..51aeded95e8ded018c2bff508c9d62daa3ac0fad 100644 (file)
--- a/sliding_tile_lib.cc
+++ b/sliding_tile_lib.cc
@@ -12,6 +12,7 @@
 
 #include <iostream>
 
 
 #include <iostream>
 

+int Step::count = 0;

 signed char Step::adjacent[BOARD_SIZE][5] = {
   1,   4,   -1,  -1,  -1,
   0,   2,   5,   -1,  -1,
 signed char Step::adjacent[BOARD_SIZE][5] = {
   1,   4,   -1,  -1,  -1,
   0,   2,   5,   -1,  -1,


@@ -138,7 +139,13 @@ int Board::distance(const InvertedBoard& invo) const {
   return dist;
 }
 
   return dist;
 }
 

-Step::Step(Board board, std::shared_ptr<Step> prev) : board(board), prev(prev) {}
+Step::Step(Board board, std::shared_ptr<Step> prev) : board(board), prev(prev) {
+  count++;
+}
+
+Step::~Step() {
+  count--;
+}

 
 std::vector<std::shared_ptr<Step>> Step::successors(std::shared_ptr<Step> shared_this) const {
   std::vector<std::shared_ptr<Step>> suc;
 
 std::vector<std::shared_ptr<Step>> Step::successors(std::shared_ptr<Step> shared_this) const {
   std::vector<std::shared_ptr<Step>> suc;


@@ -215,7 +222,8 @@ std::shared_ptr<Step> find_path(const Board& start, const Board& goal) {
         seen.emplace(s->board);
         todo.push(s);
         if (seen.size() % 10000 == 0) {
         seen.emplace(s->board);
         todo.push(s);
         if (seen.size() % 10000 == 0) {

-          std::cerr << "Examined " << seen.size() << " boards.  " << todo.size()
+          std::cerr << "Examined " << seen.size() << " boards.  Tracking "
+                    << Step::count << " steps.  " << todo.size()

                     << " waiting.  Considering paths of length "
                     << todo.top()->cost(invgoal) << std::endl;
         }
                     << " waiting.  Considering paths of length "
                     << todo.top()->cost(invgoal) << std::endl;
         }

diff --git a/sliding_tile_lib.h b/sliding_tile_lib.h
index de2ca1f7fb077295cccb7ae41ee6a5527f4ba2ef..11d9de33b810b8410a06e37fc240b69a8270bc7f 100644 (file)
--- a/sliding_tile_lib.h
+++ b/sliding_tile_lib.h
@@ -30,6 +30,7 @@ std::ostream& operator<<(std::ostream& os, const Board& board);
 
 struct Step {
   Step(Board board, std::shared_ptr<Step> prev);
 
 struct Step {
   Step(Board board, std::shared_ptr<Step> prev);

+  ~Step();

 
   Board board;
   std::shared_ptr<Step> prev;
 
   Board board;
   std::shared_ptr<Step> prev;


@@ -39,6 +40,7 @@ struct Step {
   int cost(const InvertedBoard& invgoal) const;
 
   static signed char adjacent[BOARD_SIZE][5];
   int cost(const InvertedBoard& invgoal) const;
 
   static signed char adjacent[BOARD_SIZE][5];

+  static int count;

 };
 std::ostream& operator<<(std::ostream& os, const Step& step);
 
 };
 std::ostream& operator<<(std::ostream& os, const Step& step);