Minor changes

doktoren · doktoren · commit 1f2c8bd8723d · 2012-08-25T18:02:28.000+02:00
diff --git a/src/endgame_database.cxx b/src/endgame_database.cxx
@@ -862,7 +862,12 @@ bool EndgameFunctionality::name_match(string name_pattern) {
   return match;
 }
 
-
+/**
+ * Returns
+ * 0 for an illegal position
+ * 1 for an unreachable position
+ * 2 for a legal position
+ */
 int EndgameFunctionality::legal_position(int player, int table_index) {
   Board2 board;
   vector<PiecePos> piece_list(num_pieces);
diff --git a/src/endgame_simple_construction.cxx b/src/endgame_simple_construction.cxx
@@ -1,3 +1,4 @@
+
 #ifdef ALLOW_5_MEN_ENDGAME
 if (num_pieces == 5) {
   cerr << "################################################################\n"
@@ -37,36 +38,7 @@ for (int player=0; player<(symmetric_endgame ? 1 : 2); player++) {
 
   for (uint i=0; i<table_size; i++) {
     (*decompress_table_index)(i, piece_list);
-
-    //cerr << "decompress_table_index_en_passant: " << decompress_table_index_en_passant << "\n";
-
-    /*
-#include "board_define_position_constants.hxx"
-      bool test = (piece_list[0].pos == a1)  &&  (piece_list[1].pos == a4)  &&
-	(piece_list[2].pos == e1)  &&  (piece_list[3].pos == b4);
-#include "board_undef_position_constan			 int &_castling, int &_en_passant,// use 0, ILLEGAL_POS as default
-			 int _moves_played_since_progress = 0, int full_move_number = 1);ts.hxx"
-      if (test) cerr << "Interesting position: index = " << i << "\n";
-     */
-
     bool legal_position = board.set_board(piece_list, player);
-
-    /* No need to trash unreachable positions in the table.
-	 They are trashed when constructing the bdd instead.
-      if (legal_position  &&  board.unreachable_position()  &&
-     *(endgame_settings->trash_unreachable_positions)) {
-	board.print_board(big_output);
-	legal_position = false;
-      }
-     */
-
-    /*
-      cerr << "index = " << i << ", position = ";
-      for (uint j=0; j<piece_list.size(); j++)
-	cerr << POS_NAME[piece_list[j].pos] << ", ";
-      cerr << "player = " << player << "\n";
-     */
-
     if (legal_position) {
       int status;
       switch (status = board.calc_game_status()) {
@@ -110,15 +82,6 @@ for (int player=0; player<(symmetric_endgame ? 1 : 2); player++) {
     } else {
 
       table[player][i] = ENDGAME_TABLE_ILLEGAL;
-
-      /*
-	if (i==258376) {
-	  cerr << "Illegal position:\n(k1,p1,p2,k2,p3)=(" << POS_NAME[piece_list[0].pos] << ", "
-	  << POS_NAME[piece_list[1].pos] << ", " << POS_NAME[piece_list[2].pos] << ", "
-	  << POS_NAME[piece_list[3].pos] << ", " << POS_NAME[piece_list[4].pos]
-	  << "), player = " << player << "\n";
-	}
-       */
     }
   }
 }
diff --git a/src/run_length_encoding/huffman_codec.hxx b/src/run_length_encoding/huffman_codec.hxx
@@ -13,7 +13,6 @@
 template <class TYPE>
 class HuffTreeNode;
 
-// To do: Pak denne struct ind
 struct WHC {
   WHC() : w(0), h(0), c(0) {}
   WHC(int w, int h, int c) : w(w), h(h), c(c) {}
@@ -25,6 +24,7 @@ template <class TYPE, class ElementStreamer = DefaultElementStreamer<TYPE> >
 class Huffman {
 public:
   Huffman();
+  ~Huffman() { delete tree; }
 
   void init(const vector<pair<TYPE, float> > &distribution, bool makeCanonical = false);
   Huffman(const vector<pair<TYPE, float> > &distribution, bool makeCanonical = false);
@@ -38,8 +38,6 @@ public:
   template<class INPUT_MODEL>
   void init(ibstream<INPUT_MODEL> &in);
 
-  ~Huffman() { delete tree; }
-
   // This description is what is being read by the constructor.
   template<class OUTPUT_MODEL>
   void outputDescription(obstream<OUTPUT_MODEL> &out);
diff --git a/src/run_length_encoding/run_length.hxx b/src/run_length_encoding/run_length.hxx
@@ -4,7 +4,7 @@
 class BinaryRunLengthEncoder {
 public:
   BinaryRunLengthEncoder(obstream *out) : out(out), init(false) {}
-  
+
   void addBit(bool bit) {
     if (!init) {
       init = true;
@@ -22,7 +22,7 @@ public:
       count = 1;
     }
   }
-  
+
   void finalize() {
     if (init) {
       out->writeArbitraryNumber(count);
@@ -52,7 +52,7 @@ public:
     --count;
     return last_bit;
   }
-  
+
 private:
   int count;
   bool last_bit;
