mert: Prefix private members with "m_" except TER.

Squashed commit of the following:

- Clean up PRO.
- Clean up ScoreStats.
- Clean up ScoreData.
- Clean up ScoreArray.
- Remove unnecessary headers.
- Clean up ScopedVector.
- Clean up Point.
- Clean up PerScorer.
- Clean up Optimizer.
- Clean up MergeScorer.
- Clean up InterpolatedScorer.
- Clean up FileStream.
- Clean up FeatureStats.
- Remove inefficient string concatenation.
- Clean up FeatureData.
- Clean up FeatureArray.
- Clean up Data.

1 files changed, 10 insertions, 17 deletions

diff --git a/mert/InterpolatedScorer.h b/mert/InterpolatedScorer.h
index 2a538bc39..5f76be538 100644
--- a/mert/InterpolatedScorer.h
+++ b/mert/InterpolatedScorer.h
@@ -1,14 +1,6 @@
-#ifndef __INTERPOLATED_SCORER_H__
-#define __INTERPOLATED_SCORER_H__
-
-#include <algorithm>
-#include <cmath>
-#include <iostream>
-#include <iterator>
-#include <limits>
-#include <set>
-#include <sstream>
-#include <stdexcept>
+#ifndef MERT_INTERPOLATED_SCORER_H_
+#define MERT_INTERPOLATED_SCORER_H_
+
 #include <string>
 #include <vector>
 #include "Types.h"
@@ -33,12 +25,13 @@ public:
   virtual void prepareStats(size_t sid, const string& text, ScoreStats& entry);
 
   virtual size_t NumberOfScores() const {
-    size_t sz=0;
-    for (ScopedVector<Scorer>::const_iterator itsc = _scorers.begin(); itsc != _scorers.end(); itsc++) {
+    size_t sz = 0;
+    for (ScopedVector<Scorer>::const_iterator itsc = m_scorers.begin();
+         itsc != m_scorers.end(); ++itsc) {
       sz += (*itsc)->NumberOfScores();
     }
     return sz;
-  };
+  }
 
   virtual void setScoreData(ScoreData* data);
 
@@ -48,13 +41,13 @@ public:
   virtual void setFactors(const string& factors);
 
 protected:
-  ScopedVector<Scorer> _scorers;
+  ScopedVector<Scorer> m_scorers;
 
   // Take the ownership of the heap-allocated the objects
   // by Scorer objects.
   ScopedVector<ScoreData> m_scorers_score_data;
 
-  vector<float> _scorerWeights;
+  vector<float> m_scorer_weights;
 };
 
-#endif //__INTERPOLATED_SCORER_H
+#endif  // MERT_INTERPOLATED_SCORER_H_