moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-25 04:43:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:moses-smt/mosesdecoder

Browse Source
This commit is contained in:
Marcin Junczys-Dowmunt 2015-06-21 19:24:53 +02:00
commit 58f0187e8b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/other-builds/all.workspace
View File

@ -6,10 +6,10 @@
<Project Name="lm" Path="lm/lm.project" Active="No"/> <Project Name="lm" Path="lm/lm.project" Active="No"/>
<Project Name="OnDiskPt" Path="OnDiskPt/OnDiskPt.project" Active="No"/> <Project Name="OnDiskPt" Path="OnDiskPt/OnDiskPt.project" Active="No"/>
<Project Name="search" Path="search/search.project" Active="No"/> <Project Name="search" Path="search/search.project" Active="No"/>
<Project Name="moses-cmd" Path="moses-cmd/moses-cmd.project" Active="Yes"/> <Project Name="moses-cmd" Path="moses-cmd/moses-cmd.project" Active="No"/>
<Project Name="score" Path="score/score.project" Active="No"/> <Project Name="score" Path="score/score.project" Active="No"/>
<Project Name="consolidate" Path="consolidate/consolidate.project" Active="No"/> <Project Name="consolidate" Path="consolidate/consolidate.project" Active="No"/>
<Project Name="moses" Path="moses/moses.project" Active="No"/> <Project Name="moses" Path="moses/moses.project" Active="Yes"/>
<BuildMatrix> <BuildMatrix>
<WorkspaceConfiguration Name="Debug" Selected="yes"> <WorkspaceConfiguration Name="Debug" Selected="yes">
<Project Name="manual-label" ConfigName="Debug"/> <Project Name="manual-label" ConfigName="Debug"/>

2
contrib/other-builds/moses/moses.project
View File

@ -814,7 +814,7 @@
<ResourceCompiler Options=""/> <ResourceCompiler Options=""/>
</GlobalSettings> </GlobalSettings>
<Configuration Name="Debug" CompilerType="GCC" DebuggerType="LLDB Debugger" Type="Static Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> <Configuration Name="Debug" CompilerType="GCC" DebuggerType="LLDB Debugger" Type="Static Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0"> <Compiler Options="-g -std=c++0x" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/> <IncludePath Value="."/>
<IncludePath Value="../../../"/> <IncludePath Value="../../../"/>
<IncludePath Value="../../../phrase-extract"/> <IncludePath Value="../../../phrase-extract"/>

4
moses/TranslationModel/CompactPT/LexicalReorderingTableCompact.cpp
View File

@ -78,9 +78,9 @@ GetScore(const Phrase& f, const Phrase& e, const Phrase& c)
if(m_hash.GetSize() != index) { if(m_hash.GetSize() != index) {
std::string scoresString; std::string scoresString;
if(m_inMemory) if(m_inMemory)
scoresString = m_scoresMemory[index]; scoresString = m_scoresMemory[index].str();
else else
scoresString = m_scoresMapped[index]; scoresString = m_scoresMapped[index].str();
BitWrapper<> bitStream(scoresString); BitWrapper<> bitStream(scoresString);
for(size_t i = 0; i < m_numScoreComponent; i++) for(size_t i = 0; i < m_numScoreComponent; i++)

4
moses/TranslationModel/CompactPT/PhraseDecoder.cpp
View File

@ -224,9 +224,9 @@ TargetPhraseVectorPtr PhraseDecoder::CreateTargetPhraseCollection(const Phrase &
// Retrieve compressed and encoded target phrase collection // Retrieve compressed and encoded target phrase collection
std::string encodedPhraseCollection; std::string encodedPhraseCollection;
if(m_phraseDictionary.m_inMemory) if(m_phraseDictionary.m_inMemory)
encodedPhraseCollection = m_phraseDictionary.m_targetPhrasesMemory[sourcePhraseId]; encodedPhraseCollection = m_phraseDictionary.m_targetPhrasesMemory[sourcePhraseId].str();
else else
encodedPhraseCollection = m_phraseDictionary.m_targetPhrasesMapped[sourcePhraseId]; encodedPhraseCollection = m_phraseDictionary.m_targetPhrasesMapped[sourcePhraseId].str();
BitWrapper<> encodedBitStream(encodedPhraseCollection); BitWrapper<> encodedBitStream(encodedPhraseCollection);
if(m_coding == PREnc && bitsLeft) if(m_coding == PREnc && bitsLeft)