diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2012-05-25 00:11:35 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2012-05-25 00:11:35 +0400 |
| commit | c397d2068bd65fc1eca6bf49057cfda154fa3ce5 (patch) | |
| tree | e8a8c4e6f60c2b0d47592371d981b9d1a1ac9f85 /misc | |
| parent | 5a17ef82b3c7449d9fb3686875a7936193e14a89 (diff) | |
| parent | 277fd38bbd345c083b762a0fb36c0a69da2ca7eb (diff) | |
Merge branch 'trunk' into miramerge. Still to fix build.
Conflicts:
Jamroot
mert/Data.cpp
mert/Data.h
mert/FeatureArray.cpp
mert/FeatureArray.h
mert/FeatureData.cpp
mert/FeatureData.h
mert/FeatureStats.cpp
mert/FeatureStats.h
mert/mert.cpp
moses-chart-cmd/src/IOWrapper.h
moses-chart-cmd/src/Main.cpp
moses-cmd/src/IOWrapper.cpp
moses-cmd/src/IOWrapper.h
moses-cmd/src/Main.cpp
moses/src/GlobalLexicalModel.cpp
moses/src/Jamfile
moses/src/Parameter.cpp
moses/src/PhraseDictionary.cpp
moses/src/ScoreIndexManager.h
moses/src/TargetPhrase.h
regression-testing/tests/phrase.lexicalized-reordering-bin/truth/results.txt
regression-testing/tests/phrase.lexicalized-reordering-cn/truth/results.txt
regression-testing/tests/phrase.lexicalized-reordering/truth/results.txt
regression-testing/tests/phrase.multiple-translation-system-lr/truth/results.txt
regression-testing/tests/phrase.show-weights.lex-reorder/truth/results.txt
regression-testing/tests/phrase.show-weights/truth/results.txt
scripts/ems/experiment.meta
scripts/ems/experiment.perl
scripts/training/filter-model-given-input.pl
scripts/training/mert-moses.pl
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/processLexicalTable.vcxproj | 4 | ||||
| -rw-r--r-- | misc/queryLexicalTable.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/processLexicalTable.vcxproj b/misc/processLexicalTable.vcxproj index cb32fb1c4..bdb2719fd 100644 --- a/misc/processLexicalTable.vcxproj +++ b/misc/processLexicalTable.vcxproj @@ -58,7 +58,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>zdll.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zdll.lib;$(SolutionDir)$(Configuration)\moses.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -78,7 +78,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>zdll.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zdll.lib;$(SolutionDir)$(Configuration)\moses.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
diff --git a/misc/queryLexicalTable.cpp b/misc/queryLexicalTable.cpp index 166549267..45eb68867 100644 --- a/misc/queryLexicalTable.cpp +++ b/misc/queryLexicalTable.cpp @@ -24,7 +24,7 @@ void printHelp() std::ostream& operator<<(std::ostream& o, Scores s) { - for(int i = 0; i < s.size(); ++i) { + for(size_t i = 0; i < s.size(); ++i) { o << s[i] << " "; } //o << std::endln; |