From f7d9710543e1a0d7f899159916d260afd92ecfd5 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Wed, 2 Dec 2020 06:13:35 -0500 Subject: [PATCH] remove using-namespace and fix print test --- gtsam/geometry/Cal3_S2Stereo.cpp | 11 +++++++++-- gtsam/geometry/tests/testCal3_S2.cpp | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gtsam/geometry/Cal3_S2Stereo.cpp b/gtsam/geometry/Cal3_S2Stereo.cpp index 43f0fb12f..3bf7c3468 100644 --- a/gtsam/geometry/Cal3_S2Stereo.cpp +++ b/gtsam/geometry/Cal3_S2Stereo.cpp @@ -20,7 +20,14 @@ #include namespace gtsam { -using namespace std; + +/* ************************************************************************* */ +std::ostream& operator<<(std::ostream& os, const Cal3_S2Stereo& cal) { + os << "{ fx: " << cal.fx() << ", fy: " << cal.fy() << ", s: " << cal.skew() + << ", px: " << cal.px() << ", py: " << cal.py() + << ", b: " << cal.baseline() << " }"; + return os; +} /* ************************************************************************* */ void Cal3_S2Stereo::print(const std::string& s) const { @@ -32,7 +39,7 @@ void Cal3_S2Stereo::print(const std::string& s) const { /* ************************************************************************* */ bool Cal3_S2Stereo::equals(const Cal3_S2Stereo& other, double tol) const { const Cal3_S2* base = dynamic_cast(&other); - return Cal3_S2::equals(*base, tol) && (std::fabs(b_ - other.baseline()) < tol); + return (Cal3_S2::equals(*base, tol) && std::fabs(b_ - other.baseline()) < tol); } /* ************************************************************************* */ diff --git a/gtsam/geometry/tests/testCal3_S2.cpp b/gtsam/geometry/tests/testCal3_S2.cpp index f7c8fb6b6..64e807aaf 100644 --- a/gtsam/geometry/tests/testCal3_S2.cpp +++ b/gtsam/geometry/tests/testCal3_S2.cpp @@ -131,8 +131,8 @@ TEST(Cal3_S2, between) { TEST(Cal3_S2, Print) { Cal3_S2 cal(5, 5, 5, 5, 5); std::stringstream os; - os << "{fx: " << cal.fx() << ", fy: " << cal.fy() << ", s:" << cal.skew() << ", px:" << cal.px() - << ", py:" << cal.py() << "}"; + os << "{ fx: " << cal.fx() << ", fy: " << cal.fy() << ", s: " << cal.skew() + << ", px: " << cal.px() << ", py: " << cal.py() << " }"; EXPECT(assert_stdout_equal(os.str(), cal)); }