This commit is contained in:
U-DESKTOP-ONHNTIV\hieuh 2015-08-05 19:59:54 +01:00
commit 86f76f7b5a
2 changed files with 7 additions and 4 deletions

View File

@ -1,5 +1,8 @@
#ifdef HAVE_XMLRPC_C
#include <xmlrpc-c/base.hpp>
#else
namespace xmlrpc_c { class value; }
namespace xmlrpc_c
{
class value;
}
#endif

View File

@ -447,7 +447,7 @@ void ExtractTask::extract(SentenceAlignment &sentence)
wordNextOrient = getOrientWordModel(sentence, m_options.isWordType(), connectedLeftTopN, connectedRightTopN, endF, startF, endE, startE, 0, countF, -1, &lt, &ge);
orientationInfo += getOrientString(wordPrevOrient, m_options.isWordType()) + " " + getOrientString(wordNextOrient, m_options.isWordType());
// if(m_options.isAllModelsOutputFlag())
// " | | ";
// " | | ";
}
addPhrase(sentence, startE, endE, startF, endF, orientationInfo);
}
@ -561,12 +561,12 @@ REO_POS getOrientPhraseModel (SentenceAlignment & sentence, REO_MODEL_TYPE model
connectedLeftTop = false;
for(int indexF=startF-2*unit; (*ge)(indexF, zero) && !connectedLeftTop; indexF=indexF-unit)
if ((connectedLeftTop = ((it = inBottomRight.find(startE - unit)) != inBottomRight.end() &&
it->second.find(indexF) != it->second.end())))
it->second.find(indexF) != it->second.end())))
return DRIGHT;
connectedRightTop = false;
for(int indexF=endF+2*unit; (*lt)(indexF, countF) && !connectedRightTop; indexF=indexF+unit)
if ((connectedRightTop = ((it = inBottomLeft.find(startE - unit)) != inBottomLeft.end() &&
it->second.find(indexF) != it->second.end())))
it->second.find(indexF) != it->second.end())))
return DLEFT;
return UNKNOWN;
}