Make the binary output include the final position.

[pgn-extract] / output.c

diff --git a/output.c b/output.c
index bb9ee772c58f1fca6323ebca8241e04cfa3a97d6..9c57e3195f1678ddf9db3e5f3421cd19b26c6597 100644 (file)
--- a/output.c
+++ b/output.c
@@ -36,6 +36,7 @@
 #include "output.h"
 #include "mymalloc.h"
 #include "eco.h"
+#include "farmhash-c.h"
 
 
             /* Functions for outputting games in the required format. */
@@ -65,7 +66,8 @@ static void print_algebraic_game(Game current_game,FILE *outputfile,
                            unsigned move_number,Boolean white_to_move,
                            Board *final_board);
 static void output_sesse_bin_game(Game current_game,FILE *outputfile,
-                                  unsigned move_number,Boolean white_to_move);
+                                  unsigned move_number,Boolean white_to_move,
+                                  Board *final_board);
 static void print_epd_game(Game current_game,FILE *outputfile,
                            unsigned move_number,Boolean white_to_move,
                            Board *final_board);
@@ -1005,7 +1007,8 @@ output_game(Game current_game,FILE *outputfile)
                output_cm_game(outputfile,move_number,white_to_move,current_game);
                break;
            case SESSE_BIN:
-               output_sesse_bin_game(current_game,outputfile,move_number,white_to_move);
+               output_sesse_bin_game(current_game,outputfile,move_number,white_to_move,
+                                      final_board);
                break;
            default:
                fprintf(GlobalState.logfile,
@@ -1169,7 +1172,8 @@ print_algebraic_game(Game current_game,FILE *outputfile,
 
 static void
 output_sesse_bin_game(Game current_game,FILE *outputfile,
-                      unsigned move_number,Boolean white_to_move)
+                      unsigned move_number,Boolean white_to_move,
+                      Board* final_board)
 {
     const char *result = NULL;
     Move *move;
@@ -1231,12 +1235,16 @@ output_sesse_bin_game(Game current_game,FILE *outputfile,
         timestamp = 32503680000;
     }
 
+    uint16_t prev_board_hash = 0;
+    unsigned int opening;
+
     for (move = current_game.moves; move != NULL; move = move->next) {
-        unsigned int opening = move->eco ? move->eco->cumulative_hash_value : 0;  // Truncate to 32 bits.
+        opening = move->eco ? move->eco->cumulative_hash_value : 0;  // Truncate to 32 bits.
 
         // key
-        putc(move->bpfen_len, outputfile);
+        putc(move->bpfen_len + sizeof(prev_board_hash), outputfile);
         fwrite(move->bpfen, move->bpfen_len, 1, outputfile);
+        fwrite(&prev_board_hash, sizeof(prev_board_hash), 1, outputfile);
 
         // value
         putc(result_int, outputfile);
@@ -1248,7 +1256,31 @@ output_sesse_bin_game(Game current_game,FILE *outputfile,
         fwrite(&start_position, sizeof(start_position), 1, outputfile);
         putc(strlen((char *)move->move), outputfile);
         fwrite(move->move, strlen((char *)move->move), 1, outputfile);
+
+        prev_board_hash = farmhash_32(move->bpfen, move->bpfen_len);
     }
+
+    // Final position.
+    char *bpfen;
+    int bpfen_len;
+    build_BPFEN_string(final_board, &bpfen, &bpfen_len);
+
+    // key
+    putc(bpfen_len + sizeof(prev_board_hash), outputfile);
+    fwrite(bpfen, bpfen_len, 1, outputfile);
+    fwrite(&prev_board_hash, sizeof(prev_board_hash), 1, outputfile);
+
+    // value
+    putc(result_int, outputfile);
+    fwrite(&white_elo, sizeof(white_elo), 1, outputfile);
+    fwrite(&black_elo, sizeof(black_elo), 1, outputfile);
+    fwrite(&opening, sizeof(opening), 1, outputfile);  // Not perfect, but should be OK.
+    fwrite(&timestamp, sizeof(timestamp), 1, outputfile);
+    fwrite(&file_num, sizeof(file_num), 1, outputfile);
+    fwrite(&start_position, sizeof(start_position), 1, outputfile);
+    putc(0, outputfile);  // No move.
+
+    free(bpfen);
 }
 
 static void