Updated incremental, updated kenlm. Incremental assumes <s>

1 files changed, 19 insertions, 6 deletions

diff --git a/klm/search/config.hh b/klm/search/config.hh
index ef8e2354..ba18c09e 100644
--- a/klm/search/config.hh
+++ b/klm/search/config.hh
@@ -1,23 +1,36 @@
 #ifndef SEARCH_CONFIG__
 #define SEARCH_CONFIG__
 
-#include "search/weights.hh"
-#include "util/string_piece.hh"
+#include "search/types.hh"
 
 namespace search {
 
+struct NBestConfig {
+  explicit NBestConfig(unsigned int in_size) {
+    keep = in_size;
+    size = in_size;
+  }
+  
+  unsigned int keep, size;
+};
+
 class Config {
   public:
-    Config(const Weights &weights, unsigned int pop_limit) :
-      weights_(weights), pop_limit_(pop_limit) {}
+    Config(Score lm_weight, unsigned int pop_limit, const NBestConfig &nbest) :
+      lm_weight_(lm_weight), pop_limit_(pop_limit), nbest_(nbest) {}
 
-    const Weights &GetWeights() const { return weights_; }
+    Score LMWeight() const { return lm_weight_; }
 
     unsigned int PopLimit() const { return pop_limit_; }
 
+    const NBestConfig &GetNBest() const { return nbest_; }
+
   private:
-    Weights weights_;
+    Score lm_weight_;
+
     unsigned int pop_limit_;
+
+    NBestConfig nbest_;
 };
 
 } // namespace search