organ
/
Sanmill
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

position: 简化翻转/旋转/镜像等函数的传参个数 

改为使用类成员变量。
This commit is contained in:
Calcitem 2020-09-01 00:24:59 +08:00
parent 6ea2126713
commit 67cee4cd84
3 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/position.cpp
View File

@ -1743,7 +1743,7 @@ bool Position::is_star_square(Square s)
s == 22);
}
void Position::mirror(int32_t move_, Square s, bool cmdChange /*= true*/)
void Position::mirror(bool cmdChange /*= true*/)
{
Piece ch;
int f, r;
@ -1759,14 +1759,14 @@ void Position::mirror(int32_t move_, Square s, bool cmdChange /*= true*/)
uint64_t llp[3] = { 0 };
if (move_ < 0) {
f = (-move_) / RANK_NB;
r = (-move_) % RANK_NB;
if (move < 0) {
f = (-move) / RANK_NB;
r = (-move) % RANK_NB;
r = (RANK_NB - r) % RANK_NB;
move_ = -(f * RANK_NB + r);
move = static_cast<Move>(-(f * RANK_NB + r));
} else {
llp[0] = static_cast<uint64_t>(from_sq((Move)move_));
llp[1] = to_sq((Move)move_);
llp[0] = static_cast<uint64_t>(from_sq((Move)move));
llp[1] = to_sq((Move)move);
for (i = 0; i < 2; i++) {
f = static_cast<int>(llp[i]) / RANK_NB;
@ -1775,14 +1775,14 @@ void Position::mirror(int32_t move_, Square s, bool cmdChange /*= true*/)
llp[i] = (static_cast<uint64_t>(f) * RANK_NB + r);
}
move_ = static_cast<int16_t>(((llp[0] << 8) | llp[1]));
move = static_cast<Move>(((llp[0] << 8) | llp[1]));
}
if (s != 0) {
f = s / RANK_NB;
r = s % RANK_NB;
if (currentSquare != 0) {
f = currentSquare / RANK_NB;
r = currentSquare % RANK_NB;
r = (RANK_NB - r) % RANK_NB;
s = static_cast<Square>(f * RANK_NB + r);
currentSquare = static_cast<Square>(f * RANK_NB + r);
}
if (rule.allowRemovePiecesRepeatedlyWhenCloseSameMill) {
@ -1852,7 +1852,7 @@ void Position::mirror(int32_t move_, Square s, bool cmdChange /*= true*/)
}
}
void Position::turn(int32_t move_, Square s, bool cmdChange /*= true*/)
void Position::turn(bool cmdChange /*= true*/)
{
Piece ch;
int f, r;
@ -1866,19 +1866,19 @@ void Position::turn(int32_t move_, Square s, bool cmdChange /*= true*/)
uint64_t llp[3] = { 0 };
if (move_ < 0) {
f = (-move_) / RANK_NB;
r = (-move_) % RANK_NB;
if (move < 0) {
f = (-move) / RANK_NB;
r = (-move) % RANK_NB;
if (f == 1)
f = FILE_NB;
else if (f == FILE_NB)
f = 1;
move_ = -(f * RANK_NB + r);
move = static_cast<Move>(-(f * RANK_NB + r));
} else {
llp[0] = static_cast<uint64_t>(from_sq((Move)move_));
llp[1] = to_sq((Move)move_);
llp[0] = static_cast<uint64_t>(from_sq((Move)move));
llp[1] = to_sq((Move)move);
for (i = 0; i < 2; i++) {
f = static_cast<int>(llp[i]) / RANK_NB;
@ -1892,19 +1892,19 @@ void Position::turn(int32_t move_, Square s, bool cmdChange /*= true*/)
llp[i] = static_cast<uint64_t>(f * RANK_NB + r);
}
move_ = static_cast<int16_t>(((llp[0] << 8) | llp[1]));
move = static_cast<Move>(((llp[0] << 8) | llp[1]));
}
if (s != 0) {
f = s / RANK_NB;
r = s % RANK_NB;
if (currentSquare != 0) {
f = currentSquare / RANK_NB;
r = currentSquare % RANK_NB;
if (f == 1)
f = FILE_NB;
else if (f == FILE_NB)
f = 1;
s = static_cast<Square>(f * RANK_NB + r);
currentSquare = static_cast<Square>(f * RANK_NB + r);
}
if (rule.allowRemovePiecesRepeatedlyWhenCloseSameMill) {
@ -2015,7 +2015,7 @@ void Position::turn(int32_t move_, Square s, bool cmdChange /*= true*/)
}
}
void Position::rotate(int degrees, int32_t move_, Square s, bool cmdChange /*= true*/)
void Position::rotate(int degrees, bool cmdChange /*= true*/)
{
degrees = degrees % 360;
@ -2069,14 +2069,14 @@ void Position::rotate(int degrees, int32_t move_, Square s, bool cmdChange /*= t
uint64_t llp[3] = { 0 };
if (move_ < 0) {
f = (-move_) / RANK_NB;
r = (-move_) % RANK_NB;
if (move < 0) {
f = (-move) / RANK_NB;
r = (-move) % RANK_NB;
r = (r + RANK_NB - degrees) % RANK_NB;
move_ = -(f * RANK_NB + r);
move = static_cast<Move>(-(f * RANK_NB + r));
} else {
llp[0] = static_cast<uint64_t>(from_sq((Move)move_));
llp[1] = to_sq((Move)move_);
llp[0] = static_cast<uint64_t>(from_sq((Move)move));
llp[1] = to_sq((Move)move);
f = static_cast<int>(llp[0]) / RANK_NB;
r = static_cast<int>(llp[0]) % RANK_NB;
r = (r + RANK_NB - degrees) % RANK_NB;
@ -2085,14 +2085,14 @@ void Position::rotate(int degrees, int32_t move_, Square s, bool cmdChange /*= t
r = static_cast<int>(llp[1]) % RANK_NB;
r = (r + RANK_NB - degrees) % RANK_NB;
llp[1] = static_cast<uint64_t>(f * RANK_NB + r);
move_ = static_cast<int16_t>(((llp[0] << 8) | llp[1]));
move = static_cast<Move>(((llp[0] << 8) | llp[1]));
}
if (s != 0) {
f = s / RANK_NB;
r = s % RANK_NB;
if (currentSquare != 0) {
f = currentSquare / RANK_NB;
r = currentSquare % RANK_NB;
r = (r + RANK_NB - degrees) % RANK_NB;
s = static_cast<Square>(f * RANK_NB + r);
currentSquare = static_cast<Square>(f * RANK_NB + r);
}
if (rule.allowRemovePiecesRepeatedlyWhenCloseSameMill) {

6
src/position.h
View File

@ -145,9 +145,9 @@ public:
void set_tips();
Color get_winner() const;
void mirror(int32_t move_, Square s, bool cmdChange = true);
void turn(int32_t move_, Square s, bool cmdChange = true);
void rotate(int degrees, int32_t move_, Square s, bool cmdChange = true);
void mirror(bool cmdChange = true);
void turn(bool cmdChange = true);
void rotate(int degrees, bool cmdChange = true);
void create_mill_table();
int add_mills(Square s);

10
src/ui/qt/gamecontroller.cpp
View File

@ -549,8 +549,8 @@ void GameController::flip()
#ifndef TRAINING_MODE
stopAndWaitAiThreads();
position.mirror(position.move, position.currentSquare);
position.rotate(180, position.move, position.currentSquare);
position.mirror();
position.rotate(180);
// 更新棋谱
int row = 0;
@ -575,7 +575,7 @@ void GameController::mirror()
#ifndef TRAINING_MODE
stopAndWaitAiThreads();
position.mirror(position.move, position.currentSquare);
position.mirror();
// 更新棋谱
int row = 0;
@ -603,7 +603,7 @@ void GameController::turnRight()
#ifndef TRAINING_MODE
stopAndWaitAiThreads();
position.rotate(-90, position.move, position.currentSquare);
position.rotate(-90);
// 更新棋谱
int row = 0;
@ -629,7 +629,7 @@ void GameController::turnLeft()
#ifndef TRAINING_MODE
stopAndWaitAiThreads();
position.rotate(90, position.move, position.currentSquare);
position.rotate(90);
// 更新棋谱
int row = 0;