change TargetPhraseVector from vector of TargetPhraseImpl to vector of TPCompact

3 files changed, 9 insertions, 9 deletions

diff --git a/contrib/moses2/TranslationModel/CompactPT/PhraseDecoder.cpp b/contrib/moses2/TranslationModel/CompactPT/PhraseDecoder.cpp
index 381ad6e72..8930bf94b 100644
--- a/contrib/moses2/TranslationModel/CompactPT/PhraseDecoder.cpp
+++ b/contrib/moses2/TranslationModel/CompactPT/PhraseDecoder.cpp
@@ -374,18 +374,18 @@ TargetPhraseVectorPtr PhraseDecoder::DecodeCollection(
             // false positive consistency check
             if(subTpv != NULL && rank < subTpv->size()) {
               // insert the subphrase into the main target phrase
-              const TargetPhraseImpl& subTp = *subTpv->at(rank);
+              const TPCompact& subTp = subTpv->at(rank);
               if(m_phraseDictionary.m_useAlignmentInfo) {
                 // reconstruct the alignment data based on the alignment of the subphrase
-                for(AlignmentInfo::const_iterator it = subTp.GetAlignTerm().begin();
-                    it != subTp.GetAlignTerm().end(); it++) {
+                for(std::set<AlignPointSizeT>::const_iterator it = subTp.alignment.begin();
+                    it != subTp.alignment.end(); it++) {
                   tpCompact.alignment.insert(AlignPointSizeT(srcStart + it->first,
                                                    tpCompact.words.size() + it->second));
                 }
               }
 
-              for (size_t i = 0; i < subTp.GetSize(); ++i) {
-                tpCompact.words.push_back(subTp[i]);
+              for (size_t i = 0; i < subTp.words.size(); ++i) {
+                tpCompact.words.push_back(subTp.words[i]);
               }
             } else
               return TargetPhraseVectorPtr();
diff --git a/contrib/moses2/TranslationModel/CompactPT/PhraseTableCompact.cpp b/contrib/moses2/TranslationModel/CompactPT/PhraseTableCompact.cpp
index 91a8e835e..bdb357234 100644
--- a/contrib/moses2/TranslationModel/CompactPT/PhraseTableCompact.cpp
+++ b/contrib/moses2/TranslationModel/CompactPT/PhraseTableCompact.cpp
@@ -103,9 +103,9 @@ TargetPhrases *PhraseTableCompact::Lookup(const Manager &mgr, MemPool &pool,
     cerr << "ret=" << ret->GetSize() << endl;
 
     for (size_t i = 0; i < decodedPhraseColl->size(); ++i) {
-      const TargetPhraseImpl *tp = decodedPhraseColl->at(i);
-      cerr << "tp=" << tp << endl;
-      ret->AddTargetPhrase(*tp);
+      //const TargetPhraseImpl *tp = decodedPhraseColl->at(i);
+      //cerr << "tp=" << tp << endl;
+      //ret->AddTargetPhrase(*tp);
     }
     ret->SortAndPrune(m_tableLimit);
 
diff --git a/contrib/moses2/TranslationModel/CompactPT/TargetPhraseCollectionCache.h b/contrib/moses2/TranslationModel/CompactPT/TargetPhraseCollectionCache.h
index 870cc5c60..601ac1bbe 100644
--- a/contrib/moses2/TranslationModel/CompactPT/TargetPhraseCollectionCache.h
+++ b/contrib/moses2/TranslationModel/CompactPT/TargetPhraseCollectionCache.h
@@ -44,7 +44,7 @@ struct TPCompact
 };
 
 // Avoid using new due to locking
-typedef std::vector<const TargetPhraseImpl*> TargetPhraseVector;
+typedef std::vector<TPCompact> TargetPhraseVector;
 typedef boost::shared_ptr<TargetPhraseVector> TargetPhraseVectorPtr;
 
 /** Implementation of Persistent Cache **/