code cleanup

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1234 1f5c12ca-751b-0410-a591-d2e778427230
This commit is contained in:
hieuhoang1972 2007-02-23 00:00:09 +00:00
parent a1072b9a7a
commit bef38f4006
6 changed files with 9 additions and 10 deletions

View File

@ -151,7 +151,7 @@ int main(int argc, char* argv[])
IFVERBOSE(2) { PrintUserTime("Sentence Decoding Time:"); }
manager.CalcDecoderStatistics(staticData);
manager.CalcDecoderStatistics();
staticData.CleanUpAfterSentenceProcessing();
}

View File

@ -363,12 +363,12 @@ void Manager::CalcNBest(size_t count, LatticePathList &ret,bool onlyDistinct) co
}
}
void Manager::CalcDecoderStatistics(const StaticData& staticData) const
void Manager::CalcDecoderStatistics() const
{
const Hypothesis *hypo = GetBestHypothesis();
if (hypo != NULL)
{
staticData.GetSentenceStats().CalcFinalStats(*hypo);
StaticData::Instance().GetSentenceStats().CalcFinalStats(*hypo);
IFVERBOSE(2) {
if (hypo != NULL) {
string buff;

View File

@ -98,5 +98,5 @@ public:
/***
* to be called after processing a sentence (which may consist of more than just calling ProcessSentence() )
*/
void CalcDecoderStatistics(const StaticData& staticData) const;
void CalcDecoderStatistics() const;
};

View File

@ -42,9 +42,10 @@ bool PhraseDictionaryMemory::Load(const std::vector<FactorType> &input
, const vector<float> &weight
, size_t tableLimit
, const LMList &languageModels
, float weightWP
, const StaticData& staticData)
, float weightWP)
{
const StaticData &staticData = StaticData::Instance();
m_tableLimit = tableLimit;
m_filePath = filePath;

View File

@ -51,8 +51,7 @@ public:
, const std::vector<float> &weight
, size_t tableLimit
, const LMList &languageModels
, float weightWP
, const StaticData& staticData);
, float weightWP);
const TargetPhraseCollection *GetTargetPhraseCollection(const Phrase &source) const;

View File

@ -619,8 +619,7 @@ bool StaticData::LoadPhraseTables()
, weight
, maxTargetPhrase[index]
, GetAllLM()
, GetWeightWordPenalty()
, *this))
, GetWeightWordPenalty()))
{
delete pd;
return false;