#include <utility>
#include <memory>
#include <string>
+#include <unordered_set>
#include <string.h>
#include "count.pb.h"
#include "hash.h"
enum Result { WHITE = 0, DRAW, BLACK };
struct Element {
- string bpfen_and_move;
+ string bpfen;
+ string move;
Result result;
int opening_num, white_elo, black_elo;
time_t timestamp;
bool operator< (const Element& other) const {
- return bpfen_and_move < other.bpfen_and_move;
+ return bpfen < other.bpfen;
}
};
break;
}
- string bpfen_and_move;
- bpfen_and_move.resize(l);
- if (fread(&bpfen_and_move[0], l, 1, fp) != 1) {
+ string bpfen;
+ bpfen.resize(l);
+ if (fread(&bpfen[0], l, 1, fp) != 1) {
perror("fread()");
// exit(1);
break;
break;
}
- int bucket = hash_key_to_bucket(bpfen_and_move.data(), bpfen_and_move.size(), num_buckets);
- elems[bucket].emplace_back(Element {move(bpfen_and_move), Result(r), opening_num, white_elo, black_elo, timestamp});
+ l = getc(fp);
+ if (l == -1) {
+ break;
+ }
+ string move;
+ move.resize(l);
+ if (fread(&move[0], l, 1, fp) != 1) {
+ perror("fread()");
+ // exit(1);
+ break;
+ }
+
+ int bucket = hash_key_to_bucket(bpfen.data(), bpfen.size(), num_buckets);
+ elems[bucket].emplace_back(Element {std::move(bpfen), std::move(move), Result(r), opening_num, white_elo, black_elo, timestamp});
++num_elems;
}
fclose(fp);
mtbl_writer_options_set_compression(wopt, MTBL_COMPRESSION_SNAPPY);
mtbl_writer* mtbl = mtbl_writer_init(filename, wopt);
Count c;
+ unordered_set<string> moves;
for (size_t j = 0; j < elems[i].size(); ++j) {
const Element &e = elems[i][j];
if (e.result == WHITE) {
}
c.set_opening_num(e.opening_num);
}
- if (j == elems[i].size() - 1 || e.bpfen_and_move != elems[i][j + 1].bpfen_and_move) {
+ if (!moves.count(e.move)) {
+ moves.insert(e.move);
+ c.add_move(e.move);
+ }
+ if (j == elems[i].size() - 1 || e.bpfen != elems[i][j + 1].bpfen) {
c.SerializeToString(&buf);
mtbl_writer_add(mtbl,
- (const uint8_t *)e.bpfen_and_move.data(), e.bpfen_and_move.size(),
+ (const uint8_t *)e.bpfen.data(), e.bpfen.size(),
(const uint8_t *)buf.data(), buf.size());
c = Count();
+ moves.clear();
}
}
mtbl_writer_destroy(&mtbl);