summaryrefslogtreecommitdiff
path: root/klm/search/final.hh
diff options
context:
space:
mode:
authorKenneth Heafield <github@kheafield.com>2012-10-14 10:46:34 +0100
committerKenneth Heafield <github@kheafield.com>2012-10-14 10:46:34 +0100
commitf568b392f82fd94b788a1b38094855234d318205 (patch)
tree37c09a6c2a006afd719e04009b0908117960354a /klm/search/final.hh
parentb7005385f267596436dd07b1a9e798023ef1c30a (diff)
Update to faster but less cute search
Diffstat (limited to 'klm/search/final.hh')
-rw-r--r--klm/search/final.hh11
1 files changed, 5 insertions, 6 deletions
diff --git a/klm/search/final.hh b/klm/search/final.hh
index 823b8c1a..1b3092ac 100644
--- a/klm/search/final.hh
+++ b/klm/search/final.hh
@@ -2,35 +2,34 @@
#define SEARCH_FINAL__
#include "search/arity.hh"
+#include "search/note.hh"
#include "search/types.hh"
#include <boost/array.hpp>
namespace search {
-class Edge;
-
class Final {
public:
typedef boost::array<const Final*, search::kMaxArity> ChildArray;
- void Reset(Score bound, const Edge &from, const Final &left, const Final &right) {
+ void Reset(Score bound, Note note, const Final &left, const Final &right) {
bound_ = bound;
- from_ = &from;
+ note_ = note;
children_[0] = &left;
children_[1] = &right;
}
const ChildArray &Children() const { return children_; }
- const Edge &From() const { return *from_; }
+ Note GetNote() const { return note_; }
Score Bound() const { return bound_; }
private:
Score bound_;
- const Edge *from_;
+ Note note_;
ChildArray children_;
};