Second working commit.

1 files changed, 11 insertions, 7 deletions

diff --git a/extractor/translation_table.h b/extractor/translation_table.h
index 6004eca0..acf94af7 100644
--- a/extractor/translation_table.h
+++ b/extractor/translation_table.h
@@ -15,24 +15,28 @@ namespace fs = boost::filesystem;
 class Alignment;
 class DataArray;
 
+typedef boost::hash<pair<int, int> > PairHash;
+
 class TranslationTable {
  public:
   TranslationTable(
       shared_ptr<DataArray> source_data_array,
       shared_ptr<DataArray> target_data_array,
-      const Alignment& alignment);
+      shared_ptr<Alignment> alignment);
 
-  double GetEgivenFScore(const string& source_word, const string& target_word);
+  double GetTargetGivenSourceScore(const string& source_word,
+                                   const string& target_word);
 
-  double GetFgivenEScore(const string& source_word, const string& target_word);
+  double GetSourceGivenTargetScore(const string& source_word,
+                                   const string& target_word);
 
   void WriteBinary(const fs::path& filepath) const;
 
  private:
-   shared_ptr<DataArray> source_data_array;
-   shared_ptr<DataArray> target_data_array;
-   unordered_map<pair<int, int>, pair<double, double>,
-      boost::hash<pair<int, int> > > translation_probabilities;
+  shared_ptr<DataArray> source_data_array;
+  shared_ptr<DataArray> target_data_array;
+  unordered_map<pair<int, int>, pair<double, double>, PairHash>
+      translation_probabilities;
 };
 
 #endif