Avoid copy a Position to get a move's san notation

In move_to_san() we create by copy a new position just
to detect if move gives check. This could be very costly in
line_to_san() that calls move_to_san() for every move, so
create the position only once and pass a reference to move_to_san()

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/position.cpp b/src/position.cpp
index 2b6e2b4c07a5e84640d839cd6aca37b77abf9f6d..a389e9c05a6e77d3892ae240b644a3ee730062e7 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -356,8 +356,9 @@ void Position::print(Move m) const {
   std::cout << std::endl;
   if (m != MOVE_NONE)
   {
   std::cout << std::endl;
   if (m != MOVE_NONE)
   {

+      Position p(*this);

       string col = (color_of_piece_on(move_from(m)) == BLACK ? ".." : "");
       string col = (color_of_piece_on(move_from(m)) == BLACK ? ".." : "");

-      std::cout << "Move is: " << col << move_to_san(*this, m) << std::endl;
+      std::cout << "Move is: " << col << move_to_san(p, m) << std::endl;

   }
   for (Rank rank = RANK_8; rank >= RANK_1; rank--)
   {
   }
   for (Rank rank = RANK_8; rank >= RANK_1; rank--)
   {

diff --git a/src/san.cpp b/src/san.cpp
index f155887809f6cccca81d672de3c52f674ba6fa50..2d5dca3fbf94682bfdb2625c562358a9d871d244 100644 (file)
--- a/src/san.cpp
+++ b/src/san.cpp
@@ -63,7 +63,7 @@ namespace {
 /// that the move is a legal move from the position. The return value is
 /// a string containing the move in short algebraic notation.
 
 /// that the move is a legal move from the position. The return value is
 /// a string containing the move in short algebraic notation.
 

-const string move_to_san(const Position& pos, Move m) {
+const string move_to_san(Position& pos, Move m) {

 
   assert(pos.is_ok());
   assert(move_is_ok(m));
 
   assert(pos.is_ok());
   assert(move_is_ok(m));


@@ -123,10 +123,10 @@ const string move_to_san(const Position& pos, Move m) {
   // Position::move_is_check doesn't detect all checks (not castling moves,
   // promotions and en passant captures).
   StateInfo st;
   // Position::move_is_check doesn't detect all checks (not castling moves,
   // promotions and en passant captures).
   StateInfo st;

-  Position p(pos);
-  p.do_move(m, st);
-  if (p.is_check())
-      san += p.is_mate()? "#" : "+";
+  pos.do_move(m, st);
+  if (pos.is_check())
+      san += pos.is_mate() ? "#" : "+";
+  pos.undo_move(m);

 
   return san;
 }
 
   return san;
 }

diff --git a/src/san.h b/src/san.h
index 42202cfad8d4ec8ad045ad6448e6ec658dd2fe36..f398e69508b9c7c60ae08435741b36b4c91a43fd 100644 (file)
--- a/src/san.h
+++ b/src/san.h
@@ -36,7 +36,7 @@
 //// Prototypes
 ////
 
 //// Prototypes
 ////
 

-extern const std::string move_to_san(const Position& pos, Move m);
+extern const std::string move_to_san(Position& pos, Move m);

 extern Move move_from_san(const Position& pos, const std::string& str);
 extern const std::string line_to_san(const Position& pos, Move line[], int startColumn, bool breakLines);
 extern const std::string pretty_pv(const Position& pos, int time, int depth, uint64_t nodes, Value score, ValueType type, Move pv[]);
 extern Move move_from_san(const Position& pos, const std::string& str);
 extern const std::string line_to_san(const Position& pos, Move line[], int startColumn, bool breakLines);
 extern const std::string pretty_pv(const Position& pos, int time, int depth, uint64_t nodes, Value score, ValueType type, Move pv[]);