Fix base opening-stats.pl for the new computer game count.

[remoteglot-book] / binloader.cpp

diff --git a/binloader.cpp b/binloader.cpp
index 730f59279eba946af8073826b08cf775564cf994..6467cf8880fb5ca9f988b4baabcf512dae15fa99 100644 (file)
--- a/binloader.cpp
+++ b/binloader.cpp
@@ -49,6 +49,7 @@ struct Element {
        int file_num;
        time_t timestamp;
        long start_position;
+       int computer;
 
        bool operator< (const Element& other) const {
                int s = memcmp_different_len(bpfen, bpfen_len, other.bpfen, other.bpfen_len);
@@ -85,6 +86,7 @@ void write_subshard(const char *basename, ShardData* shard, int bucket)
                } else if (e.result == BLACK) {
                        c.set_black(c.black() + 1);
                }
+               c.set_computer(c.computer() + e.computer);
                if (e.white_elo >= 100 && e.black_elo >= 100) {
                        c.set_sum_white_elo(c.sum_white_elo() + e.white_elo);
                        c.set_sum_black_elo(c.sum_black_elo() + e.black_elo);
@@ -150,76 +152,74 @@ int main(int argc, char **argv)
                        if (bpfen_len == -1) {
                                break;
                        }
-                       assert(bpfen_len <= 32);
-                       if (bpfen_len >= int(sizeof(bpfen))) {
+                       if (bpfen_len <= 0) {
+                               fprintf(stderr, "Underlong BPFEN (%d bytes)\n", bpfen_len);
+                               exit(1);
+                       }
+                       if (bpfen_len >= 32) {
                                fprintf(stderr, "Overlong BPFEN (%d bytes)\n", bpfen_len);
-               //              exit(1);
-                               break;
+                               exit(1);
                        }
                        if (fread(bpfen, bpfen_len, 1, fp) != 1) {
-                               perror("fread()");
-               //              exit(1);
-                               break;
+                               perror("fread(bpfen)");
+                               exit(1);
                        }
 
                        int r = getc(fp);
                        if (r == -1) {
                                perror("getc()");
-                               //exit(1);
-                               break;
+                               exit(1);
                        }
 
                        int opening_num, white_elo, black_elo, file_num;
                        time_t timestamp;
                        long start_position;
                        if (fread(&white_elo, sizeof(white_elo), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(white_elo)");
+                               exit(1);
                        }
                        if (fread(&black_elo, sizeof(black_elo), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(black_elo)");
+                               exit(1);
                        }
                        if (fread(&opening_num, sizeof(opening_num), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(opening_num)");
+                               exit(1);
                        }
                        if (fread(&timestamp, sizeof(timestamp), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(timestamp)");
+                               exit(1);
                        }
                        if (fread(&file_num, sizeof(file_num), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(file_num)");
+                               exit(1);
                        }
                        if (fread(&start_position, sizeof(start_position), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(start_position)");
+                               exit(1);
                        }
 
+                       int computer = getc(fp);
+                       if (computer == -1) {
+                               perror("getc(computer)");
+                               exit(1);
+                       }
 
                        char move[8];
                        int l = getc(fp);
                        if (l == -1) {
+                               perror("getc(move_length)");
                                break;
                        }
                        if (l >= int(sizeof(move))) {
                                fprintf(stderr, "Overlong move (%d bytes)\n", l);
-               //              exit(1);
-                               break;
+                               exit(1);
                        }
                        if (l == 0) {
                                move[0] = 0;
                        } else if (fread(&move[0], l, 1, fp) != 1) {
-                               perror("fread()");
-               //              exit(1);
-                               break;
+                               perror("fread(move)");
+                               exit(1);
                        }
                        move[l] = 0;
 
@@ -229,6 +229,7 @@ int main(int argc, char **argv)
                        e.bpfen_len = bpfen_len;
                        strcpy(e.move, move);
                        e.result = Result(r);
+                       e.computer = computer;
                        e.opening_num = opening_num;
                        e.white_elo = white_elo;
                        e.black_elo = black_elo;