merged master into dynamic-models and solved conflicts

1 files changed, 17 insertions, 0 deletions

diff --git a/moses/FactorCollection.cpp b/moses/FactorCollection.cpp
index 93edeff51..a29778310 100644
--- a/moses/FactorCollection.cpp
+++ b/moses/FactorCollection.cpp
@@ -66,6 +66,23 @@ const Factor *FactorCollection::AddFactor(const StringPiece &factorString, bool
   return &ret.first->in;
 }
 
+const Factor *FactorCollection::GetFactor(const StringPiece &factorString, bool isNonTerminal)
+{
+  FactorFriend to_find;
+  to_find.in.m_string = factorString;
+  to_find.in.m_id = (isNonTerminal) ? m_factorIdNonTerminal : m_factorId;
+  Set & set = (isNonTerminal) ? m_set : m_setNonTerminal;
+  { // read=lock scope
+#ifdef WITH_THREADS
+    boost::shared_lock<boost::shared_mutex> read_lock(m_accessLock);
+#endif // WITH_THREADS
+    Set::const_iterator i = set.find(to_find);
+    if (i != set.end()) return &i->in;
+  }
+  return NULL;
+}
+
+
 FactorCollection::~FactorCollection() {}
 
 TO_STRING_BODY(FactorCollection);