Index: trunk/apertium/apertium/apertium_tagger.cc =================================================================== --- trunk/apertium/apertium/apertium_tagger.cc (revision 68287) +++ trunk/apertium/apertium/apertium_tagger.cc (revision 68289) @@ -1019,7 +1019,7 @@ #endif // _MSC_VER FILE_Tagger_.init_probabilities_kupiec_(Corpus); - FILE_Tagger_.train_(Corpus, TheFunctionTypeOptionArgument); + FILE_Tagger_.train(Corpus, TheFunctionTypeOptionArgument); if (std::fclose(Corpus) != 0) { std::stringstream what_; Index: trunk/apertium/apertium/file_tagger.h =================================================================== --- trunk/apertium/apertium/file_tagger.h (revision 68287) +++ trunk/apertium/apertium/file_tagger.h (revision 68289) @@ -40,7 +40,6 @@ virtual void init_probabilities_from_tagged_text_(FILE *TaggedCorpus, FILE *Corpus) = 0; virtual void init_probabilities_kupiec_(FILE *Corpus) = 0; - virtual void train_(FILE *Corpus, unsigned long Count) = 0; protected: virtual void deserialise(const TaggerData &Deserialised_FILE_Tagger) = 0; Index: trunk/apertium/apertium/hmm.cc =================================================================== --- trunk/apertium/apertium/hmm.cc (revision 68287) +++ trunk/apertium/apertium/hmm.cc (revision 68289) @@ -54,18 +54,6 @@ return tdhmm.getArrayTags(); } -void HMM::train(FILE *Corpus, unsigned long Count) { - train(Corpus); - --Count; - - for (; Count > 0; --Count) { - std::fseek(Corpus, 0, SEEK_SET); - train(Corpus); - } - - apply_rules(); -} - void HMM::serialise(FILE *Stream_) { tdhmm.write(Stream_); } void HMM::deserialise(const TaggerData &Deserialised_FILE_Tagger) { @@ -84,7 +72,7 @@ apply_rules(); } -void HMM::train_(FILE *Corpus, unsigned long Count) { +void HMM::train(FILE *Corpus, unsigned long Count) { for (; Count > 0; --Count) { std::fseek(Corpus, 0, SEEK_SET); train(Corpus); Index: trunk/apertium/apertium/hmm.h =================================================================== --- trunk/apertium/apertium/hmm.h (revision 68287) +++ trunk/apertium/apertium/hmm.h (revision 68289) @@ -79,7 +79,6 @@ void init_probabilities_from_tagged_text_(FILE *TaggedCorpus, FILE *UntaggedCorpus); void init_probabilities_kupiec_(FILE *Corpus); - void train_(FILE *Corpus, unsigned long Count); HMM(); HMM(TaggerDataHMM *tdhmm); Index: trunk/apertium/apertium/lswpost.cc =================================================================== --- trunk/apertium/apertium/lswpost.cc (revision 68287) +++ trunk/apertium/apertium/lswpost.cc (revision 68289) @@ -56,16 +56,6 @@ return tdlsw.getArrayTags(); } -void LSWPoST::train(FILE *Corpus, unsigned long Count) { - train(Corpus); - --Count; - - for (; Count > 0; --Count) { - std::fseek(Corpus, 0, SEEK_SET); - train(Corpus); - } -} - void LSWPoST::serialise(FILE *Stream_) { tdlsw.write(Stream_); } void LSWPoST::deserialise(const TaggerData &Deserialised_FILE_Tagger) { @@ -82,7 +72,7 @@ init_probabilities(Corpus); } -void LSWPoST::train_(FILE *Corpus, unsigned long Count) { +void LSWPoST::train(FILE *Corpus, unsigned long Count) { for (; Count > 0; --Count) { std::fseek(Corpus, 0, SEEK_SET); train(Corpus); Index: trunk/apertium/apertium/lswpost.h =================================================================== --- trunk/apertium/apertium/lswpost.h (revision 68287) +++ trunk/apertium/apertium/lswpost.h (revision 68289) @@ -62,7 +62,6 @@ void init_probabilities_from_tagged_text_(FILE *TaggedCorpus, FILE *UntaggedCorpus); void init_probabilities_kupiec_(FILE *Corpus); - void train_(FILE *Corpus, unsigned long Count); LSWPoST(); LSWPoST(TaggerDataLSW *tdlsw); Index: languages/apertium-cat/apertium-cat.cat.tsx =================================================================== --- languages/apertium-cat/apertium-cat.cat.tsx (revision 68287) +++ languages/apertium-cat/apertium-cat.cat.tsx (revision 68289) @@ -259,6 +259,12 @@ + + + + + +