X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=b9055a64d30616ff945bed8fd59c500ab8eeb62c;hp=abbbd983a7127abf317ef1c61916d2038db70c76;hb=1d367f9b154a9d669178e2a425aaf99f57f4cc41;hpb=b827590935f10fd11c664e513f4daf94c52cce2a diff --git a/remoteglot.pl b/remoteglot.pl index abbbd98..b9055a6 100755 --- a/remoteglot.pl +++ b/remoteglot.pl @@ -480,8 +480,6 @@ sub parse_infos { } } - my $prev_depth = $info->{'depth1'} // $info->{'depth'}; - while (scalar @x > 0) { if ($x[0] eq 'multipv') { # Dealt with above @@ -536,22 +534,6 @@ sub parse_infos { die "Unknown info '" . join(',', @x) . "'"; } - - my $now_depth = $info->{'depth1'} // $info->{'depth'}; - if (defined($prev_depth) && POSIX::floor($now_depth / 10) > POSIX::floor($prev_depth / 10)) { - my $d = POSIX::floor($now_depth / 10) * 10; # In case we skipped some. - complete_using_tbprobe($pos_calculating, $info, exists($info->{'depth1'}) ? '1' : ''); - my $cp = $info->{'score_cp1'} // $info->{'score_cp'}; - my $mate = $info->{'score_mate1'} // $info->{'score_mate'}; - my $splicepos = $info->{'splicepos1'} // $info->{'splicepos'}; - my $bestmove; - if (defined($info->{'pv1'})) { # Avoid autovivification. - $bestmove = $info->{'pv1'}[0]; - } else { - $bestmove = $info->{'pv'}[0]; - } - push @{$info->{'lowdepth'}}, [ $d, $cp, $mate, $splicepos, $bestmove ]; - } } sub parse_ids { @@ -962,15 +944,6 @@ sub output_json { $json->{'tablebase'} = $info->{'tablebase'}; $json->{'pv'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ]; - $json->{'lowdepth'} = {}; - if (exists($info->{'lowdepth'})) { - for my $ld (@{$info->{'lowdepth'}}) { - my $score = score_digest_inner($ld->[1], $ld->[2], $ld->[3], 0, $pos_calculating); - push @$score, prettyprint_pv($pos_calculating, $ld->[4]); - $json->{'lowdepth'}{$ld->[0]} = $score; - } - } - my %refutation_lines = (); my @refutation_lines = (); if (defined($engine2)) { @@ -1199,21 +1172,14 @@ sub short_score { # (with side-to-play information) score_sort_key. sub score_digest { my ($info, $pos, $mpv) = @_; - return score_digest_inner( - $info->{'score_cp' . $mpv}, - $info->{'score_mate' . $mpv}, - $info->{'splicepos' . $mpv}, - $info->{'tablebase'}, - $pos); -} -sub score_digest_inner { - my ($score, $mate, $sp, $tablebase, $pos) = @_; - if (defined($mate)) { + if (defined($info->{'score_mate' . $mpv})) { + my $mate = $info->{'score_mate' . $mpv}; if ($pos->{'toplay'} eq 'B') { $mate = -$mate; } - if (defined($sp)) { + if (exists($info->{'splicepos' . $mpv})) { + my $sp = $info->{'splicepos' . $mpv}; if ($mate > 0) { return ['T', $sp]; } else { @@ -1231,11 +1197,12 @@ sub score_digest_inner { } } } else { - if (defined($score)) { + if (exists($info->{'score_cp' . $mpv})) { + my $score = $info->{'score_cp' . $mpv}; if ($pos->{'toplay'} eq 'B') { $score = -$score; } - if ($score == 0 && $tablebase) { + if ($score == 0 && $info->{'tablebase'}) { return ['d', undef]; } else { return ['cp', int($score)];