Roll back to just tracking coordinates in mmsapt

(distance wants to be a separate FF)

1 files changed, 7 insertions, 2 deletions

diff --git a/moses/InputType.h b/moses/InputType.h
index 30b86180d..e2dce5147 100644
--- a/moses/InputType.h
+++ b/moses/InputType.h
@@ -68,8 +68,13 @@ public:
   size_t m_frontSpanCoveredLength;
   // how many words from the beginning are covered
 
-  // coordinates in some space, populated by xml tag "coord"
-  boost::shared_ptr<std::vector<float> > m_coord;
+  // Coordinates in user-defined spaces, indexed by phrase dictionary pointer
+  // Looking up PD* returns a vector of the input's coordinates in each space
+  // known to the PD, in order (vector of pointers to float vectors).  This
+  // allows different models to use different subsets of all named spaces.
+  typedef std::vector<boost::shared_ptr<std::vector<float> > > INCOORD;
+  typedef std::map<PhraseDictionary const*, INCOORD> PD2IC;
+  boost::shared_ptr<PD2IC> m_pd2InputCoord;
 
   InputType(AllOptions::ptr const& opts, long translationId = 0);
   virtual ~InputType();