Add thread unsafe Singleton class.

- Add Vocabulary factory and the unit test.
- Remove Scorer::ClearVocabulary().

1 files changed, 21 insertions, 0 deletions

diff --git a/mert/Vocabulary.cpp b/mert/Vocabulary.cpp
new file mode 100644
index 000000000..40b04bf99
--- /dev/null
+++ b/mert/Vocabulary.cpp
@@ -0,0 +1,21 @@
+#include "Vocabulary.h"
+#include "Singleton.h"
+
+namespace mert {
+namespace {
+Vocabulary* g_vocab = NULL;
+} // namespace
+
+Vocabulary* VocabularyFactory::GetVocabulary() {
+  if (g_vocab == NULL) {
+    return Singleton<Vocabulary>::GetInstance();
+  } else {
+    return g_vocab;
+  }
+}
+
+void VocabularyFactory::SetVocabulary(Vocabulary* vocab) {
+  g_vocab = vocab;
+}
+
+} // namespace mert