delete unused function

2 files changed, 7 insertions, 23 deletions

diff --git a/OnDiskPt/Vocab.cpp b/OnDiskPt/Vocab.cpp
index 0ed9ffa2a..a6ab68cdd 100644
--- a/OnDiskPt/Vocab.cpp
+++ b/OnDiskPt/Vocab.cpp
@@ -21,7 +21,6 @@
 #include <fstream>
 #include "OnDiskWrapper.h"
 #include "Vocab.h"
-#include "../moses/src/FactorCollection.h"
 
 using namespace std;
 
@@ -69,13 +68,13 @@ void Vocab::Save(OnDiskWrapper &onDiskWrapper)
   }
 }
 
-UINT64 Vocab::AddVocabId(const std::string &factorString)
+UINT64 Vocab::AddVocabId(const std::string &str)
 {
   // find string id
-  CollType::const_iterator iter = m_vocabColl.find(factorString);
+  CollType::const_iterator iter = m_vocabColl.find(str);
   if (iter == m_vocabColl.end()) {
     // add new vocab entry
-    m_vocabColl[factorString] = m_nextId;
+    m_vocabColl[str] = m_nextId;
     return m_nextId++;
   } else {
     // return existing entry
@@ -83,10 +82,10 @@ UINT64 Vocab::AddVocabId(const std::string &factorString)
   }
 }
 
-UINT64 Vocab::GetVocabId(const std::string &factorString, bool &found) const
+UINT64 Vocab::GetVocabId(const std::string &str, bool &found) const
 {
   // find string id
-  CollType::const_iterator iter = m_vocabColl.find(factorString);
+  CollType::const_iterator iter = m_vocabColl.find(str);
   if (iter == m_vocabColl.end()) {
     found = false;
     return 0; //return whatever
@@ -97,14 +96,4 @@ UINT64 Vocab::GetVocabId(const std::string &factorString, bool &found) const
   }
 }
 
-const Moses::Factor *Vocab::GetFactor(UINT32 vocabId, Moses::FactorType factorType, Moses::FactorDirection direction, bool isNonTerminal) const
-{
-  string str = GetString(vocabId);
-  if (isNonTerminal) {
-    str = str.substr(1, str.size() - 2);
-  }
-  const Moses::Factor *factor = Moses::FactorCollection::Instance().AddFactor(direction, factorType, str);
-  return factor;
-}
-
 }
diff --git a/OnDiskPt/Vocab.h b/OnDiskPt/Vocab.h
index f8c1dd649..60c5085c7 100644
--- a/OnDiskPt/Vocab.h
+++ b/OnDiskPt/Vocab.h
@@ -22,10 +22,6 @@
 #include <map>
 #include "../moses/src/TypeDef.h"
 
-namespace Moses
-{
-class Factor;
-}
 
 namespace OnDiskPt
 {
@@ -45,9 +41,8 @@ public:
   Vocab()
     :m_nextId(1)
   {}
-  UINT64 AddVocabId(const std::string &factorString);
-  UINT64 GetVocabId(const std::string &factorString, bool &found) const;
-  const Moses::Factor *GetFactor(UINT32 vocabId, Moses::FactorType factorType, Moses::FactorDirection direction, bool isNonTerminal) const;
+  UINT64 AddVocabId(const std::string &str);
+  UINT64 GetVocabId(const std::string &str, bool &found) const;
   const std::string &GetString(UINT32 vocabId) const {
     return m_lookup[vocabId];
   }