delete references to LMList

This commit is contained in:
Hieu Hoang 2013-05-21 12:27:13 +01:00
parent 031cbdf7cd
commit ff880ec6f1
14 changed files with 4 additions and 22 deletions

View File

@ -229,8 +229,7 @@ Moses::TargetPhrase *TargetPhrase::ConvertToMoses(const std::vector<Moses::Facto
, const Vocab &vocab
, const Moses::PhraseDictionary &phraseDict
, const std::vector<float> &weightT
, const Moses::WordPenaltyProducer* wpProducer
, const Moses::LMList &lmList) const
, const Moses::WordPenaltyProducer* wpProducer) const
{
Moses::TargetPhrase *ret = new Moses::TargetPhrase();

View File

@ -30,7 +30,6 @@ namespace Moses
{
class PhraseDictionary;
class TargetPhrase;
class LMList;
class Phrase;
class WordPenaltyProducer;
}
@ -106,8 +105,7 @@ public:
, const Vocab &vocab
, const Moses::PhraseDictionary &phraseDict
, const std::vector<float> &weightT
, const Moses::WordPenaltyProducer* wpProducer
, const Moses::LMList &lmList) const;
, const Moses::WordPenaltyProducer* wpProducer) const;
UINT64 ReadOtherInfoFromFile(UINT64 filePos, std::fstream &fileTPColl);
UINT64 ReadFromFile(std::fstream &fileTP);

View File

@ -118,7 +118,6 @@ Moses::TargetPhraseCollection *TargetPhraseCollection::ConvertToMoses(const std:
, const Moses::PhraseDictionary &phraseDict
, const std::vector<float> &weightT
, const Moses::WordPenaltyProducer* wpProducer
, const Moses::LMList &lmList
, const std::string & /* filePath */
, Vocab &vocab) const
{
@ -131,8 +130,7 @@ Moses::TargetPhraseCollection *TargetPhraseCollection::ConvertToMoses(const std:
, vocab
, phraseDict
, weightT
, wpProducer
, lmList);
, wpProducer);
/*
// debugging output

View File

@ -26,7 +26,6 @@ namespace Moses
{
class TargetPhraseCollection;
class PhraseDictionary;
class LMList;
class WordPenaltyProducer;
}
@ -76,7 +75,6 @@ public:
, const Moses::PhraseDictionary &phraseDict
, const std::vector<float> &weightT
, const Moses::WordPenaltyProducer* wpProducer
, const Moses::LMList &lmList
, const std::string &filePath
, Vocab &vocab) const;
void ReadFromFile(size_t tableLimit, UINT64 filePos, OnDiskWrapper &onDiskWrapper);

View File

@ -28,7 +28,6 @@
#include "Phrase.h"
#include "StaticData.h"
#include "DummyScoreProducers.h"
#include "LMList.h"
#include "ChartTranslationOptions.h"
#include "FFState.h"

View File

@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "LexicalReordering.h"
#include "StaticData.h"
#include "InputType.h"
#include "LMList.h"
#include "Manager.h"
using namespace std;

View File

@ -122,7 +122,6 @@ public:
return m_targetPhrase;
}
// void PrintLMScores(const LMList &lmListInitial, const LMList &lmListEnd) const;
/** return input positions covered by the translation option (phrasal translation) used to create this hypothesis */
inline const WordsRange &GetCurrSourceWordsRange() const {

View File

@ -36,11 +36,10 @@ class PDTAimp
protected:
PDTAimp(PhraseDictionaryTreeAdaptor *p,unsigned nis)
: m_languageModels(0),m_dict(0),
: m_dict(0),
m_obj(p),useCache(1),m_numInputScores(nis),totalE(0),distinctE(0) {}
public:
LMList const* m_languageModels;
std::vector<FactorType> m_input,m_output;
PhraseDictionaryTree *m_dict;
typedef std::vector<TargetPhraseCollection const*> vTPC;
@ -195,7 +194,6 @@ protected:
m_dict=new PhraseDictionaryTree();
m_input=input;
m_output=output;
m_languageModels=&languageModels;
const StaticData &staticData = StaticData::Instance();
m_dict->NeedAlignmentInfo(staticData.NeedAlignmentInfo());

View File

@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "GenerationDictionary.h"
#include "LM/Base.h"
#include "StaticData.h"
#include "LMList.h"
#include "ScoreComponentCollection.h"
#include "Util.h"
#include "DummyScoreProducers.h"

View File

@ -37,7 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
namespace Moses
{
class LMList;
class FeatureFunction;
class WordPenaltyProducer;

View File

@ -243,7 +243,6 @@ void ChartRuleLookupManagerOnDisk::GetChartRuleCollection(
,m_dictionary
,weightT
,m_wpProducer
,*m_languageModels
,m_filePath
, m_dbWrapper.GetVocab());

View File

@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "TranslationOption.h"
#include "WordsBitmap.h"
#include "GenerationDictionary.h"
#include "LMList.h"
#include "LexicalReordering.h"
#include "StaticData.h"
#include "InputType.h"

View File

@ -39,7 +39,6 @@ class LanguageModel;
class FactorCollection;
class GenerationDictionary;
class InputType;
class LMList;
class FactorMask;
class Word;
class DecodeGraph;

View File

@ -28,7 +28,6 @@ namespace Moses
{
class Sentence;
class LMList;
/** Holds all translation options, for all spans, of a particular sentence input
* Inherited from TranslationOptionCollection.