karma/stickfosh
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed warnings

Browse Source
This commit is contained in:
Karma Riuk 2025-02-16 10:32:09 +01:00
parent 62a35ecafd
commit 4eae988999
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/model/ais/ai.hpp
View File

@ -46,31 +46,32 @@ namespace ai {
class v2_alpha_beta : public AI { class v2_alpha_beta : public AI {
// looks two moves ahead, with alpha-beta pruning (no move ordering) // looks two moves ahead, with alpha-beta pruning (no move ordering)
int _search(const Board&, int, int, int); virtual int _search(const Board&, int, int, int);
public: public:
v2_alpha_beta(bool w, std::chrono::milliseconds tt): AI(w, tt) {} v2_alpha_beta(bool w, std::chrono::milliseconds tt): AI(w, tt) {}
Move _search(const Board&) override; virtual Move _search(const Board&) override;
int eval(const Board&) override; virtual int eval(const Board&) override;
}; };
class v3_AB_ordering : public AI { class v3_AB_ordering : public AI {
// looks two moves ahead, with alpha-beta pruning, with move ordering // looks two moves ahead, with alpha-beta pruning, with move ordering
virtual int _search(const Board&, int, int, int); virtual int _ab_search(const Board&, int, int, int);
public: public:
v3_AB_ordering(bool w, std::chrono::milliseconds tt): AI(w, tt) {} v3_AB_ordering(bool w, std::chrono::milliseconds tt): AI(w, tt) {}
Move _search(const Board&) override; virtual Move _search(const Board&) override;
int eval(const Board&) override; virtual int eval(const Board&) override;
}; };
class v4_search_captures : public v3_AB_ordering { class v4_search_captures : public v3_AB_ordering {
protected:
// same as v3, but looking at only at captures when leaf is reached, // same as v3, but looking at only at captures when leaf is reached,
// until no captures are left // until no captures are left
int _search(const Board&, int, int, int) override; virtual int _ab_search(const Board&, int, int, int) override;
int _search_captures(const Board&, int, int); virtual int _search_captures(const Board&, int, int);
public: public:
v4_search_captures(bool w, std::chrono::milliseconds tt) v4_search_captures(bool w, std::chrono::milliseconds tt)
@ -85,6 +86,7 @@ namespace ai {
v5_better_endgame(bool w, std::chrono::milliseconds tt) v5_better_endgame(bool w, std::chrono::milliseconds tt)
: v4_search_captures(w, tt) {} : v4_search_captures(w, tt) {}
int eval(const Board&) override; virtual int eval(const Board&) override;
};
}; };
} // namespace ai } // namespace ai

12
src/model/ais/v3_AB_ordering.cpp
View File

@ -25,9 +25,11 @@ Move ai::v3_AB_ordering::_search(const Board& b) {
std::map<Move, std::future<int>> futures; std::map<Move, std::future<int>> futures;
for (const Move& move : moves) { for (const Move& move : moves) {
Board tmp_board = b.make_move(move); Board tmp_board = b.make_move(move);
futures.insert({move, pool.enqueue([&, tmp_board]() { futures.insert(
return _search(tmp_board, 3, -INFINITY, INFINITY); {move, pool.enqueue([&, tmp_board]() {
})}); return _ab_search(tmp_board, 3, -INFINITY, INFINITY);
})}
);
} }
int counter = 0; int counter = 0;
@ -58,7 +60,7 @@ Move ai::v3_AB_ordering::_search(const Board& b) {
return best_move; return best_move;
} }
int ai::v3_AB_ordering::_search( int ai::v3_AB_ordering::_ab_search(
const Board& b, int depth, int alpha, int beta const Board& b, int depth, int alpha, int beta
) { ) {
if (depth == 0 || stop_computation) if (depth == 0 || stop_computation)
@ -78,7 +80,7 @@ int ai::v3_AB_ordering::_search(
Move best_move; Move best_move;
for (const Move& move : moves) { for (const Move& move : moves) {
Board tmp_board = b.make_move(move); Board tmp_board = b.make_move(move);
int tmp_eval = -_search(tmp_board, depth - 1, -beta, -alpha); int tmp_eval = -_ab_search(tmp_board, depth - 1, -beta, -alpha);
if (tmp_eval >= beta) if (tmp_eval >= beta)
return beta; return beta;
alpha = std::max(alpha, tmp_eval); alpha = std::max(alpha, tmp_eval);

4
src/model/ais/v4_search_captures.cpp
View File

@ -9,7 +9,7 @@
static int position_counter; static int position_counter;
int ai::v4_search_captures::_search( int ai::v4_search_captures::_ab_search(
const Board& b, int depth, int alpha, int beta const Board& b, int depth, int alpha, int beta
) { ) {
if (depth == 0 || stop_computation) if (depth == 0 || stop_computation)
@ -29,7 +29,7 @@ int ai::v4_search_captures::_search(
Move best_move; Move best_move;
for (const Move& move : moves) { for (const Move& move : moves) {
Board tmp_board = b.make_move(move); Board tmp_board = b.make_move(move);
int tmp_eval = -_search(tmp_board, depth - 1, -beta, -alpha); int tmp_eval = -_ab_search(tmp_board, depth - 1, -beta, -alpha);
if (tmp_eval >= beta) if (tmp_eval >= beta)
return beta; return beta;
alpha = std::max(alpha, tmp_eval); alpha = std::max(alpha, tmp_eval);