moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-27 14:05:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge. mostly discard

Browse Source
This commit is contained in:
Hieu Hoang 2013-04-30 11:01:55 +01:00
commit b83a056f9f
3 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
defer/PhraseDictionaryMultiModel.cpp
View File

@ -16,6 +16,7 @@ You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
***********************************************************************/
#include "util/exception.hh"
#include "moses/TranslationModel/PhraseDictionaryMultiModel.h"
@ -40,6 +41,7 @@ bool PhraseDictionaryMultiModel::Load(const std::vector<FactorType> &input
, const std::vector<std::string> &config
, const vector<float> &weight
, size_t tableLimit
, size_t numInputScores
, const LMList &languageModels
, float weightWP)
{
@ -75,10 +77,7 @@ bool PhraseDictionaryMultiModel::Load(const std::vector<FactorType> &input
std::string delim = ":";
size_t delim_pos = files[i].find(delim);
if (delim_pos >= files[i].size()) {
UserMessage::Add("Phrase table must be specified in this format: Implementation:Path");
CHECK(false);
}
UTIL_THROW_IF(delim_pos >= files[i].size(), util::Exception, "Phrase table must be specified in this format: Implementation:Path");
impl = files[i].substr(0,delim_pos);
file = files[i].substr(delim_pos+1,files[i].size());
@ -93,20 +92,22 @@ bool PhraseDictionaryMultiModel::Load(const std::vector<FactorType> &input
pdm->SetNumScoreComponentMultiModel(numPtScores); //instead of complaining about inequal number of scores, silently fill up the score vector with zeroes
pdm->Load( input, output, file, m_weight, m_componentTableLimit, languageModels, m_weightWP);
m_pd.push_back(pdm);
}
else if (implementation == Compact) {
} else if (implementation == Binary) {
PhraseDictionaryTreeAdaptor* pdta = new PhraseDictionaryTreeAdaptor(m_numScoreComponent, numInputScores , m_feature_load);
pdta->Load(input, output, file, m_weight, m_componentTableLimit, languageModels, m_weightWP);
m_pd.push_back(pdta);
} else if (implementation == Compact) {
#ifndef WIN32
PhraseDictionaryCompact* pdc = new PhraseDictionaryCompact(m_numScoreComponent, implementation, m_feature_load);
pdc->SetNumScoreComponentMultiModel(m_numScoreComponent); //for compact models, we need to pass number of log-linear components to correctly resize the score vector
pdc->Load( input, output, file, m_weight, m_componentTableLimit, languageModels, m_weightWP);
m_pd.push_back(pdc);
#else
CHECK(false);
UTIL_THROW(util::Exception, "Compact phrase table not supported in windows");
#endif
}
else {
UserMessage::Add("phrase table type unknown to multi-model mode");
CHECK(false);
UTIL_THROW(util::Exception,"PhraseDictionaryMultiModel does not support phrase table type " << implementation);
}
}
@ -129,7 +130,7 @@ const TargetPhraseCollection *PhraseDictionaryMultiModel::GetTargetPhraseCollect
CollectSufficientStatistics(src, allStats);
TargetPhraseCollection *ret;
TargetPhraseCollection *ret = NULL;
if (m_mode == "interpolate") {
ret = CreateTargetPhraseCollectionLinearInterpolation(allStats, multimodelweights);
}
@ -246,8 +247,7 @@ std::vector<std::vector<float> > PhraseDictionaryMultiModel::getWeights(size_t n
else if(weights_ptr->size() != m_numModels && weights_ptr->size() != m_numModels * numWeights) {
std::stringstream strme;
strme << "Must have either one multimodel weight per model (" << m_numModels << "), or one per weighted feature and model (" << numWeights << "*" << m_numModels << "). You have " << weights_ptr->size() << ".";
UserMessage::Add(strme.str());
CHECK(false);
UTIL_THROW(util::Exception, strme.str());
}
else {
raw_weights = *weights_ptr;
@ -287,8 +287,7 @@ std::vector<float> PhraseDictionaryMultiModel::normalizeWeights(std::vector<floa
ChartRuleLookupManager *PhraseDictionaryMultiModel::CreateRuleLookupManager(const InputType&, const ChartCellCollectionBase&)
{
CHECK(false);
return 0;
UTIL_THROW(util::Exception, "Phrase table used in chart decoder");
}

5
moses/Search.cpp
View File

@ -1,4 +1,3 @@
#include "Manager.h"
#include "SearchCubePruning.h"
#include "SearchNormal.h"
@ -8,7 +7,6 @@
namespace Moses
{
Search *Search::CreateSearch(Manager& manager, const InputType &source,
SearchAlgorithm searchAlgorithm, const TranslationOptionCollection &transOptColl)
{
@ -26,9 +24,6 @@ Search *Search::CreateSearch(Manager& manager, const InputType &source,
abort();
return NULL;
}
}
}

26
moses/Search.h
View File

@ -3,7 +3,6 @@
#include <vector>
#include "TypeDef.h"
#include "Phrase.h"
namespace Moses
{
@ -13,31 +12,34 @@ class Hypothesis;
class InputType;
class TranslationOptionCollection;
class Manager;
class Phrase;
/** Abstract class used in the phrase-based decoder.
* Cube pruning and normal searches are the classes that inherits from this class
/** Base search class used in the phrase-based decoder.
*
* Actual search class that implement the cube pruning algorithm (SearchCubePruning)
* or standard beam search (SearchNormal) should inherits from this class, and
* override pure virtual functions.
*/
class Search
{
public:
virtual const std::vector < HypothesisStack* >& GetHypothesisStacks() const = 0;
virtual const std::vector<HypothesisStack*>& GetHypothesisStacks() const = 0;
virtual const Hypothesis *GetBestHypothesis() const = 0;
virtual void ProcessSentence() = 0;
Search(Manager& manager) : m_manager(manager) {}
virtual ~Search()
{}
// Factory
//! Decode the sentence according to the specified search algorithm.
virtual void ProcessSentence() = 0;
explicit Search(Manager& manager) : m_manager(manager) {}
virtual ~Search() {}
// Factory method
static Search *CreateSearch(Manager& manager, const InputType &source, SearchAlgorithm searchAlgorithm,
const TranslationOptionCollection &transOptColl);
protected:
const Phrase *m_constraint;
Manager& m_manager;
};
}
#endif