From 152fa0069add40c04ce1a10b2d8277dab27383a1 Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Tue, 8 Dec 2009 13:53:33 +0000
Subject: [PATCH] fixed expected, actual nomenclature in assert_equal: always
 use (expected, equal) order

---
 cpp/Matrix.cpp | 14 +++++++-------
 cpp/Vector.cpp |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cpp/Matrix.cpp b/cpp/Matrix.cpp
index 610c0571d..8704fba55 100644
--- a/cpp/Matrix.cpp
+++ b/cpp/Matrix.cpp
@@ -106,20 +106,20 @@ bool equal_with_abs_tol(const Matrix& A, const Matrix& B, double tol) {
 }
 
 /* ************************************************************************* */
-bool assert_equal(const Matrix& A, const Matrix& B, double tol) {
+bool assert_equal(const Matrix& expected, const Matrix& actual, double tol) {
 
-  if (equal_with_abs_tol(A,B,tol)) return true;
+  if (equal_with_abs_tol(expected,actual,tol)) return true;
 
-  size_t n1 = A.size2(), m1 = A.size1();
-  size_t n2 = B.size2(), m2 = B.size1();
+  size_t n1 = expected.size2(), m1 = expected.size1();
+  size_t n2 = actual.size2(), m2 = actual.size1();
 
   cout << "not equal:" << endl;
-  print(A,"actual = ");
-  print(B,"expected = ");
+  print(expected,"expected = ");
+  print(actual,"actual = ");
   if(m1!=m2 || n1!=n2)
     cout << m1 << "," << n1 << " != " << m2 << "," << n2 << endl;
   else
-    print(A-B, "actual - expected = ");
+    print(actual-expected, "actual - expected = ");
   return false;
 }
 
diff --git a/cpp/Vector.cpp b/cpp/Vector.cpp
index ae6b99da4..662153f2c 100644
--- a/cpp/Vector.cpp
+++ b/cpp/Vector.cpp
@@ -137,11 +137,11 @@ namespace gtsam {
   }
   
   /* ************************************************************************* */
-  bool assert_equal(const Vector& vec1, const Vector& vec2, double tol) {
-    if (equal_with_abs_tol(vec1,vec2,tol)) return true;
+  bool assert_equal(const Vector& expected, const Vector& actual, double tol) {
+    if (equal_with_abs_tol(expected,actual,tol)) return true;
     cout << "not equal:" << endl;
-    print(vec1, "v1");
-    print(vec2, "v2");
+    print(expected, "expected");
+    print(actual, "actual");
     return false;
   }