- made output more compliant with old version

- added PerSCorer.h and BleuScorer.h
- stored feature names
- fixed bug about output of best Point


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1796 1f5c12ca-751b-0410-a591-d2e778427230

1 files changed, 23 insertions, 0 deletions

diff --git a/mert/Types.h b/mert/Types.h
index c826134d0..eb043f5e9 100644
--- a/mert/Types.h
+++ b/mert/Types.h
@@ -4,13 +4,36 @@
 #include <map>
 
 using namespace std;
+
+class FeatureStats;
+class FeatureArray;
+class FeatureData;
+class ScoreStats;
+class ScoreArray;
+class ScoreData;
+
 typedef float parameter_t;
 //typedef vector<parameter_t> parameters_t;confusing; use vector<parameter_t>
 typedef vector<pair<unsigned int, unsigned int> > diff_t;
 typedef pair<float,diff_t > threshold;
 typedef vector<diff_t> diffs_t;
 typedef vector<unsigned int> candidates_t;
+
 typedef float statscore_t;
 typedef vector<statscore_t> statscores_t;
 
+
+typedef float FeatureStatsType;
+typedef vector<FeatureStatsType> featstats_t;
+typedef vector<FeatureStats> featarray_t;
+typedef vector<FeatureArray> featdata_t;
+
+typedef int ScoreStatsType;
+typedef vector<ScoreStatsType> scorestats_t;
+typedef vector<ScoreStats> scorearray_t;
+typedef vector<ScoreArray> scoredata_t;
+
+typedef map<size_t, std::string> idx2name;
+typedef map<std::string, size_t> name2idx;
+
 #endif