- KPKMaterialKey = Position::zobMaterial[WHITE][PAWN][1];
- KKPMaterialKey = Position::zobMaterial[BLACK][PAWN][1];
- KBNKMaterialKey =
- Position::zobMaterial[WHITE][BISHOP][1] ^
- Position::zobMaterial[WHITE][KNIGHT][1];
- KKBNMaterialKey =
- Position::zobMaterial[BLACK][BISHOP][1] ^
- Position::zobMaterial[BLACK][KNIGHT][1];
- KRKPMaterialKey =
- Position::zobMaterial[WHITE][ROOK][1] ^
- Position::zobMaterial[BLACK][PAWN][1];
- KPKRMaterialKey =
- Position::zobMaterial[WHITE][PAWN][1] ^
- Position::zobMaterial[BLACK][ROOK][1];
- KRKBMaterialKey =
- Position::zobMaterial[WHITE][ROOK][1] ^
- Position::zobMaterial[BLACK][BISHOP][1];
- KBKRMaterialKey =
- Position::zobMaterial[WHITE][BISHOP][1] ^
- Position::zobMaterial[BLACK][ROOK][1];
- KRKNMaterialKey =
- Position::zobMaterial[WHITE][ROOK][1] ^
- Position::zobMaterial[BLACK][KNIGHT][1];
- KNKRMaterialKey =
- Position::zobMaterial[WHITE][KNIGHT][1] ^
- Position::zobMaterial[BLACK][ROOK][1];
- KQKRMaterialKey =
- Position::zobMaterial[WHITE][QUEEN][1] ^
- Position::zobMaterial[BLACK][ROOK][1];
- KRKQMaterialKey =
- Position::zobMaterial[WHITE][ROOK][1] ^
- Position::zobMaterial[BLACK][QUEEN][1];
- KRPKRMaterialKey =
- Position::zobMaterial[WHITE][ROOK][1] ^
- Position::zobMaterial[WHITE][PAWN][1] ^
- Position::zobMaterial[BLACK][ROOK][1];
- KRKRPMaterialKey =
- Position::zobMaterial[WHITE][ROOK][1] ^
- Position::zobMaterial[BLACK][ROOK][1] ^
- Position::zobMaterial[BLACK][PAWN][1];
- KRPPKRPMaterialKey =
- Position::zobMaterial[WHITE][ROOK][1] ^
- Position::zobMaterial[WHITE][PAWN][1] ^
- Position::zobMaterial[WHITE][PAWN][2] ^
- Position::zobMaterial[BLACK][ROOK][1] ^
- Position::zobMaterial[BLACK][PAWN][1];
- KRPKRPPMaterialKey =
- Position::zobMaterial[WHITE][ROOK][1] ^
- Position::zobMaterial[WHITE][PAWN][1] ^
- Position::zobMaterial[BLACK][ROOK][1] ^
- Position::zobMaterial[BLACK][PAWN][1] ^
- Position::zobMaterial[BLACK][PAWN][2];
- KNNKMaterialKey =
- Position::zobMaterial[WHITE][KNIGHT][1] ^
- Position::zobMaterial[WHITE][KNIGHT][2];
- KKNNMaterialKey =
- Position::zobMaterial[BLACK][KNIGHT][1] ^
- Position::zobMaterial[BLACK][KNIGHT][2];
- KBPKBMaterialKey =
- Position::zobMaterial[WHITE][BISHOP][1] ^
- Position::zobMaterial[WHITE][PAWN][1] ^
- Position::zobMaterial[BLACK][BISHOP][1];
- KBKBPMaterialKey =
- Position::zobMaterial[WHITE][BISHOP][1] ^
- Position::zobMaterial[BLACK][BISHOP][1] ^
- Position::zobMaterial[BLACK][PAWN][1];
- KBPKNMaterialKey =
- Position::zobMaterial[WHITE][BISHOP][1] ^
- Position::zobMaterial[WHITE][PAWN][1] ^
- Position::zobMaterial[BLACK][KNIGHT][1];
- KNKBPMaterialKey =
- Position::zobMaterial[WHITE][KNIGHT][1] ^
- Position::zobMaterial[BLACK][BISHOP][1] ^
- Position::zobMaterial[BLACK][PAWN][1];
- KNPKMaterialKey =
- Position::zobMaterial[WHITE][KNIGHT][1] ^
- Position::zobMaterial[WHITE][PAWN][1];
- KKNPMaterialKey =
- Position::zobMaterial[BLACK][KNIGHT][1] ^
- Position::zobMaterial[BLACK][PAWN][1];
- KPKPMaterialKey =
- Position::zobMaterial[WHITE][PAWN][1] ^
- Position::zobMaterial[BLACK][PAWN][1];
+
+ // Initialize std::map access locks
+ lock_init(&EEFmapLock, NULL);
+ lock_init(&ESFmapLock, NULL);
+
+ typedef Key ZM[2][8][16];
+ const ZM& z = Position::zobMaterial;
+
+ static const Color W = WHITE;
+ static const Color B = BLACK;
+
+ KNNKMaterialKey = z[W][KNIGHT][1] ^ z[W][KNIGHT][2];
+ KKNNMaterialKey = z[B][KNIGHT][1] ^ z[B][KNIGHT][2];
+
+ add(z[W][PAWN][1], &EvaluateKPK);
+ add(z[B][PAWN][1], &EvaluateKKP);
+
+ add(z[W][BISHOP][1] ^ z[W][KNIGHT][1], &EvaluateKBNK);
+ add(z[B][BISHOP][1] ^ z[B][KNIGHT][1], &EvaluateKKBN);
+ add(z[W][ROOK][1] ^ z[B][PAWN][1], &EvaluateKRKP);
+ add(z[W][PAWN][1] ^ z[B][ROOK][1], &EvaluateKPKR);
+ add(z[W][ROOK][1] ^ z[B][BISHOP][1], &EvaluateKRKB);
+ add(z[W][BISHOP][1] ^ z[B][ROOK][1], &EvaluateKBKR);
+ add(z[W][ROOK][1] ^ z[B][KNIGHT][1], &EvaluateKRKN);
+ add(z[W][KNIGHT][1] ^ z[B][ROOK][1], &EvaluateKNKR);
+ add(z[W][QUEEN][1] ^ z[B][ROOK][1], &EvaluateKQKR);
+ add(z[W][ROOK][1] ^ z[B][QUEEN][1], &EvaluateKRKQ);
+
+ add(z[W][KNIGHT][1] ^ z[W][PAWN][1], W, &ScaleKNPK);
+ add(z[B][KNIGHT][1] ^ z[B][PAWN][1], B, &ScaleKKNP);
+
+ add(z[W][ROOK][1] ^ z[W][PAWN][1] ^ z[B][ROOK][1] , W, &ScaleKRPKR);
+ add(z[W][ROOK][1] ^ z[B][ROOK][1] ^ z[B][PAWN][1] , B, &ScaleKRKRP);
+ add(z[W][BISHOP][1] ^ z[W][PAWN][1] ^ z[B][BISHOP][1], W, &ScaleKBPKB);
+ add(z[W][BISHOP][1] ^ z[B][BISHOP][1] ^ z[B][PAWN][1] , B, &ScaleKBKBP);
+ add(z[W][BISHOP][1] ^ z[W][PAWN][1] ^ z[B][KNIGHT][1], W, &ScaleKBPKN);
+ add(z[W][KNIGHT][1] ^ z[B][BISHOP][1] ^ z[B][PAWN][1] , B, &ScaleKNKBP);
+
+ add(z[W][ROOK][1] ^ z[W][PAWN][1] ^ z[W][PAWN][2] ^ z[B][ROOK][1] ^ z[B][PAWN][1], W, &ScaleKRPPKRP);
+ add(z[W][ROOK][1] ^ z[W][PAWN][1] ^ z[B][ROOK][1] ^ z[B][PAWN][1] ^ z[B][PAWN][2], B, &ScaleKRPKRPP);