beautify

1 files changed, 46 insertions, 23 deletions

diff --git a/mert/Vocabulary.h b/mert/Vocabulary.h
index 3ad42f46f..16c8698c6 100644
--- a/mert/Vocabulary.h
+++ b/mert/Vocabulary.h
@@ -4,7 +4,8 @@
 #include <boost/unordered_map.hpp>
 #include <string>
 
-namespace mert {
+namespace mert
+{
 
 /**
  * A map to handle vocabularies to calculate
@@ -12,8 +13,9 @@ namespace mert {
  *
  * TODO: replace this with more efficient data structure.
  */
-class Vocabulary {
- public:
+class Vocabulary
+{
+public:
   typedef boost::unordered_map<std::string, int>::iterator iterator;
   typedef boost::unordered_map<std::string, int>::const_iterator const_iterator;
 
@@ -28,32 +30,53 @@ class Vocabulary {
    */
   bool Lookup(const std::string&str , int* v) const;
 
-  void clear() { m_vocab.clear(); }
-
-  bool empty() const { return m_vocab.empty(); }
-
-  std::size_t size() const { return m_vocab.size(); }
-
-  iterator find(const std::string& str) { return m_vocab.find(str); }
-  const_iterator find(const std::string& str) const { return m_vocab.find(str); }
-
-  int& operator[](const std::string& str) { return m_vocab[str]; }
-
-  iterator begin() { return m_vocab.begin(); }
-  const_iterator begin() const { return m_vocab.begin(); }
-  iterator end() { return m_vocab.end(); }
-  const_iterator end() const { return m_vocab.end(); }
-
- private:
+  void clear() {
+    m_vocab.clear();
+  }
+
+  bool empty() const {
+    return m_vocab.empty();
+  }
+
+  std::size_t size() const {
+    return m_vocab.size();
+  }
+
+  iterator find(const std::string& str) {
+    return m_vocab.find(str);
+  }
+  const_iterator find(const std::string& str) const {
+    return m_vocab.find(str);
+  }
+
+  int& operator[](const std::string& str) {
+    return m_vocab[str];
+  }
+
+  iterator begin() {
+    return m_vocab.begin();
+  }
+  const_iterator begin() const {
+    return m_vocab.begin();
+  }
+  iterator end() {
+    return m_vocab.end();
+  }
+  const_iterator end() const {
+    return m_vocab.end();
+  }
+
+private:
   boost::unordered_map<std::string, int> m_vocab;
 };
 
-class VocabularyFactory {
- public:
+class VocabularyFactory
+{
+public:
   static Vocabulary* GetVocabulary();
   static void SetVocabulary(Vocabulary* vocab);
 
- private:
+private:
   VocabularyFactory() {}
   virtual ~VocabularyFactory() {}
 };