Add const to return values of overloaded operators.

* This commit prevents developers from doing mistakes like:

  Point p1, p2, p4;
  if (p1 + p2 = p4) { // Bang! We actually wanted to compare
                      // the result of two points: (p1 + p2 == p4).
    // do something.
  }

See, e.g., http://www.gotw.ca/gotw/006.htm for details.

* Add more test cases according to this change.
* Move a helper function to compare floating point numbers
  to Util.h.

1 files changed, 0 insertions, 13 deletions

diff --git a/mert/BleuScorerTest.cpp b/mert/BleuScorerTest.cpp
index a40949d78..6b01da0ce 100644
--- a/mert/BleuScorerTest.cpp
+++ b/mert/BleuScorerTest.cpp
@@ -111,19 +111,6 @@ void SetUpReferences(BleuScorer& scorer) {
   }
 }
 
-const float kEPS = 0.0001f;
-
-template <typename T>
-bool IsAlmostEqual(T expected, T actual) {
-  if (abs(expected - actual) < kEPS) {
-    return true;
-  } else {
-    cerr << "Fail: expected = " << expected
-         << " (actual = " << actual << ")" << endl;
-    return false;
-  }
-}
-
 } // namespace
 
 BOOST_AUTO_TEST_CASE(bleu_reference_type) {