Context weights now live in the ContextScope, not any more on TranslationTask.

TargetPhrase now has weak ptr to ContextScope, not to TranslationTask any more,
because TargetPhrases can outlive the scope of a Translation Task.

1 files changed, 19 insertions, 9 deletions

diff --git a/moses/Phrase.h b/moses/Phrase.h
index 72454595f..8fd3911d3 100644
--- a/moses/Phrase.h
+++ b/moses/Phrase.h
@@ -1,4 +1,4 @@
-// $Id$
+// -*- mode: c++; indent-tabs-mode: nil; tab-width:2  -*-
 // vim:tabstop=2
 
 /***********************************************************************
@@ -40,6 +40,7 @@ namespace Moses
 {
 class FactorMask;
 class Range;
+class ContextScope;
 
 /** Representation of a phrase, ie. a contiguous number of words.
  *  Wrapper for vector of words
@@ -53,17 +54,26 @@ protected:
 
 public:
 
-  /// return shared pointer to ttask
-  //  only TargetPhrases have non-NULL ttaskptrs!
-  virtual ttasksptr GetTtask() const {
-    return ttasksptr();
-  }
+  // /// return shared pointer to ttask
+  // //  only TargetPhrases have non-NULL ttaskptrs!
+  // virtual ttasksptr GetTtask() const {
+  //   return ttasksptr();
+  // }
+
+  // /// check if this phrase belongs to a valid ttask
+  // //  only TargetPhrases have non-NULL ttaskptrs!
+  // virtual bool HasTtaskSPtr() const {
+  //   return false;
+  // }
 
-  /// check if this phrase belongs to a valid ttask
-  //  only TargetPhrases have non-NULL ttaskptrs!
-  virtual bool HasTtaskSPtr() const {
+  virtual bool HasScope() const {
     return false;
   }
+  
+  virtual SPTR<ContextScope> GetScope() const {
+    return SPTR<ContextScope>();
+  }
+  
 
   /** No longer does anything as not using mem pool for Phrase class anymore */
   static void InitializeMemPool();