Can do 1 en-passant, progress #21

Author: richelbilderbeek

game.cpp

@@ -480,57 +480,64 @@ std::vector<piece_action> collect_all_pawn_en_passant_actions(
   if (color == chess_color::black)
   {
     if (x != 3) return {};
+    if (y > 0)
     {
-      if (y > 0)
+      const square to_square{square(x - 1, y - 1)};
+      const square enemy_square{square(x, y - 1)};
+      if (is_empty(g, to_square)
+        && is_piece_at(g, enemy_square)
+        && get_piece_at(g, enemy_square).get_color() == enemy_color
+        && has_just_double_moved(get_piece_at(g, enemy_square), g.get_time())
+      )
       {
-        const square to_square{square(x - 1, y - 1)};
-        const square enemy_square{square(x, y - 1)};
-        if (is_empty(g, to_square)
-          && is_piece_at(g, enemy_square)
-          && get_piece_at(g, enemy_square).get_color() == enemy_color
-          && has_just_double_moved(get_piece_at(g, enemy_square), g.get_time())
-        )
-        {
-          actions.push_back(piece_action(color, type, piece_action_type::en_passant, from, to_square));
-        }
+        actions.push_back(piece_action(color, type, piece_action_type::en_passant, from, to_square));
       }
-      if (y < 7)
+    }
+    if (y < 7)
+    {
+      const square to_square{square(x - 1, y + 1)};
+      const square enemy_square{square(x, y + 1)};
+      if (is_empty(g, to_square)
+        && is_piece_at(g, enemy_square)
+        && get_piece_at(g, enemy_square).get_color() == enemy_color
+        && has_just_double_moved(get_piece_at(g, enemy_square), g.get_time())
+      )
       {
-        const square to_square{square(x - 1, y + 1)};
-        const square enemy_square{square(x, y + 1)};
-        if (is_empty(g, to_square)
-          && is_piece_at(g, enemy_square)
-          && get_piece_at(g, enemy_square).get_color() == enemy_color
-          && has_just_double_moved(get_piece_at(g, enemy_square), g.get_time())
-        )
-        {
-          actions.push_back(piece_action(color, type, piece_action_type::en_passant, from, to_square));
-        }
+        assert(!"YAY");
+        actions.push_back(piece_action(color, type, piece_action_type::en_passant, from, to_square));
       }
     }
   }
   else
   {
     assert(color == chess_color::white);
-    assert(get_rank(s) != 1);
-    // Attack
-    if (x != 7)
+    if (x != 4) return {};
+    if (y > 0)
     {
-      if (y > 0)
+      const square to_square{square(x + 1, y - 1)};
+      const square enemy_square{square(x, y - 1)};
+      if (is_empty(g, to_square)
+        && is_piece_at(g, enemy_square)
+        && get_piece_at(g, enemy_square).get_color() == enemy_color
+        && has_just_double_moved(get_piece_at(g, enemy_square), g.get_time())
+      )
       {
-        const square enemy_square{square(x + 1, y - 1)};
-        if (is_piece_at(g, enemy_square) && get_piece_at(g, enemy_square).get_color() == enemy_color)
-        {
-          actions.push_back(piece_action(color, type, piece_action_type::attack, from, enemy_square));
-        }
+        assert(!"YAY");
+        actions.push_back(piece_action(color, type, piece_action_type::en_passant, from, to_square));
       }
-      if (y < 7)
+    }
+    if (y < 7)
+    {
+      const square to_square{square(x + 1, y + 1)};
+      const square enemy_square{square(x, y + 1)};
+      if (is_empty(g, to_square)
+        && is_piece_at(g, enemy_square)
+        && get_piece_at(g, enemy_square).get_color() == enemy_color
+        && has_just_double_moved(get_piece_at(g, enemy_square), g.get_time())
+      )
       {
-        const square enemy_square{square(x + 1, y + 1)};
-        if (is_piece_at(g, enemy_square) && get_piece_at(g, enemy_square).get_color() == enemy_color)
-        {
-          actions.push_back(piece_action(color, type, piece_action_type::attack, from, enemy_square));
-        }
+        assert(!"YAY");
+        actions.push_back(piece_action(color, type, piece_action_type::en_passant, from, to_square));
       }
     }
   }

piece_action.cpp

@@ -2,6 +2,7 @@
 
 #include "piece.h"
 
+#include <algorithm>
 #include <cassert>
 #include <iostream>
 #include <sstream>
@@ -49,6 +50,18 @@ piece_action get_test_piece_action() noexcept
   );
 }
 
+bool has_action_of_type(
+  const std::vector<piece_action>& actions,
+  const piece_action_type t
+)
+{
+  return std::find_if(
+    std::begin(actions),
+    std::end(actions),
+    [t](const piece_action& action) { return action.get_action_type() == t; }
+  ) != std::end(actions);
+}
+
 bool is_double_move(const piece_action& a) noexcept
 {
   return a.get_piece_type() == piece_type::pawn

piece_action.h

@@ -56,6 +56,12 @@ std::string describe_action(const piece_action& p);
 /// Get a piece_action to be used in testing
 piece_action get_test_piece_action() noexcept;
 
+/// Is there at least one action of the specified type?
+bool has_action_of_type(
+  const std::vector<piece_action>& actions,
+  const piece_action_type t
+);
+
 /// Is this a pawn moving two squares forward?
 bool is_double_move(const piece_action& a) noexcept;
 

test_game.cpp

@@ -496,16 +496,20 @@ void test_game_functions()
       );
       assert(!is_in(ke8d8, actions));
     }
-    //#define FIX_ISSUE_21
+    #define FIX_ISSUE_21
     #ifdef FIX_ISSUE_21
-    // 21: can do en-passant
+    // 21: can do en-passant, black h4xg3
     {
       game g{
         get_game_with_starting_position(starting_position_type::before_en_passant)
       };
       do_select_and_move_keyboard_player_piece(g, "g2", "g4");
+      // It takes 1 time unit to move,
+      // aim at halfway to window of opportunity for en-passant
+      for (int i{0}; i!=6; ++i) g.tick(delta_t(0.25));
       const auto actions{collect_all_actions(g)};
       assert(!actions.empty());
+      assert(has_action_of_type(actions, piece_action_type::en_passant));
 
       const piece_action h4xg3ep(
         chess_color::black,
@@ -520,8 +524,8 @@ void test_game_functions()
       g.tick(delta_t(1.0));
       const auto actions_again{collect_all_actions(g)};
       assert(!is_in(h4xg3ep, actions_again));
-      assert(!"Progress #21");
     }
+    //assert(!"Progress #21");
     #endif // FIX_ISSUE_21
   }
   // count_control_actions