voroskoi/pistike - Change 75BIO4XKTLVWVHPXEJ6V45DEP7CFWFFRFF4NAOPQN2MESJG6HUWQC

Put move scoring back to search, add PV following

Created by voroskoi on January 23, 2023

75BIO4XKTLVWVHPXEJ6V45DEP7CFWFFRFF4NAOPQN2MESJG6HUWQC

Dependencies

In channels

main

Change contents

Insertion in src/search.zig at line 28 [4.35]
[2.315]
[3.195]
```
var pv_follow: bool = false;
```
Replacement in src/search.zig at line 51 [4.35]
B:BD[2.951] → [2.951:986]
```
        nodes = 0; // TODO: remove
```
[2.951]
[5.184]
```
        pv_follow = true;
```

Deletion in src/search.zig at line 60 [4.35]

∅:D[5.607] → [3.555:561]

∅:D[2.1235] → [3.555:561]

B:BD[3.555] → [3.555:561]

∅:D[5.634] → [3.561:562]

B:BD[3.561] → [3.561:562]

B:BD[3.562] → [2.1236:1791]

    }
    // TO BE REMOVED BELOW THIS LINE...
    // ---------------------------------------------------- //
    // clear helper data for search
    {
        score.killer_moves = [_][MAX_PLY]BitMove{
            [_]BitMove{@bitCast(BitMove, @as(BitMoveType, 0))} ** MAX_PLY,
        } ** 2;
        score.history_moves = [_][64]usize{[_]usize{0} ** 64} ** 12;
        pv_length = [_]usize{0} ** MAX_PLY;
        pv_table = [_][MAX_PLY]BitMove{
            [_]BitMove{@bitCast(BitMove, @as(BitMoveType, 0))} ** MAX_PLY,
        } ** MAX_PLY;
        nodes = 0;

Deletion in src/search.zig at line 61 [4.35]
∅:D[5.926] → [3.594:595]
∅:D[2.1797] → [3.594:595]
B:BD[3.594] → [3.594:595]
B:BD[3.595] → [2.1798:1894]
```
    const scr = try negamax(gs, ALPHA, BETA, depth);
    try print_info(gs, scr, depth, true);
```

Insertion in src/search.zig at line 92 [4.35]

[4.1951]

[6.150]

    score.moves(gs, &ml);
    // Honor following the PV line
    if (pv_follow) {
        pv_follow = false;
        for (ml.slice()) |*mp| {
            if (@bitCast(BitMoveType, pv_table[0][gs.ply]) == @bitCast(BitMoveType, mp.move)) {
                pv_follow = true;
                mp.score = score.PV_SCORE;
                break;
            }
        }
    }

Insertion in src/search.zig at line 201 [4.35]
[4.3786]
[6.289]
```
    score.moves(gs, &ml);
```
Insertion in src/score.zig at line 8 [3.2114]
[2.3184]
[3.2381]
```
const MoveList = @import("Board.zig").MoveList;
```
Insertion in src/score.zig at line 14 [3.2114]
[3.2533]
[3.2533]
```
// PV value score
pub const PV_SCORE = 20_000;
```

Replacement in src/score.zig at line 24 [3.2114]

∅:D[2.3428] → [3.2534:2591]

B:BD[3.2534] → [3.2534:2591]

pub fn Move(gs: *const GameState, move: BitMove) isize {

[2.3428]

[3.2591]

pub fn moves(gs: *const GameState, ml: *MoveList) void {
    for (ml.slice()) |*mp| {
        mp.score = scoreMove(gs, mp.move);
    }
}
fn scoreMove(gs: *const GameState, move: BitMove) isize {

Deletion in src/Board.zig at line 7 [8.16071]
B:BD[7.35371] → [3.5629:5665]
```
const score = @import("score.zig");
```
Replacement in src/Board.zig at line 107 [8.16071]
B:BD[9.2707] → [9.2707:2725]
```
    score: isize,
```
[9.2707]
[9.2725]
```
    score: isize = undefined,
```

Replacement in src/Board.zig at line 516 [8.16071]

B:BD[9.3313] → [3.5923:6021]

                        try ml.append(MovePrio{ .move = move, .score = score.Move(self, move) });

[9.3313]

[8.32838]

                        try ml.append(MovePrio{ .move = move });

Replacement in src/Board.zig at line 526 [8.16071]

B:BD[9.3692] → [3.6067:6158]

                        try ml.append(.{ .move = move, .score = score.Move(self, move) });

[9.3692]

[9.3778]

                        try ml.append(.{ .move = move });

Replacement in src/Board.zig at line 541 [8.16071]

B:BD[9.3875] → [3.6200:6291]

                        try ml.append(.{ .move = move, .score = score.Move(self, move) });

[9.3875]

[8.33794]

                        try ml.append(.{ .move = move });

Replacement in src/Board.zig at line 562 [8.16071]

B:BD[9.4036] → [3.6292:6383]

                        try ml.append(.{ .move = move, .score = score.Move(self, move) });

[9.4036]

[8.34600]

                        try ml.append(.{ .move = move });

Replacement in src/Board.zig at line 571 [8.16071]

B:BD[9.4189] → [3.6384:6471]

                    try ml.append(.{ .move = move, .score = score.Move(self, move) });

[9.4189]

[8.34941]

                    try ml.append(.{ .move = move });

Replacement in src/Board.zig at line 592 [8.16071]

B:BD[9.4338] → [3.6472:6559]

                    try ml.append(.{ .move = move, .score = score.Move(self, move) });

[9.4338]

[8.35780]

                    try ml.append(.{ .move = move });

Replacement in src/Board.zig at line 636 [8.16071]

B:BD[9.4487] → [3.6560:6647]

                    try ml.append(.{ .move = move, .score = score.Move(self, move) });

[9.4487]

[8.37280]

                    try ml.append(.{ .move = move });

Replacement in src/Board.zig at line 675 [8.16071]

B:BD[9.4636] → [3.6648:6735]

                    try ml.append(.{ .move = move, .score = score.Move(self, move) });

[9.4636]

[8.38633]

                    try ml.append(.{ .move = move });

Replacement in src/Board.zig at line 712 [8.16071]

B:BD[9.4785] → [3.6736:6823]

                    try ml.append(.{ .move = move, .score = score.Move(self, move) });

[9.4785]

[8.40419]

                    try ml.append(.{ .move = move });

Replacement in src/Board.zig at line 719 [8.16071]

B:BD[9.4934] → [3.6824:6911]

                    try ml.append(.{ .move = move, .score = score.Move(self, move) });

[9.4934]

[8.40697]

                    try ml.append(.{ .move = move });

Put move scoring back to search, add PV following

Dependencies

In channels

Change contents

Insertion in src/search.zig at line 28 [4.35]

Replacement in src/search.zig at line 51 [4.35]

Deletion in src/search.zig at line 60 [4.35]

Deletion in src/search.zig at line 61 [4.35]