Merge branch 'master' of git://github.com/redpony/cdec

1 files changed, 6 insertions, 22 deletions

diff --git a/klm/search/context.hh b/klm/search/context.hh
index 62163144..08f21bbf 100644
--- a/klm/search/context.hh
+++ b/klm/search/context.hh
@@ -1,30 +1,16 @@
 #ifndef SEARCH_CONTEXT__
 #define SEARCH_CONTEXT__
 
-#include "lm/model.hh"
 #include "search/config.hh"
-#include "search/final.hh"
-#include "search/types.hh"
 #include "search/vertex.hh"
-#include "util/exception.hh"
-#include "util/pool.hh"
 
 #include <boost/pool/object_pool.hpp>
-#include <boost/ptr_container/ptr_vector.hpp>
-
-#include <vector>
 
 namespace search {
 
-class Weights;
-
 class ContextBase {
   public:
-    explicit ContextBase(const Config &config) : pop_limit_(config.PopLimit()), weights_(config.GetWeights()) {}
-
-    util::Pool &FinalPool() {
-      return final_pool_;
-    }
+    explicit ContextBase(const Config &config) : config_(config) {}
 
     VertexNode *NewVertexNode() {
       VertexNode *ret = vertex_node_pool_.construct();
@@ -36,18 +22,16 @@ class ContextBase {
       vertex_node_pool_.destroy(node);
     }
 
-    unsigned int PopLimit() const { return pop_limit_; }
+    unsigned int PopLimit() const { return config_.PopLimit(); }
 
-    const Weights &GetWeights() const { return weights_; }
+    Score LMWeight() const { return config_.LMWeight(); }
 
-  private:
-    util::Pool final_pool_;
+    const Config &GetConfig() const { return config_; }
 
+  private:
     boost::object_pool<VertexNode> vertex_node_pool_;
 
-    unsigned int pop_limit_;
-
-    const Weights &weights_;
+    Config config_;
 };
 
 template <class Model> class Context : public ContextBase {