Extend perft tests (#279)

diff --git a/.travis.yml b/.travis.yml
index bc0d828..8ab6de6 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,13 +50,13 @@ script:
 
   # Check perft of large-board version
   - make clean && make -j2 ARCH=x86-64 largeboards=yes all=yes debug=yes build
-  - ../tests/perft.sh largeboard
+  - ../tests/perft.sh all
   - ../tests/protocol.sh
   - ./stockfish bench xiangqi > /dev/null 2>&1
   - ./stockfish bench shogi > /dev/null 2>&1
   - ./stockfish bench capablanca > /dev/null 2>&1
   - ./stockfish bench sittuyin > /dev/null 2>&1
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make clean && make -j2 ARCH=x86-32 largeboards=yes all=yes debug=yes build && ../tests/perft.sh largeboard; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make clean && make -j2 ARCH=x86-32 largeboards=yes all=yes debug=yes build && ../tests/perft.sh all; fi
 
   # Obtain bench reference from git log
   - git log HEAD | grep "\b[Bb]ench[ :]\+[0-9]\{7\}" | head -n 1 | sed "s/[^0-9]*\([0-9]*\).*/\1/g" > git_sig

diff --git a/src/position.cpp b/src/position.cpp
index b52b9c8..445df4c 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -468,6 +468,18 @@ Position& Position::set(const Variant* v, const string& fenStr, bool isChess960,
       st->rule50 = 0;
   }
 
+  // Lichess-style counter for 3check
+  if (check_counting())
+  {
+      if (ss >> token && token == '+')
+      {
+          ss >> token;
+          st->checksRemaining[WHITE] = CheckCount(std::max(3 - (token - '0'), 0));
+          ss >> token >> token;
+          st->checksRemaining[BLACK] = CheckCount(std::max(3 - (token - '0'), 0));
+      }
+  }
+
   chess960 = isChess960 || v->chess960;
   tsumeMode = Options["TsumeMode"];
   thisThread = th;

diff --git a/tests/perft.sh b/tests/perft.sh
index 381191d..daac659 100755 (executable)
--- a/tests/perft.sh
+++ b/tests/perft.sh
@@ -33,51 +33,80 @@ fi
 
 # variants
 if [[ $1 == "" || $1 == "variant" ]]; then
-  expect perft.exp crazyhouse startpos 5 4888832 > /dev/null
-  expect perft.exp losalamos startpos 6 2549164 > /dev/null
-  expect perft.exp pocketknight startpos 4 3071267 > /dev/null
-  expect perft.exp amazon startpos 5 9319911 > /dev/null
-  expect perft.exp makruk startpos 5 6223994 > /dev/null
-  expect perft.exp cambodian startpos 5 8601434 > /dev/null
-  expect perft.exp shatranj startpos 5 1164248 > /dev/null
-  expect perft.exp hoppelpoppel startpos 5 5056643 > /dev/null
-  expect perft.exp newzealand startpos 5 4987426 > /dev/null
-  expect perft.exp loop startpos 5 4888832 > /dev/null
-  expect perft.exp chessgi startpos 5 4889167 > /dev/null
+  # small board
+  expect perft.exp losalamos startpos 5 191846 > /dev/null
+  expect perft.exp losalamos "fen 6/2P3/6/1K1k2/6/6 w - - 0 1" 6 187431 > /dev/null
+  # fairy
+  expect perft.exp makruk startpos 4 273026 > /dev/null
+  expect perft.exp cambodian startpos 4 361793 > /dev/null
+  expect perft.exp cambodian "fen r1s1ks1r/3nm3/pppNpppp/3n4/5P2/PPPPPNPP/8/R1SKMS1R b DEe 0 0 5" 2 72 > /dev/null
+  expect perft.exp makpong "fen 3mk3/r3s1R1/1psppnp1/p1pn4/1P2NP2/P1PPP1P1/4NS2/R1SKM3 w - - 0 1" 4 593103 > /dev/null
+  expect perft.exp asean startpos 4 273026 > /dev/null
+  expect perft.exp ai-wok startpos 4 485045 > /dev/null
+  expect perft.exp ai-wok "fen 8/8/8/2sp2k1/7p/3P4/6K1/7r w - - 0 1" 5 30055 > /dev/null
+  expect perft.exp sittuyin startpos 3 580096 > /dev/null
+  expect perft.exp sittuyin "fen 8/8/6R1/s3r3/P5R1/1KP3p1/1F2kr2/8[] b - - 0 72" 4 652686 > /dev/null
+  expect perft.exp sittuyin "fen 2r5/6k1/6p1/3s2P1/3npR2/8/p2N2F1/3K4[] w - - 1 50" 4 373984 > /dev/null
+  expect perft.exp sittuyin "fen 8/6s1/5P2/3n4/pR2K2S/1P6/1k4p1/8[] w - - 1 50" 4 268869 > /dev/null
+  expect perft.exp shatranj startpos 4 68122 > /dev/null
+  expect perft.exp amazon startpos 4 318185 > /dev/null
+  expect perft.exp hoppelpoppel startpos 4 202459 > /dev/null
+  expect perft.exp newzealand startpos 4 200310 > /dev/null
+  # alternative goals
   expect perft.exp racingkings startpos 4 296242 > /dev/null
   expect perft.exp racingkings "fen 6r1/2K5/5k2/8/3R4/8/8/8 w - - 0 1" 4 86041 > /dev/null
   expect perft.exp racingkings "fen 6R1/2k5/5K2/8/3r4/8/8/8 b - - 0 1" 4 86009 > /dev/null
+  expect perft.exp racingkings "fen 4brn1/2K2k2/8/8/8/8/8/8 w - - 0 1" 6 265932 > /dev/null
+  expect perft.exp kingofthehill "fen rnb2b1r/ppp2ppp/3k4/8/1PKp1pn1/3Pq3/PBP1P2P/RN1Q1B1R w - - 4 12" 3 19003 > /dev/null
+  expect perft.exp 3check "fen 7r/1p4p1/pk3p2/RN6/8/P5Pp/3p1P1P/4R1K1 w - - 1+3 1 39" 3 12407 > /dev/null
+  expect perft.exp 3check "fen 7r/1p4p1/pk3p2/RN6/8/P5Pp/3p1P1P/4R1K1 w - - 1 39 +2+0" 3 12407 > /dev/null
   expect perft.exp atomic startpos 4 197326 > /dev/null
   expect perft.exp atomic "fen rn2kb1r/1pp1p2p/p2q1pp1/3P4/2P3b1/4PN2/PP3PPP/R2QKB1R b KQkq - 0 1" 4 1434825 > /dev/null
   expect perft.exp atomic "fen rn1qkb1r/p5pp/2p5/3p4/N3P3/5P2/PPP4P/R1BQK3 w Qkq - 0 1" 4 714499 > /dev/null
+  expect perft.exp atomic "fen r4b1r/2kb1N2/p2Bpnp1/8/2Pp3p/1P1PPP2/P5PP/R3K2R b KQ - 0 1" 2 148 > /dev/null
+  expect perft.exp antichess startpos 4 153299 > /dev/null
+  expect perft.exp giveaway startpos 4 153299 > /dev/null
+  expect perft.exp giveaway "fen 8/1p6/8/8/8/8/P7/8 w - - 0 1" 4 3 > /dev/null
+  expect perft.exp giveaway "fen 8/2p5/8/8/8/8/P7/8 w - - 0 1" 12 2557 > /dev/null
+  expect perft.exp codrus startpos 4 153299 > /dev/null
+  expect perft.exp codrus "fen 5bnr/2pp2pp/P4k2/R3Q1P1/8/2N1K3/1P1PP1PP/2B2BNR w - - 1 15" 4 19 > /dev/null
+  expect perft.exp horde startpos 4 23310 > /dev/null
+  expect perft.exp horde "fen 4k3/pp4q1/3P2p1/8/P3PP2/PPP2r2/PPP5/PPPP4 b - - 0 1" 4 56539 > /dev/null
+  expect perft.exp horde "fen k7/5p2/4p2P/3p2P1/2p2P2/1p2P2P/p2P2P1/2P2P2 w - - 0 1" 4 33781 > /dev/null
+  expect perft.exp horde "fen 4k3/7r/8/P7/2p1n2P/3p2P1/1P3P2/PPP1PPP1 w - - 0 1" 4 128809 > /dev/null
+  expect perft.exp horde "fen rnbqkbnr/6p1/2p1Pp1P/P1PPPP2/Pp4PP/1p2PPPP/1P2PPPP/PP1nPPPP b kq a3 0 18" 4 197287 > /dev/null
   expect perft.exp coregal startpos 4 195896 > /dev/null
   expect perft.exp coregal "fen rn2kb1r/ppp1pppp/6q1/8/2PP2b1/5B2/PP3P1P/R1BQK1NR w KQkq - 1 9" 3 20421 > /dev/null
   expect perft.exp coregal "fen 2Q5/3Pq2k/6p1/4Bp1p/5P1P/8/8/K7 w - - 2 72" 4 55970 > /dev/null
   expect perft.exp coregal "fen r3kb1r/1pp1pppp/p1q2n2/3P4/6b1/2N2N2/PPP2PPP/R1BQ1RK1 b kq - 0 9" 4 136511 > /dev/null
-  expect perft.exp knightmate startpos 5 3249033 > /dev/null
-  expect perft.exp losers startpos 5 2723795 > /dev/null
-  expect perft.exp antichess startpos 5 2732672 > /dev/null
-  expect perft.exp giveaway startpos 5 2732672 > /dev/null
-  expect perft.exp asean startpos 5 6223994 > /dev/null
-  expect perft.exp ai-wok startpos 5 13275068 > /dev/null
-  expect perft.exp euroshogi startpos 5 9451149 > /dev/null
+  expect perft.exp knightmate startpos 4 139774 > /dev/null
+  expect perft.exp losers startpos 4 152955 > /dev/null
+  # pockets
+  expect perft.exp crazyhouse startpos 4 197281 > /dev/null
+  expect perft.exp crazyhouse "fen 2k5/8/8/8/8/8/8/4K3[QRBNPqrbnp] w - - 0 1" 2 75353 > /dev/null
+  expect perft.exp crazyhouse "fen 2k5/8/8/8/8/8/8/4K3[Qn] w - - 0 1" 3 88634 > /dev/null
+  expect perft.exp crazyhouse "fen 2k5/8/8/8/8/8/8/4K3/Qn w - - 0 1" 3 88634 > /dev/null
+  expect perft.exp crazyhouse "fen r1bqk2r/pppp1ppp/2n1p3/4P3/1b1Pn3/2NB1N2/PPP2PPP/R1BQK2R[] b KQkq - 0 1" 3 58057 > /dev/null
+  expect perft.exp loop startpos 4 197281 > /dev/null
+  expect perft.exp loop "fen 5R2/2p1Nb2/2B4k/6p1/8/P3PP2/1PPqR3/3R1BKn[QBNPPPPrrrnppp] b - - 1 1" 2 31983 > /dev/null
+  expect perft.exp chessgi startpos 4 197281 > /dev/null
+  expect perft.exp chessgi "fen 5Rp1/2p1Nb2/2B4k/6p1/8/P3PP2/1PPqR3/3R1BKn[QBNPPPPrrrnpp] b - - 1 48" 2 32816 > /dev/null
+  expect perft.exp pocketknight startpos 3 88617 > /dev/null
+  expect perft.exp placement startpos 3 50560 > /dev/null
+  expect perft.exp placement "fen rnbq1bnr/pppppppp/8/8/8/8/PPPPPPPP/QR1BKNN1[BRk] w - - 0 1" 6 17804 > /dev/null
+  expect perft.exp placement "fen 1n1r1q2/pppppppp/8/8/8/8/PPPPPPPP/1N1B1R1N[KQRBkrbbn] b - - 0 4" 5 145152 > /dev/null
+  expect perft.exp seirawan startpos 4 782599 > /dev/null
+  expect perft.exp seirawan "fen reb1k2r/ppppqppp/2nb1n2/4p3/4P3/N1P2N2/PB1PQPPP/RE2KBHR[h] b KQkqc - 3 7" 4 890467 > /dev/null
+  expect perft.exp euroshogi startpos 4 380499 > /dev/null
   expect perft.exp minishogi startpos 5 533203 > /dev/null
   expect perft.exp kyotoshogi startpos 5 225903 > /dev/null
-  expect perft.exp horde startpos 5 265223 > /dev/null
-  expect perft.exp horde "fen 4k3/7r/8/P7/2p1n2P/3p2P1/1P3P2/PPP1PPP1 w - - 0 1" 4 128809 > /dev/null
-  expect perft.exp placement startpos 4 1597696 > /dev/null
-  expect perft.exp sittuyin startpos 3 580096 > /dev/null
-  expect perft.exp sittuyin "fen 8/8/6R1/s3r3/P5R1/1KP3p1/1F2kr2/8[] b - - 0 72" 4 652686 > /dev/null
-  expect perft.exp sittuyin "fen 2r5/6k1/6p1/3s2P1/3npR2/8/p2N2F1/3K4[] w - - 1 50" 4 373984 > /dev/null
-  expect perft.exp sittuyin "fen 8/6s1/5P2/3n4/pR2K2S/1P6/1k4p1/8[] w - - 1 50" 4 268869 > /dev/null
-  expect perft.exp seirawan startpos 5 27639803 > /dev/null
-  expect perft.exp seirawan "fen reb1k2r/ppppqppp/2nb1n2/4p3/4P3/N1P2N2/PB1PQPPP/RE2KBHR[h] b KQkqc - 3 7" 5 31463761 > /dev/null
+  # non-chess
   expect perft.exp ataxx startpos 4 155888 > /dev/null
   expect perft.exp ataxx "fen 7/7/7/7/ppppppp/ppppppp/PPPPPPP[PPPPPPPPPPPPPPPPPPPPPppppppppppppppppppppp] w 0 1" 5 452980 > /dev/null
 fi
 
 # large-board variants
-if [[ $1 == "largeboard" ]]; then
+if [[ $1 == "all" ||  $1 == "largeboard" ]]; then
   expect perft.exp shogi startpos 4 719731 > /dev/null
   expect perft.exp capablanca startpos 4 805128 > /dev/null
   expect perft.exp embassy startpos 4 809539 > /dev/null
@@ -88,9 +117,15 @@ if [[ $1 == "largeboard" ]]; then
   expect perft.exp grand startpos 3 259514 > /dev/null
   expect perft.exp xiangqi startpos 4 3290240 > /dev/null
   expect perft.exp xiangqi "fen 1rbaka2R/5r3/6n2/2p1p1p2/4P1bP1/PpC3Bc1/1nPR2P2/2N2AN2/1c2K1p2/2BAC4 w - - 0 1" 4 4485547 > /dev/null
+  expect perft.exp xiangqi "fen 4kcP1N/8n/3rb4/9/9/9/9/3p1A3/4K4/5CB2 w - - 0 1" 4 92741 > /dev/null
   expect perft.exp janggi startpos 4 1065277 > /dev/null
   expect perft.exp janggi "fen 1n1kaabn1/cr2N4/5C1c1/p1pNp3p/9/9/P1PbP1P1P/3r1p3/4A4/R1BA1KB1R b - - 0 1" 4 76763 > /dev/null
   expect perft.exp janggi "fen 1Pbcka3/3nNn1c1/N2CaC3/1pB6/9/9/5P3/9/4K4/9 w - - 0 23" 4 151202 > /dev/null
+  expect perft.exp jesonmor startpos 3 27960 > /dev/null
+fi
+
+# special variants
+if [[ $1 == "all" ]]; then
   expect perft.exp amazons startpos 1 2176 > /dev/null
 fi