Store sum and number of Elo values instead of averages, for easier merging.

diff --git a/book/binloader.cpp b/book/binloader.cpp
index e4b40a6f59a6c0d2ac028f6f0cd69422c5ee1cfd..88fb5ff8d17e95518ffcc570e02cf72d2e756393 100644 (file)
--- a/book/binloader.cpp
+++ b/book/binloader.cpp
@@ -82,8 +82,6 @@ int main(int argc, char **argv)
        printf("Writing SSTable...\n");
        mtbl_writer* mtbl = mtbl_writer_init("open.mtbl", NULL);
        Count c;
        printf("Writing SSTable...\n");
        mtbl_writer* mtbl = mtbl_writer_init("open.mtbl", NULL);
        Count c;

-       int num_elo = 0;
-       double sum_white_elo = 0.0, sum_black_elo = 0.0;

        for (int i = 0; i < elems.size(); ++i) {
                if (elems[i].result == WHITE) {
                        ++c.white;
        for (int i = 0; i < elems.size(); ++i) {
                if (elems[i].result == WHITE) {
                        ++c.white;


@@ -94,19 +92,15 @@ int main(int argc, char **argv)
                }
                c.opening_num = elems[i].opening_num;
                if (elems[i].white_elo >= 100 && elems[i].black_elo >= 100) {
                }
                c.opening_num = elems[i].opening_num;
                if (elems[i].white_elo >= 100 && elems[i].black_elo >= 100) {

-                       sum_white_elo += elems[i].white_elo;
-                       sum_black_elo += elems[i].black_elo;
-                       ++num_elo;
+                       c.sum_white_elo += elems[i].white_elo;
+                       c.sum_black_elo += elems[i].black_elo;
+                       ++c.num_elo;

                }
                if (i == elems.size() - 1 || elems[i].bpfen_and_move != elems[i + 1].bpfen_and_move) {
                }
                if (i == elems.size() - 1 || elems[i].bpfen_and_move != elems[i + 1].bpfen_and_move) {

-                       c.avg_white_elo = sum_white_elo / num_elo;
-                       c.avg_black_elo = sum_black_elo / num_elo;

                        mtbl_writer_add(mtbl,
                                (const uint8_t *)elems[i].bpfen_and_move.data(), elems[i].bpfen_and_move.size(),
                                (const uint8_t *)&c, sizeof(c));
                        c = Count();
                        mtbl_writer_add(mtbl,
                                (const uint8_t *)elems[i].bpfen_and_move.data(), elems[i].bpfen_and_move.size(),
                                (const uint8_t *)&c, sizeof(c));
                        c = Count();

-                       num_elo = 0;
-                       sum_white_elo = sum_black_elo = 0.0;

                }
        }
        mtbl_writer_destroy(&mtbl);
                }
        }
        mtbl_writer_destroy(&mtbl);

diff --git a/book/binlookup.cpp b/book/binlookup.cpp
index 5ed372d851ff2cd1bcaf8c46013710ac9602d113..363e8dc5e8dbe2c8b4e46bce3ebf8dec8085367d 100644 (file)
--- a/book/binlookup.cpp
+++ b/book/binlookup.cpp
@@ -36,6 +36,9 @@ int main(int argc, char **argv)
        while (mtbl_iter_next(it, &key, &len_key, &val, &len_val)) {
                string move((char *)(key + prefix_len), len_key - prefix_len);
                const Count* c = (Count *)val;
        while (mtbl_iter_next(it, &key, &len_key, &val, &len_val)) {
                string move((char *)(key + prefix_len), len_key - prefix_len);
                const Count* c = (Count *)val;

-               printf("%s %d %d %d %d %f %f\n", move.c_str(), c->white, c->draw, c->black, c->opening_num, c->avg_white_elo, c->avg_black_elo);
+               printf("%s %d %d %d %d %f %f\n", move.c_str(),
+                       c->white, c->draw, c->black, c->opening_num,
+                       float(c->sum_white_elo) / c->num_elo,
+                       float(c->sum_black_elo) / c->num_elo);

        }
 }
        }
 }

diff --git a/book/count.h b/book/count.h
index 1d8043f9e0fb67b4391c1441532190eac7cd8870..3024b8981f748a4953bbd9afe03716646228dd61 100644 (file)
--- a/book/count.h
+++ b/book/count.h
@@ -4,6 +4,7 @@ struct Count {
        int draw = 0;
        int black = 0;
        int opening_num = -1;
        int draw = 0;
        int black = 0;
        int opening_num = -1;

-       float avg_white_elo = 0.0;
-       float avg_black_elo = 0.0;
+       unsigned long long sum_white_elo = 0;
+       unsigned long long sum_black_elo = 0;
+       int num_elo = 0;

 };
 };