delete different calc functions

This commit is contained in:
Hieu Hoang 2013-04-24 13:23:22 +01:00
parent c84605a241
commit d9b1784373
3 changed files with 0 additions and 8 deletions

View File

@ -253,10 +253,6 @@ int Hypothesis::RecombineCompare(const Hypothesis &compare) const
return 0; return 0;
} }
void Hypothesis::IncorporateTransOptScores() {
m_currScoreBreakdown.PlusEquals(m_transOpt->GetScoreBreakdown());
}
void Hypothesis::EvaluateWith(const StatefulFeatureFunction &sfff, void Hypothesis::EvaluateWith(const StatefulFeatureFunction &sfff,
int state_idx) { int state_idx) {
m_ffStates[state_idx] = sfff.Evaluate( m_ffStates[state_idx] = sfff.Evaluate(

View File

@ -260,7 +260,6 @@ public:
} }
// Added by oliver.wilson@ed.ac.uk for async lm stuff. // Added by oliver.wilson@ed.ac.uk for async lm stuff.
void IncorporateTransOptScores();
void EvaluateWith(const StatefulFeatureFunction &sfff, int state_idx); void EvaluateWith(const StatefulFeatureFunction &sfff, int state_idx);
void EvaluateWith(const StatelessFeatureFunction &slff); void EvaluateWith(const StatelessFeatureFunction &slff);

View File

@ -156,9 +156,6 @@ void SearchNormalBatch::EvalAndMergePartialHypos() {
++partial_hypo_iter) { ++partial_hypo_iter) {
Hypothesis* hypo = *partial_hypo_iter; Hypothesis* hypo = *partial_hypo_iter;
// Incorporate the translation option scores.
hypo->IncorporateTransOptScores();
// Evaluate with other ffs. // Evaluate with other ffs.
std::map<int, StatefulFeatureFunction*>::iterator sfff_iter; std::map<int, StatefulFeatureFunction*>::iterator sfff_iter;
for (sfff_iter = m_stateful_ffs.begin(); for (sfff_iter = m_stateful_ffs.begin();