moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-10-26 11:28:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename CTO to CTOs

Browse Source
This commit is contained in:
Hieu Hoang 2012-09-25 17:34:43 +01:00
parent bd90816716
commit a9c890e55e
18 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/other-builds/moses.xcodeproj/project.pbxproj
View File

@ -11,6 +11,8 @@
1E0BA41915B70E5F00AC70E1 /* PhraseDictionaryFuzzyMatch.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E0BA41715B70E5F00AC70E1 /* PhraseDictionaryFuzzyMatch.h */; };
1E1D824015AC29BB00FE42E9 /* FileHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1E1D823E15AC29BB00FE42E9 /* FileHandler.cpp */; };
1E1D824115AC29BB00FE42E9 /* FileHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E1D823F15AC29BB00FE42E9 /* FileHandler.h */; };
1E365EEA16120F4600BA335B /* ChartTranslationOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1E365EE816120F4600BA335B /* ChartTranslationOptions.cpp */; };
1E365EEB16120F4600BA335B /* ChartTranslationOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E365EE916120F4600BA335B /* ChartTranslationOptions.h */; };
1E619EA115B8713700C2D7A7 /* ChartRuleLookupManagerMemoryPerSentence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1E619E9F15B8713600C2D7A7 /* ChartRuleLookupManagerMemoryPerSentence.cpp */; };
1E619EA215B8713700C2D7A7 /* ChartRuleLookupManagerMemoryPerSentence.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E619EA015B8713700C2D7A7 /* ChartRuleLookupManagerMemoryPerSentence.h */; };
1E6D9FD615D027560064D436 /* BlockHashIndex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1E6D9FBD15D027560064D436 /* BlockHashIndex.cpp */; };
@ -71,8 +73,6 @@
1EC7375914B977AB00238410 /* ChartManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EC735E614B977AA00238410 /* ChartManager.cpp */; };
1EC7375A14B977AB00238410 /* ChartManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EC735E714B977AA00238410 /* ChartManager.h */; };
1EC7375C14B977AB00238410 /* ChartRuleLookupManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EC735E914B977AA00238410 /* ChartRuleLookupManager.h */; };
1EC7376114B977AB00238410 /* ChartTranslationOption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EC735EE14B977AA00238410 /* ChartTranslationOption.cpp */; };
1EC7376214B977AB00238410 /* ChartTranslationOption.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EC735EF14B977AA00238410 /* ChartTranslationOption.h */; };
1EC7376514B977AB00238410 /* ChartTranslationOptionList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EC735F214B977AA00238410 /* ChartTranslationOptionList.cpp */; };
1EC7376614B977AB00238410 /* ChartTranslationOptionList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EC735F314B977AA00238410 /* ChartTranslationOptionList.h */; };
1EC7376714B977AB00238410 /* ChartTrellisDetour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EC735F414B977AA00238410 /* ChartTrellisDetour.cpp */; };
@ -341,6 +341,8 @@
1E0BA41715B70E5F00AC70E1 /* PhraseDictionaryFuzzyMatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PhraseDictionaryFuzzyMatch.h; path = ../../moses/src/RuleTable/PhraseDictionaryFuzzyMatch.h; sourceTree = "<group>"; };
1E1D823E15AC29BB00FE42E9 /* FileHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileHandler.cpp; sourceTree = "<group>"; };
1E1D823F15AC29BB00FE42E9 /* FileHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileHandler.h; sourceTree = "<group>"; };
1E365EE816120F4600BA335B /* ChartTranslationOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChartTranslationOptions.cpp; path = ../../moses/src/ChartTranslationOptions.cpp; sourceTree = "<group>"; };
1E365EE916120F4600BA335B /* ChartTranslationOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChartTranslationOptions.h; path = ../../moses/src/ChartTranslationOptions.h; sourceTree = "<group>"; };
1E619E9F15B8713600C2D7A7 /* ChartRuleLookupManagerMemoryPerSentence.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChartRuleLookupManagerMemoryPerSentence.cpp; path = ../../moses/src/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.cpp; sourceTree = "<group>"; };
1E619EA015B8713700C2D7A7 /* ChartRuleLookupManagerMemoryPerSentence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChartRuleLookupManagerMemoryPerSentence.h; path = ../../moses/src/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.h; sourceTree = "<group>"; };
1E6D9FBD15D027560064D436 /* BlockHashIndex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BlockHashIndex.cpp; path = ../../moses/src/CompactPT/BlockHashIndex.cpp; sourceTree = "<group>"; };
@ -401,8 +403,6 @@
1EC735E614B977AA00238410 /* ChartManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChartManager.cpp; path = ../../moses/src/ChartManager.cpp; sourceTree = "<group>"; };
1EC735E714B977AA00238410 /* ChartManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChartManager.h; path = ../../moses/src/ChartManager.h; sourceTree = "<group>"; };
1EC735E914B977AA00238410 /* ChartRuleLookupManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChartRuleLookupManager.h; path = ../../moses/src/ChartRuleLookupManager.h; sourceTree = "<group>"; };
1EC735EE14B977AA00238410 /* ChartTranslationOption.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChartTranslationOption.cpp; path = ../../moses/src/ChartTranslationOption.cpp; sourceTree = "<group>"; };
1EC735EF14B977AA00238410 /* ChartTranslationOption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChartTranslationOption.h; path = ../../moses/src/ChartTranslationOption.h; sourceTree = "<group>"; };
1EC735F214B977AA00238410 /* ChartTranslationOptionList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChartTranslationOptionList.cpp; path = ../../moses/src/ChartTranslationOptionList.cpp; sourceTree = "<group>"; };
1EC735F314B977AA00238410 /* ChartTranslationOptionList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChartTranslationOptionList.h; path = ../../moses/src/ChartTranslationOptionList.h; sourceTree = "<group>"; };
1EC735F414B977AA00238410 /* ChartTrellisDetour.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChartTrellisDetour.cpp; path = ../../moses/src/ChartTrellisDetour.cpp; sourceTree = "<group>"; };
@ -721,8 +721,8 @@
1EC735E614B977AA00238410 /* ChartManager.cpp */,
1EC735E714B977AA00238410 /* ChartManager.h */,
1EC735E914B977AA00238410 /* ChartRuleLookupManager.h */,
1EC735EE14B977AA00238410 /* ChartTranslationOption.cpp */,
1EC735EF14B977AA00238410 /* ChartTranslationOption.h */,
1E365EE816120F4600BA335B /* ChartTranslationOptions.cpp */,
1E365EE916120F4600BA335B /* ChartTranslationOptions.h */,
1EC735F214B977AA00238410 /* ChartTranslationOptionList.cpp */,
1EC735F314B977AA00238410 /* ChartTranslationOptionList.h */,
1EC735F414B977AA00238410 /* ChartTrellisDetour.cpp */,
@ -1118,7 +1118,6 @@
1EC7375814B977AB00238410 /* ChartHypothesisCollection.h in Headers */,
1EC7375A14B977AB00238410 /* ChartManager.h in Headers */,
1EC7375C14B977AB00238410 /* ChartRuleLookupManager.h in Headers */,
1EC7376214B977AB00238410 /* ChartTranslationOption.h in Headers */,
1EC7376614B977AB00238410 /* ChartTranslationOptionList.h in Headers */,
1EC7376814B977AB00238410 /* ChartTrellisDetour.h in Headers */,
1EC7376A14B977AB00238410 /* ChartTrellisDetourQueue.h in Headers */,
@ -1289,6 +1288,7 @@
1E6D9FED15D027560064D436 /* StringVector.h in Headers */,
1E6D9FEE15D027560064D436 /* TargetPhraseCollectionCache.h in Headers */,
1EC32DB915D2D90700A313B1 /* ThrowingFwrite.h in Headers */,
1E365EEB16120F4600BA335B /* ChartTranslationOptions.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1353,7 +1353,6 @@
1EC7375514B977AB00238410 /* ChartHypothesis.cpp in Sources */,
1EC7375714B977AB00238410 /* ChartHypothesisCollection.cpp in Sources */,
1EC7375914B977AB00238410 /* ChartManager.cpp in Sources */,
1EC7376114B977AB00238410 /* ChartTranslationOption.cpp in Sources */,
1EC7376514B977AB00238410 /* ChartTranslationOptionList.cpp in Sources */,
1EC7376714B977AB00238410 /* ChartTrellisDetour.cpp in Sources */,
1EC7376914B977AB00238410 /* ChartTrellisDetourQueue.cpp in Sources */,
@ -1488,6 +1487,7 @@
1E6D9FE915D027560064D436 /* PhraseDictionaryCompact.cpp in Sources */,
1E6D9FEB15D027560064D436 /* PhraseTableCreator.cpp in Sources */,
1EC32DB815D2D90700A313B1 /* ThrowingFwrite.cpp in Sources */,
1E365EEA16120F4600BA335B /* ChartTranslationOptions.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
moses-chart-cmd/src/IOWrapper.cpp
View File

@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "PhraseDictionary.h"
#include "ChartTrellisPathList.h"
#include "ChartTrellisPath.h"
#include "ChartTranslationOption.h"
#include "ChartTranslationOptions.h"
#include "ChartHypothesis.h"

4
moses/src/ChartCell.cpp
View File

@ -27,7 +27,7 @@
#include "WordsRange.h"
#include "Util.h"
#include "StaticData.h"
#include "ChartTranslationOption.h"
#include "ChartTranslationOptions.h"
#include "ChartTranslationOptionList.h"
#include "ChartManager.h"
@ -96,7 +96,7 @@ void ChartCell::ProcessSentence(const ChartTranslationOptionList &transOptList
// add all trans opt into queue. using only 1st child node.
for (size_t i = 0; i < transOptList.GetSize(); ++i) {
const ChartTranslationOption &transOpt = transOptList.Get(i);
const ChartTranslationOptions &transOpt = transOptList.Get(i);
RuleCube *ruleCube = new RuleCube(transOpt, allChartCells, m_manager);
queue.Add(ruleCube);
}

4
moses/src/ChartHypothesis.cpp
View File

@ -29,7 +29,7 @@
#include "StaticData.h"
#include "DummyScoreProducers.h"
#include "LMList.h"
#include "ChartTranslationOption.h"
#include "ChartTranslationOptions.h"
#include "FFState.h"
namespace Moses
@ -44,7 +44,7 @@ ObjectPool<ChartHypothesis> ChartHypothesis::s_objectPool("ChartHypothesis", 300
* \param item @todo dunno
* \param manager reference back to manager
*/
ChartHypothesis::ChartHypothesis(const ChartTranslationOption &transOpt,
ChartHypothesis::ChartHypothesis(const ChartTranslationOptions &transOpt,
const RuleCubeItem &item,
ChartManager &manager)
:m_targetPhrase(*(item.GetTranslationDimension().GetTargetPhrase()))

4
moses/src/ChartHypothesis.h
View File

@ -25,7 +25,7 @@
#include "WordsRange.h"
#include "ScoreComponentCollection.h"
#include "Phrase.h"
#include "ChartTranslationOption.h"
#include "ChartTranslationOptions.h"
#include "ObjectPool.h"
namespace Moses
@ -91,7 +91,7 @@ public:
}
#endif
ChartHypothesis(const ChartTranslationOption &, const RuleCubeItem &item,
ChartHypothesis(const ChartTranslationOptions &, const RuleCubeItem &item,
ChartManager &manager);
~ChartHypothesis();

6
moses/src/ChartManager.cpp
View File

@ -140,13 +140,13 @@ void ChartManager::ProcessSentence()
* @todo check walls & zones. Check that the implementation doesn't leak, xml options sometimes does if you're not careful
*/
void ChartManager::AddXmlChartOptions() {
const std::vector <ChartTranslationOption*> xmlChartOptionsList = m_source.GetXmlChartTranslationOptions();
const std::vector <ChartTranslationOptions*> xmlChartOptionsList = m_source.GetXmlChartTranslationOptions();
IFVERBOSE(2) { cerr << "AddXmlChartOptions " << xmlChartOptionsList.size() << endl; }
if (xmlChartOptionsList.size() == 0) return;
for(std::vector<ChartTranslationOption*>::const_iterator i = xmlChartOptionsList.begin();
for(std::vector<ChartTranslationOptions*>::const_iterator i = xmlChartOptionsList.begin();
i != xmlChartOptionsList.end(); ++i) {
ChartTranslationOption* opt = *i;
ChartTranslationOptions* opt = *i;
Moses::Scores wordPenaltyScore(1, -0.434294482); // TODO what is this number?
opt->GetTargetPhraseCollection().GetCollection()[0]->SetScore((ScoreProducer*)m_system->GetWordPenaltyProducer(), wordPenaltyScore);

12
moses/src/ChartTranslationOptionList.cpp
View File

@ -21,7 +21,7 @@
#include <iostream>
#include "StaticData.h"
#include "ChartTranslationOptionList.h"
#include "ChartTranslationOption.h"
#include "ChartTranslationOptions.h"
#include "ChartCellCollection.h"
#include "WordsRange.h"
@ -49,7 +49,7 @@ void ChartTranslationOptionList::Clear()
class ChartTranslationOptionOrderer
{
public:
bool operator()(const ChartTranslationOption* itemA, const ChartTranslationOption* itemB) const {
bool operator()(const ChartTranslationOptions* itemA, const ChartTranslationOptions* itemB) const {
return itemA->GetEstimateOfBestScore() > itemB->GetEstimateOfBestScore();
}
};
@ -62,7 +62,7 @@ void ChartTranslationOptionList::Add(const TargetPhraseCollection &tpc,
return;
}
float score = ChartTranslationOption::CalcEstimateOfBestScore(tpc, stackVec);
float score = ChartTranslationOptions::CalcEstimateOfBestScore(tpc, stackVec);
// If the rule limit has already been reached then don't add the option
// unless it is better than at least one existing option.
@ -73,11 +73,11 @@ void ChartTranslationOptionList::Add(const TargetPhraseCollection &tpc,
// Add the option to the list.
if (m_size == m_collection.size()) {
// m_collection has reached capacity: create a new object.
m_collection.push_back(new ChartTranslationOption(tpc, stackVec,
m_collection.push_back(new ChartTranslationOptions(tpc, stackVec,
range, score));
} else {
// Overwrite an unused object.
*(m_collection[m_size]) = ChartTranslationOption(tpc, stackVec,
*(m_collection[m_size]) = ChartTranslationOptions(tpc, stackVec,
range, score);
}
++m_size;
@ -122,7 +122,7 @@ void ChartTranslationOptionList::ApplyThreshold()
CollType::const_iterator iter;
for (iter = m_collection.begin(); iter != m_collection.begin()+m_size; ++iter) {
const ChartTranslationOption *transOpt = *iter;
const ChartTranslationOptions *transOpt = *iter;
float score = transOpt->GetEstimateOfBestScore();
scoreThreshold = (score > scoreThreshold) ? score : scoreThreshold;
}

8
moses/src/ChartTranslationOptionList.h
View File

@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#pragma once
#include "ChartTranslationOption.h"
#include "ChartTranslationOptions.h"
#include "StackVec.h"
#include <vector>
@ -37,7 +37,7 @@ class ChartTranslationOptionList
ChartTranslationOptionList(size_t);
~ChartTranslationOptionList();
const ChartTranslationOption &Get(size_t i) const { return *m_collection[i]; }
const ChartTranslationOptions &Get(size_t i) const { return *m_collection[i]; }
//! number of translation options
size_t GetSize() const { return m_size; }
@ -50,12 +50,12 @@ class ChartTranslationOptionList
void ApplyThreshold();
private:
typedef std::vector<ChartTranslationOption*> CollType;
typedef std::vector<ChartTranslationOptions*> CollType;
struct ScoreThresholdPred
{
ScoreThresholdPred(float threshold) : m_thresholdScore(threshold) {}
bool operator()(const ChartTranslationOption *option)
bool operator()(const ChartTranslationOptions *option)
{
return option->GetEstimateOfBestScore() >= m_thresholdScore;
}

4
moses/src/ChartTranslationOption.cpp → moses/src/ChartTranslationOptions.cpp
View File

@ -17,14 +17,14 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
***********************************************************************/
#include "ChartTranslationOption.h"
#include "ChartTranslationOptions.h"
#include "ChartHypothesis.h"
namespace Moses
{
float ChartTranslationOption::CalcEstimateOfBestScore(
float ChartTranslationOptions::CalcEstimateOfBestScore(
const TargetPhraseCollection &tpc,
const StackVec &stackVec)
{

6
moses/src/ChartTranslationOption.h → moses/src/ChartTranslationOptions.h
View File

@ -33,7 +33,7 @@ namespace Moses
/** Similar to a DottedRule, but contains a direct reference to a list
* of translations and provdes an estimate of the best score. For a specific range in the input sentence
*/
class ChartTranslationOption
class ChartTranslationOptions
{
public:
/** Constructor
@ -42,7 +42,7 @@ class ChartTranslationOption
\param wordsRange the range in the source sentence this translation option covers
\param score @todo dunno
*/
ChartTranslationOption(const TargetPhraseCollection &targetPhraseColl,
ChartTranslationOptions(const TargetPhraseCollection &targetPhraseColl,
const StackVec &stackVec,
const WordsRange &wordsRange,
float score)
@ -52,7 +52,7 @@ class ChartTranslationOption
, m_estimateOfBestScore(score)
{}
~ChartTranslationOption() {}
~ChartTranslationOptions() {}
static float CalcEstimateOfBestScore(const TargetPhraseCollection &,
const StackVec &);

6
moses/src/InputType.cpp
View File

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <cstdlib>
#include "InputType.h"
#include "ChartTranslationOption.h"
#include "ChartTranslationOptions.h"
namespace Moses
{
@ -61,10 +61,10 @@ bool InputType::CanIGetFromAToB(size_t /*start*/, size_t /*end*/) const
return true;
}
std::vector <ChartTranslationOption*> InputType::GetXmlChartTranslationOptions() const
std::vector <ChartTranslationOptions*> InputType::GetXmlChartTranslationOptions() const
{
// default. return nothing
std::vector <ChartTranslationOption*> ret;
std::vector <ChartTranslationOptions*> ret;
return ret;
}

4
moses/src/InputType.h
View File

@ -38,7 +38,7 @@ class Factor;
class PhraseDictionary;
class TranslationOptionCollection;
class TranslationSystem;
class ChartTranslationOption;
class ChartTranslationOptions;
/** base class for all types of inputs to the decoder,
* eg. sentences, confusion networks, lattices and tree
@ -133,7 +133,7 @@ public:
virtual const NonTerminalSet &GetLabelSet(size_t startPos, size_t endPos) const = 0;
virtual std::vector <ChartTranslationOption*> GetXmlChartTranslationOptions() const;
virtual std::vector <ChartTranslationOptions*> GetXmlChartTranslationOptions() const;
TO_STRING();

4
moses/src/RuleCube.cpp
View File

@ -21,7 +21,7 @@
#include "ChartCell.h"
#include "ChartCellCollection.h"
#include "ChartTranslationOption.h"
#include "ChartTranslationOptions.h"
#include "RuleCube.h"
#include "RuleCubeQueue.h"
#include "StaticData.h"
@ -34,7 +34,7 @@ namespace Moses
{
// initialise the RuleCube by creating the top-left corner item
RuleCube::RuleCube(const ChartTranslationOption &transOpt,
RuleCube::RuleCube(const ChartTranslationOptions &transOpt,
const ChartCellCollection &allChartCells,
ChartManager &manager)
: m_transOpt(transOpt)

8
moses/src/RuleCube.h
View File

@ -37,7 +37,7 @@ namespace Moses
class ChartCellCollection;
class ChartManager;
class ChartTranslationOption;
class ChartTranslationOptions;
/** Define an ordering between RuleCubeItems based on their scores.
* This is used to order items in the cube's priority queue.
@ -91,7 +91,7 @@ class RuleCubeItemEqualityPred
class RuleCube
{
public:
RuleCube(const ChartTranslationOption &, const ChartCellCollection &,
RuleCube(const ChartTranslationOptions &, const ChartCellCollection &,
ChartManager &);
~RuleCube();
@ -106,7 +106,7 @@ class RuleCube
bool IsEmpty() const { return m_queue.empty(); }
const ChartTranslationOption &GetTranslationOption() const {
const ChartTranslationOptions &GetTranslationOption() const {
return m_transOpt;
}
@ -131,7 +131,7 @@ class RuleCube
void CreateNeighbors(const RuleCubeItem &, ChartManager &);
void CreateNeighbor(const RuleCubeItem &, int, ChartManager &);
const ChartTranslationOption &m_transOpt;
const ChartTranslationOptions &m_transOpt;
ItemSet m_covered;
Queue m_queue;
};

6
moses/src/RuleCubeItem.cpp
View File

@ -19,7 +19,7 @@
#include "ChartCell.h"
#include "ChartCellCollection.h"
#include "ChartTranslationOption.h"
#include "ChartTranslationOptions.h"
#include "RuleCubeItem.h"
#include "RuleCubeQueue.h"
#include "WordsRange.h"
@ -36,7 +36,7 @@ std::size_t hash_value(const HypothesisDimension &dimension)
return hasher(dimension.GetHypothesis());
}
RuleCubeItem::RuleCubeItem(const ChartTranslationOption &transOpt,
RuleCubeItem::RuleCubeItem(const ChartTranslationOptions &transOpt,
const ChartCellCollection &/*allChartCells*/)
: m_translationDimension(0,
transOpt.GetTargetPhraseCollection().GetCollection())
@ -74,7 +74,7 @@ void RuleCubeItem::EstimateScore()
}
}
void RuleCubeItem::CreateHypothesis(const ChartTranslationOption &transOpt,
void RuleCubeItem::CreateHypothesis(const ChartTranslationOptions &transOpt,
ChartManager &manager)
{
m_hypothesis = new ChartHypothesis(transOpt, *this, manager);

6
moses/src/RuleCubeItem.h
View File

@ -29,7 +29,7 @@ namespace Moses
class ChartCellCollection;
class ChartHypothesis;
class ChartManager;
class ChartTranslationOption;
class ChartTranslationOptions;
class TargetPhrase;
typedef std::vector<const ChartHypothesis*> HypoList;
@ -110,7 +110,7 @@ std::size_t hash_value(const HypothesisDimension &);
class RuleCubeItem
{
public:
RuleCubeItem(const ChartTranslationOption &, const ChartCellCollection &);
RuleCubeItem(const ChartTranslationOptions &, const ChartCellCollection &);
RuleCubeItem(const RuleCubeItem &, int);
~RuleCubeItem();
@ -126,7 +126,7 @@ class RuleCubeItem
void EstimateScore();
void CreateHypothesis(const ChartTranslationOption &, ChartManager &);
void CreateHypothesis(const ChartTranslationOptions &, ChartManager &);
ChartHypothesis *ReleaseHypothesis();

2
moses/src/TreeInput.cpp
View File

@ -288,7 +288,7 @@ int TreeInput::Read(std::istream& in,const std::vector<FactorType>& factorOrder)
TargetPhraseCollection *tpc = new TargetPhraseCollection;
tpc->Add(targetPhrase);
ChartTranslationOption *transOpt = new ChartTranslationOption(*tpc, emptyStackVec, *range, 0.0f);
ChartTranslationOptions *transOpt = new ChartTranslationOptions(*tpc, emptyStackVec, *range, 0.0f);
m_xmlChartOptionsList.push_back(transOpt);
//TODO: needed to handle exclusive

6
moses/src/TreeInput.h
View File

@ -4,7 +4,7 @@
#include <vector>
#include "Sentence.h"
#include "ChartTranslationOption.h"
#include "ChartTranslationOptions.h"
namespace Moses
{
@ -32,7 +32,7 @@ class TreeInput : public Sentence
protected:
std::vector<std::vector<NonTerminalSet> > m_sourceChart;
std::vector <ChartTranslationOption*> m_xmlChartOptionsList;
std::vector <ChartTranslationOptions*> m_xmlChartOptionsList;
void AddChartLabel(size_t startPos, size_t endPos, const std::string &label
,const std::vector<FactorType>& factorOrder);
@ -65,7 +65,7 @@ public:
return m_sourceChart[startPos][endPos - startPos];
}
std::vector <ChartTranslationOption*> GetXmlChartTranslationOptions() const {
std::vector <ChartTranslationOptions*> GetXmlChartTranslationOptions() const {
return m_xmlChartOptionsList;
};
};