From 20b3e8929e93c40e0f1ec61b9268330fe59607f9 Mon Sep 17 00:00:00 2001 From: Nicola Bertoldi Date: Mon, 19 May 2014 15:35:08 +0200 Subject: beautify --- phrase-extract/InternalStructFeature.cpp | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'phrase-extract/InternalStructFeature.cpp') diff --git a/phrase-extract/InternalStructFeature.cpp b/phrase-extract/InternalStructFeature.cpp index 3757b0e43..a2369a80c 100644 --- a/phrase-extract/InternalStructFeature.cpp +++ b/phrase-extract/InternalStructFeature.cpp @@ -8,7 +8,8 @@ namespace MosesTraining void InternalStructFeature::add(const ScoreFeatureContext& context, std::vector& denseValues, - std::map& sparseValues) const { + std::map& sparseValues) const +{ const std::map *allTrees = context.phrasePair.GetProperty("Tree"); // our would we rather want to take the most frequent one only? for ( std::map::const_iterator iter=allTrees->begin(); iter!=allTrees->end(); ++iter ) { @@ -19,24 +20,26 @@ void InternalStructFeature::add(const ScoreFeatureContext& context, void InternalStructFeatureDense::add(const std::string *treeFragment, float count, std::vector& denseValues, - std::map& sparseValues) const { - //cout<<"Dense: "<<*internalStruct<find("NP", start)) != string::npos) { - countNP += count; - start+=2; //length of "NP" - } - //should add e^countNP so in the decoder I get log(e^countNP)=countNP -> but is log or ln? - //should use this but don't know what it does? -> maybeLog( (bitmap == i) ? 2.718 : 1 ) - denseValues.push_back(exp(countNP)); + std::map& sparseValues) const +{ + //cout<<"Dense: "<<*internalStruct<find("NP", start)) != string::npos) { + countNP += count; + start+=2; //length of "NP" + } + //should add e^countNP so in the decoder I get log(e^countNP)=countNP -> but is log or ln? + //should use this but don't know what it does? -> maybeLog( (bitmap == i) ? 2.718 : 1 ) + denseValues.push_back(exp(countNP)); } void InternalStructFeatureSparse::add(const std::string *treeFragment, float count, std::vector& denseValues, - std::map& sparseValues) const { + std::map& sparseValues) const +{ //cout<<"Sparse: "<<*internalStruct<find("VBZ")!=std::string::npos) sparseValues["NTVBZ"] += count; -- cgit v1.2.3