Merge branch 'trunk' into miramerge

Compiles, not tested.

Conflicts:
	Jamroot
	OnDiskPt/PhraseNode.h
	OnDiskPt/TargetPhrase.cpp
	OnDiskPt/TargetPhrase.h
	OnDiskPt/TargetPhraseCollection.cpp
	mert/BleuScorer.cpp
	mert/Data.cpp
	mert/FeatureData.cpp
	moses-chart-cmd/src/Main.cpp
	moses/src/AlignmentInfo.h
	moses/src/ChartManager.cpp
	moses/src/LM/Ken.cpp
	moses/src/LM/Ken.h
	moses/src/LMList.h
	moses/src/LexicalReordering.h
	moses/src/PhraseDictionaryTree.h
	moses/src/ScoreIndexManager.h
	moses/src/StaticData.h
	moses/src/TargetPhrase.h
	moses/src/Word.cpp
	scripts/ems/experiment.meta
	scripts/ems/experiment.perl
	scripts/training/train-model.perl

1 files changed, 7 insertions, 1 deletions

diff --git a/mert/BleuScorer.cpp b/mert/BleuScorer.cpp
index 39df32dc2..b9cae5a15 100644
--- a/mert/BleuScorer.cpp
+++ b/mert/BleuScorer.cpp
@@ -28,6 +28,10 @@ const char REFLEN_CLOSEST[] = "closest";
 
 } // namespace
 
+namespace MosesTuning
+{
+  
+
 BleuScorer::BleuScorer(const string& config)
     : StatisticsBasedScorer("BLEU", config),
       m_ref_length_type(CLOSEST) {
@@ -164,7 +168,7 @@ void BleuScorer::prepareStats(size_t sid, const string& text, ScoreStats& entry)
   entry.set(stats);
 }
 
-float BleuScorer::calculateScore(const vector<int>& comps) const
+statscore_t BleuScorer::calculateScore(const vector<int>& comps) const
 {
   CHECK(comps.size() == kBleuNgramOrder * 2 + 1);
 
@@ -337,3 +341,5 @@ float BleuScorer::sentenceLevelBleuPlusOne(const vector<float>& stats) {
 	//cerr << brevity << " -> " << exp(logbleu) << endl;
 	return exp(logbleu);
 }
+
+}