Update search, make it compile

1 files changed, 19 insertions, 22 deletions

diff --git a/klm/search/final.hh b/klm/search/final.hh
index 1b3092ac..50e62cf2 100644
--- a/klm/search/final.hh
+++ b/klm/search/final.hh
@@ -1,37 +1,34 @@
 #ifndef SEARCH_FINAL__
 #define SEARCH_FINAL__
 
-#include "search/arity.hh"
-#include "search/note.hh"
-#include "search/types.hh"
-
-#include <boost/array.hpp>
+#include "search/header.hh"
+#include "util/pool.hh"
 
 namespace search {
 
-class Final {
+// A full hypothesis with pointers to children.
+class Final : public Header {
   public:
-    typedef boost::array<const Final*, search::kMaxArity> ChildArray;
+    Final() {}
 
-    void Reset(Score bound, Note note, const Final &left, const Final &right) {
-      bound_ = bound;
-      note_ = note;
-      children_[0] = &left;
-      children_[1] = &right;
+    Final(util::Pool &pool, Score score, Arity arity, Note note) 
+      : Header(pool.Allocate(Size(arity)), arity) {
+      SetScore(score);
+      SetNote(note);
     }
 
-    const ChildArray &Children() const { return children_; }
-
-    Note GetNote() const { return note_; }
-
-    Score Bound() const { return bound_; }
+    // These are arrays of length GetArity().
+    Final *Children() {
+      return reinterpret_cast<Final*>(After());
+    }
+    const Final *Children() const {
+      return reinterpret_cast<const Final*>(After());
+    }
 
   private:
-    Score bound_;
-
-    Note note_;
-
-    ChildArray children_;
+    static std::size_t Size(Arity arity) {
+      return kHeaderSize + arity * sizeof(const Final);
+    }
 };
 
 } // namespace search