12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed expected, actual nomenclature in assert_equal: always use (expected, equal) order

release/4.3a0
Frank Dellaert 2009-12-08 13:53:33 +00:00
parent 95260281d1
commit 152fa0069a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cpp/Matrix.cpp
View File

@ -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 n1 = expected.size2(), m1 = expected.size1();
size_t n2 = B.size2(), m2 = B.size1(); size_t n2 = actual.size2(), m2 = actual.size1();
cout << "not equal:" << endl; cout << "not equal:" << endl;
print(A,"actual = "); print(expected,"expected = ");
print(B,"expected = "); print(actual,"actual = ");
if(m1!=m2 || n1!=n2) if(m1!=m2 || n1!=n2)
cout << m1 << "," << n1 << " != " << m2 << "," << n2 << endl; cout << m1 << "," << n1 << " != " << m2 << "," << n2 << endl;
else else
print(A-B, "actual - expected = "); print(actual-expected, "actual - expected = ");
return false; return false;
} }

8
cpp/Vector.cpp
View File

@ -137,11 +137,11 @@ namespace gtsam {
} }
/* ************************************************************************* */ /* ************************************************************************* */
bool assert_equal(const Vector& vec1, const Vector& vec2, double tol) { bool assert_equal(const Vector& expected, const Vector& actual, double tol) {
if (equal_with_abs_tol(vec1,vec2,tol)) return true; if (equal_with_abs_tol(expected,actual,tol)) return true;
cout << "not equal:" << endl; cout << "not equal:" << endl;
print(vec1, "v1"); print(expected, "expected");
print(vec2, "v2"); print(actual, "actual");
return false; return false;
} }