refactoring

Author: nokuno

TODO

@@ -1 +1,4 @@
 N-best output
+online model interpolation
+support multiple tables
+benchmark script

src/decoder.cpp

@@ -2,8 +2,7 @@
 
 namespace jsc {
 
-Decoder::Decoder()
-    : model_(Model::GetModel()) {
+Decoder::Decoder(Model &model) : model_(model) {
 }
 
 Decoder::~Decoder() {
@@ -131,13 +130,5 @@ string ToStringDebug(vector<Node> &nodes) {
   }
   return oss.str();
 }
-
-
-// static
-static Decoder g_decoder;
-Decoder &Decoder::GetDecoder() {
-  return g_decoder;
-}
-
 }
 

src/decoder.h

@@ -14,7 +14,7 @@ namespace jsc {
 
 class Decoder {
  public:
-  Decoder();
+  Decoder(Model &model);
   virtual ~Decoder();
 
   bool Decode(string input, vector<Node> &nodes, bool label=true);
@@ -27,8 +27,6 @@ class Decoder {
   //  2) Backward: search the best path using the total cost
   bool Viterbi(Lattice &lattice, vector<Node> &result);
 
-  static Decoder &GetDecoder();
-
  private:
   Model &model_;
 };

src/model.cpp

@@ -126,11 +126,5 @@ void Model::Clear() {
   entries_.clear();
   offsets_.clear();
 }
-// static
-static Model g_model;
-Model &Model::GetModel() {
-  return g_model;
-}
-
 }
 

src/model.h

@@ -35,9 +35,6 @@ class Model {
   void Clear();
   uint32_t GetSize() { return (uint32_t)entries_.size(); }
 
-  // Get reference from global object.
-  static Model &GetModel();
-
 private:
   void PushResult(uint32_t source_id, string &query, vector<Ngram> &result);
   marisa::Trie source_trie_;

tools/jsc-decode.cpp

@@ -2,14 +2,14 @@
 using namespace jsc;
 
 void Run(string prefix, string format, bool label, string table_mode) {
-  Model &model = Model::GetModel();
+  Model model;
 
   if (!model.LoadFromBinary(prefix.c_str())) {
     cerr << "Model " << prefix << "is not found." << endl;
     return;
   }
 
-  Decoder &decoder = Decoder::GetDecoder();
+  Decoder decoder(model);
   Table table = Table();
   if (table_mode == "both" || table_mode == "on")
     table.Load(prefix + "table.txt");

tools/jsc-server.cpp

@@ -22,14 +22,16 @@
 #include "jsc.h"
 using namespace jsc;
 
+Model model;
+
 void readcb(struct bufferevent *bev, void *ctx) {
   struct evbuffer *input, *output;
   char *line;
   size_t n;
   input = bufferevent_get_input(bev);
   output = bufferevent_get_output(bev);
 
-  Decoder &decoder = Decoder::GetDecoder();
+  Decoder decoder(model);
 
   while ((line = evbuffer_readln(input, &n, EVBUFFER_EOL_LF))) {
     vector<Node> result;
@@ -127,7 +129,6 @@ void run(int port) {
 }
 
 int main(int argc, char **argv) {
-  Model &model = Model::GetModel();
   string prefix = "./";
   string format = "segment";
   string table_mode = "both";

tools/jsc-test.cpp

@@ -22,7 +22,7 @@ void TestBuildNgram() {
 void TestModel() {
   TEST_START();
 
-  Model &model = Model::GetModel();
+  Model model;
   if (!model.LoadFromBinary(TEST_DATA)) {
     cerr << "missing " << TEST_DATA << endl;
     return;
@@ -50,9 +50,9 @@ void TestModel() {
 void TestDecoder() {
   TEST_START();
 
-  Decoder &decoder = Decoder::GetDecoder();
-  Model &model = Model::GetModel();
+  Model model;
   model.LoadFromBinary(TEST_DATA);
+  Decoder decoder(model);
 
   {
     vector<Node> result;