diff --git a/mira/Main.cpp b/mira/Main.cpp index 3f310407c..75eb7eec3 100644 --- a/mira/Main.cpp +++ b/mira/Main.cpp @@ -47,6 +47,7 @@ namespace mpi = boost::mpi; #include "moses/FF/WordTranslationFeature.h" #include "moses/FF/PhrasePairFeature.h" #include "moses/FF/WordPenaltyProducer.h" +#include "moses/LM/Base.h" using namespace Mira; using namespace std; diff --git a/moses-chart-cmd/IOWrapper.cpp b/moses-chart-cmd/IOWrapper.cpp index f056a5464..21a325282 100644 --- a/moses-chart-cmd/IOWrapper.cpp +++ b/moses-chart-cmd/IOWrapper.cpp @@ -33,6 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. // example file on how to use moses library #include +#include #include "IOWrapper.h" #include "moses/TypeDef.h" #include "moses/Util.h" @@ -47,9 +48,8 @@ POSSIBILITY OF SUCH DAMAGE. #include "moses/ChartTranslationOptions.h" #include "moses/ChartHypothesis.h" #include "moses/FeatureVector.h" - -#include - +#include "moses/FF/StatefulFeatureFunction.h" +#include "moses/FF/StatelessFeatureFunction.h" using namespace std; using namespace Moses; diff --git a/moses-chart-cmd/Main.cpp b/moses-chart-cmd/Main.cpp index 6035ff67e..f40f77828 100644 --- a/moses-chart-cmd/Main.cpp +++ b/moses-chart-cmd/Main.cpp @@ -59,6 +59,8 @@ POSSIBILITY OF SUCH DAMAGE. #include "moses/ChartTrellisPath.h" #include "moses/ChartTrellisPathList.h" #include "moses/Incremental.h" +#include "moses/FF/StatefulFeatureFunction.h" +#include "moses/FF/StatelessFeatureFunction.h" #include "util/usage.hh" diff --git a/moses-chart-cmd/TranslationAnalysis.cpp b/moses-chart-cmd/TranslationAnalysis.cpp index df8a9be5c..964050fad 100644 --- a/moses-chart-cmd/TranslationAnalysis.cpp +++ b/moses-chart-cmd/TranslationAnalysis.cpp @@ -9,6 +9,9 @@ #include "moses/StaticData.h" #include "moses/TranslationOption.h" #include "moses/DecodeStepTranslation.h" +#include "moses/FF/StatefulFeatureFunction.h" +#include "moses/FF/StatelessFeatureFunction.h" +#include "moses/LM/Base.h" using namespace std; using namespace Moses; diff --git a/moses-cmd/Main.cpp b/moses-cmd/Main.cpp index 0bb9708d7..2d8a214d7 100644 --- a/moses-cmd/Main.cpp +++ b/moses-cmd/Main.cpp @@ -53,6 +53,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "moses/Timer.h" #include "moses/ThreadPool.h" #include "moses/OutputCollector.h" +#include "moses/TranslationModel/PhraseDictionary.h" +#include "moses/FF/StatefulFeatureFunction.h" +#include "moses/FF/StatelessFeatureFunction.h" #ifdef HAVE_PROTOBUF #include "hypergraph.pb.h" diff --git a/moses-cmd/TranslationAnalysis.cpp b/moses-cmd/TranslationAnalysis.cpp index bd7113096..e77486162 100644 --- a/moses-cmd/TranslationAnalysis.cpp +++ b/moses-cmd/TranslationAnalysis.cpp @@ -6,6 +6,9 @@ #include "moses/StaticData.h" #include "moses/Hypothesis.h" #include "TranslationAnalysis.h" +#include "moses/FF/StatefulFeatureFunction.h" +#include "moses/FF/StatelessFeatureFunction.h" +#include "moses/LM/Base.h" using namespace Moses; diff --git a/moses/BitmapContainer.h b/moses/BitmapContainer.h index 1475e9d62..51f1659ef 100644 --- a/moses/BitmapContainer.h +++ b/moses/BitmapContainer.h @@ -42,6 +42,7 @@ class Hypothesis; class HypothesisStackCubePruning; class HypothesisQueueItem; class QueueItemOrderer; +class TranslationOptionList; typedef std::vector< Hypothesis* > HypothesisSet; typedef std::set< BackwardsEdge* > BackwardsEdgeSet; diff --git a/moses/ChartHypothesis.cpp b/moses/ChartHypothesis.cpp index 18811a97f..1cff9046d 100644 --- a/moses/ChartHypothesis.cpp +++ b/moses/ChartHypothesis.cpp @@ -29,6 +29,8 @@ #include "StaticData.h" #include "ChartTranslationOptions.h" #include "moses/FF/FFState.h" +#include "moses/FF/StatefulFeatureFunction.h" +#include "moses/FF/StatelessFeatureFunction.h" using namespace std; diff --git a/moses/ChartParser.cpp b/moses/ChartParser.cpp index e909ad5a0..84871bade 100644 --- a/moses/ChartParser.cpp +++ b/moses/ChartParser.cpp @@ -25,7 +25,9 @@ #include "StaticData.h" #include "TreeInput.h" #include "Sentence.h" +#include "DecodeGraph.h" #include "moses/FF/UnknownWordPenaltyProducer.h" +#include "moses/TranslationModel/PhraseDictionary.h" using namespace std; using namespace Moses; diff --git a/moses/DecodeStep.cpp b/moses/DecodeStep.cpp index 6d76e0927..1327968e2 100644 --- a/moses/DecodeStep.cpp +++ b/moses/DecodeStep.cpp @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "DecodeStep.h" #include "GenerationDictionary.h" #include "StaticData.h" +#include "moses/TranslationModel/PhraseDictionary.h" namespace Moses { diff --git a/moses/FF/PhraseBoundaryFeature.cpp b/moses/FF/PhraseBoundaryFeature.cpp index 72a37aa57..a398fdc6a 100644 --- a/moses/FF/PhraseBoundaryFeature.cpp +++ b/moses/FF/PhraseBoundaryFeature.cpp @@ -2,6 +2,7 @@ #include "moses/Hypothesis.h" #include "moses/TranslationOption.h" +#include "moses/InputPath.h" using namespace std; diff --git a/moses/FF/PhrasePairFeature.cpp b/moses/FF/PhrasePairFeature.cpp index 017099371..564d131ba 100644 --- a/moses/FF/PhrasePairFeature.cpp +++ b/moses/FF/PhrasePairFeature.cpp @@ -5,6 +5,7 @@ #include "moses/TargetPhrase.h" #include "moses/Hypothesis.h" #include "moses/TranslationOption.h" +#include "moses/InputPath.h" #include "util/string_piece_hash.hh" #include "util/exception.hh" diff --git a/moses/FF/WordTranslationFeature.cpp b/moses/FF/WordTranslationFeature.cpp index ebedf2388..e45659cde 100644 --- a/moses/FF/WordTranslationFeature.cpp +++ b/moses/FF/WordTranslationFeature.cpp @@ -8,6 +8,7 @@ #include "moses/ScoreComponentCollection.h" #include "moses/TranslationOption.h" #include "moses/UserMessage.h" +#include "moses/InputPath.h" #include "util/string_piece_hash.hh" #include "util/exception.hh" diff --git a/moses/Hypothesis.cpp b/moses/Hypothesis.cpp index 52b1d040a..ba7953e62 100644 --- a/moses/Hypothesis.cpp +++ b/moses/Hypothesis.cpp @@ -34,6 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "InputType.h" #include "Manager.h" #include "moses/FF/FFState.h" +#include "moses/FF/StatefulFeatureFunction.h" +#include "moses/FF/StatelessFeatureFunction.h" using namespace std; diff --git a/moses/Manager.cpp b/moses/Manager.cpp index 197942222..ae9feecb7 100644 --- a/moses/Manager.cpp +++ b/moses/Manager.cpp @@ -40,6 +40,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "TranslationOptionCollection.h" #include "Timer.h" #include "moses/FF/DistortionScoreProducer.h" +#include "moses/LM/Base.h" +#include "moses/TranslationModel/PhraseDictionary.h" #ifdef HAVE_PROTOBUF #include "hypergraph.pb.h" diff --git a/moses/Search.h b/moses/Search.h index 6b3421248..90427f3c2 100644 --- a/moses/Search.h +++ b/moses/Search.h @@ -5,6 +5,7 @@ #include "TypeDef.h" #include "TranslationOption.h" #include "Phrase.h" +#include "InputPath.h" namespace Moses { diff --git a/moses/Sentence.cpp b/moses/Sentence.cpp index a9fb34e53..e90f7f6fb 100644 --- a/moses/Sentence.cpp +++ b/moses/Sentence.cpp @@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ***********************************************************************/ #include +#include #include "Sentence.h" #include "TranslationOptionCollectionText.h" @@ -28,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "ChartTranslationOptions.h" #include "Util.h" #include "XmlOption.h" -#include +#include "FactorCollection.h" using namespace std; diff --git a/moses/SentenceStats.cpp b/moses/SentenceStats.cpp index 18a6d0400..d865de4db 100644 --- a/moses/SentenceStats.cpp +++ b/moses/SentenceStats.cpp @@ -22,7 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include #include "SentenceStats.h" -#include "moses/TranslationOption.h" +#include "InputPath.h" +#include "TranslationOption.h" using std::cout; using std::endl; diff --git a/moses/StaticData.cpp b/moses/StaticData.cpp index ab1102846..f76aac4d3 100644 --- a/moses/StaticData.cpp +++ b/moses/StaticData.cpp @@ -1067,8 +1067,6 @@ void StaticData::OverrideFeatures() } -// check whether we should be using the old code to support binary phrase-table. -// eventually, we'll stop support the binary phrase-table and delete this legacy code void StaticData::CheckLEGACYPT() { for (size_t i = 0; i < m_phraseDictionary.size(); ++i) { diff --git a/moses/StaticData.h b/moses/StaticData.h index 62c6f64f7..d220518a0 100644 --- a/moses/StaticData.h +++ b/moses/StaticData.h @@ -39,14 +39,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #endif #include "TypeDef.h" -#include "FactorCollection.h" #include "Parameter.h" -#include "LM/Base.h" #include "SentenceStats.h" -#include "DecodeGraph.h" -#include "TranslationOptionList.h" #include "ScoreComponentCollection.h" -#include "moses/TranslationModel/PhraseDictionary.h" namespace Moses { @@ -54,6 +49,7 @@ namespace Moses class InputType; class PhraseDictionary; class GenerationDictionary; +class DecodeGraph; class DecodeStep; class WordPenaltyProducer; class UnknownWordPenaltyProducer; @@ -727,10 +723,6 @@ public: const PhraseDictionary*GetTranslationScoreProducer(size_t index) const { return GetPhraseDictionaries().at(index); } - std::vector GetTranslationWeights(size_t index) const { - std::vector weights = GetWeights(GetTranslationScoreProducer(index)); - return weights; - } const std::vector& GetDecodeGraphs() const { return m_decodeGraphs; @@ -754,6 +746,9 @@ public: return m_placeHolderFactor; } + /** check whether we should be using the old code to support binary phrase-table. + ** eventually, we'll stop support the binary phrase-table and delete this legacy code + **/ void CheckLEGACYPT(); bool GetUseLegacyPT() const { return m_useLegacyPT; } diff --git a/moses/TargetPhrase.cpp b/moses/TargetPhrase.cpp index bda687fc7..9fd3df0f3 100644 --- a/moses/TargetPhrase.cpp +++ b/moses/TargetPhrase.cpp @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "Util.h" #include "AlignmentInfoCollection.h" #include "InputPath.h" +#include "moses/TranslationModel/PhraseDictionary.h" using namespace std; diff --git a/moses/TranslationOptionCollectionConfusionNet.cpp b/moses/TranslationOptionCollectionConfusionNet.cpp index b548ecce9..190610eef 100644 --- a/moses/TranslationOptionCollectionConfusionNet.cpp +++ b/moses/TranslationOptionCollectionConfusionNet.cpp @@ -4,7 +4,7 @@ #include "TranslationOptionCollectionConfusionNet.h" #include "ConfusionNet.h" #include "WordLattice.h" -#include "DecodeStep.h" +#include "DecodeGraph.h" #include "DecodeStepTranslation.h" #include "DecodeStepGeneration.h" #include "FactorCollection.h" diff --git a/moses/TranslationOptionCollectionLattice.cpp b/moses/TranslationOptionCollectionLattice.cpp index 9585872f6..077c3eb38 100644 --- a/moses/TranslationOptionCollectionLattice.cpp +++ b/moses/TranslationOptionCollectionLattice.cpp @@ -4,7 +4,7 @@ #include "TranslationOptionCollectionLattice.h" #include "ConfusionNet.h" #include "WordLattice.h" -#include "DecodeStep.h" +#include "DecodeGraph.h" #include "DecodeStepTranslation.h" #include "DecodeStepGeneration.h" #include "FactorCollection.h" diff --git a/moses/TreeInput.cpp b/moses/TreeInput.cpp index dfa31e87e..434f58aa4 100644 --- a/moses/TreeInput.cpp +++ b/moses/TreeInput.cpp @@ -4,6 +4,7 @@ #include "StaticData.h" #include "Util.h" #include "XmlOption.h" +#include "FactorCollection.h" using namespace std; diff --git a/moses/Word.cpp b/moses/Word.cpp index 9c0946bf4..050d32260 100644 --- a/moses/Word.cpp +++ b/moses/Word.cpp @@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "Word.h" #include "TypeDef.h" #include "FactorTypeSet.h" +#include "FactorCollection.h" #include "StaticData.h" // needed to determine the FactorDelimiter #include "util/exception.hh" #include "util/tokenize_piece.hh" diff --git a/moses/XmlOption.cpp b/moses/XmlOption.cpp index 5a73f3bca..f44d8837c 100644 --- a/moses/XmlOption.cpp +++ b/moses/XmlOption.cpp @@ -29,6 +29,7 @@ #include "WordsRange.h" #include "TargetPhrase.h" #include "ReorderingConstraint.h" +#include "FactorCollection.h" namespace Moses {