Merge remote-tracking branch 'origin/issue78'

Discovery666 · Nov 10, 2014 · bbd9a0f · bbd9a0f
2 parents 1ecf2e6 + 3d695bf
commit bbd9a0f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/ner/decoder.h b/src/ner/decoder.h
@@ -13,13 +13,13 @@ namespace ner {
 // data structure for lattice item
 class LatticeItem {
 public:
-    LatticeItem (int _i, int _l, double _score, const LatticeItem * _prev) : 
+    LatticeItem (int _i, int _l, double _score, const LatticeItem * _prev) :
         i(_i),
         l(_l),
         score(_score),
         prev(_prev) {}
 
-    LatticeItem (int _l, double _score) : 
+    LatticeItem (int _l, double _score) :
         i(0),
         l(_l),
         score(_score),
@@ -34,7 +34,7 @@ class LatticeItem {
 
 class Decoder {
 public:
-    Decoder (int _L, rulebase::RuleBase & _base) : L(_L), base(_base) {}
+    Decoder (int _l, rulebase::RuleBase & _base) : L(_l), base(_base) {}
     void decode(Instance * inst);
 
 private:
@@ -61,7 +61,7 @@ class Decoder {
     }
 };
 
-// maintain kest best list of 
+// maintain kest best list of
 /*class KBestDecoder {
 public:
     typedef std::vector< std::vector<int> > KBestDecodeResult;

diff --git a/src/parser/decoder1o.h b/src/parser/decoder1o.h
@@ -14,10 +14,10 @@ using namespace ltp::math;
 
 class Decoder1O : public Decoder {
 public:
-  Decoder1O(int _L = 1) : L(_L) {}
+  Decoder1O(int _l = 1) : L(_l) {}
 
 protected:
-  void init_lattice(const Instance * inst); 
+  void init_lattice(const Instance * inst);
   void decode_projective(const Instance * inst);
   void get_result(Instance * inst);
   void free_lattice();

diff --git a/src/parser/decoder2o.h b/src/parser/decoder2o.h
@@ -9,7 +9,7 @@ namespace parser {
 // 2nd-order decoder with dependency features and sibling features
 class Decoder2O : public Decoder {
 public:
-  Decoder2O(int _L = 1) : L(_L) {}
+  Decoder2O(int _l = 1) : L(_l) {}
 
 public:
   void init_lattice(const Instance * inst);
@@ -27,7 +27,7 @@ class Decoder2O : public Decoder {
 // 2nd-order decoder with dependency, sibling and grand features
 class Decoder2OCarreras : public Decoder {
 public:
-  Decoder2OCarreras(int _L = 1) : L(_L) {}
+  Decoder2OCarreras(int _l = 1) : L(_l) {}
 
 public:
   void init_lattice(const Instance * inst);

diff --git a/src/postagger/decoder.h b/src/postagger/decoder.h
@@ -13,13 +13,13 @@ namespace postagger {
 // data structure for lattice item
 class LatticeItem {
 public:
-  LatticeItem (int _i, int _l, double _score, const LatticeItem * _prev) 
+  LatticeItem (int _i, int _l, double _score, const LatticeItem * _prev)
     : i(_i),
       l(_l),
       score(_score),
       prev(_prev) {}
 
-  LatticeItem (int _l, double _score) 
+  LatticeItem (int _l, double _score)
     : i(0),
       l(_l),
       score(_score),
@@ -34,7 +34,7 @@ class LatticeItem {
 
 class Decoder {
 public:
-  Decoder (int _L) : L(_L) {}
+  Decoder (int _l) : L(_l) {}
   void decode(Instance * inst);
 private:
   void init_lattice(const Instance * inst);

diff --git a/src/segmentor/decoder.h b/src/segmentor/decoder.h
@@ -34,7 +34,7 @@ class LatticeItem {
 
 class Decoder {
 public:
-  Decoder (int _L, rulebase::RuleBase & _base) : L(_L), base(_base) {}
+  Decoder (int _l, rulebase::RuleBase & _base) : L(_l), base(_base) {}
   void decode(Instance * inst);
 
 private: