From 45244d3ffdfc01537fba88df8f03501088fafc53 Mon Sep 17 00:00:00 2001 From: mxie32 Date: Sun, 16 Jun 2019 10:31:35 -0400 Subject: [PATCH] move cout string to print function --- gtsam/linear/VectorValues.cpp | 3 +-- gtsam/linear/tests/testVectorValues.cpp | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtsam/linear/VectorValues.cpp b/gtsam/linear/VectorValues.cpp index 976f65971..1d2ce3847 100644 --- a/gtsam/linear/VectorValues.cpp +++ b/gtsam/linear/VectorValues.cpp @@ -130,8 +130,6 @@ namespace gtsam { /* ************************************************************************* */ ostream& operator<<(ostream& os, const VectorValues& v) { - os << "VectorValues" - << ": " << v.size() << " elements\n"; // Change print depending on whether we are using TBB #ifdef GTSAM_USE_TBB map sorted; @@ -152,6 +150,7 @@ namespace gtsam { /* ************************************************************************* */ void VectorValues::print(const string& str, const KeyFormatter& formatter) const { + cout << str << ": " << size() << " elements\n"; cout << *this; cout.flush(); } diff --git a/gtsam/linear/tests/testVectorValues.cpp b/gtsam/linear/tests/testVectorValues.cpp index 2f7e0a35c..af6be8aa9 100644 --- a/gtsam/linear/tests/testVectorValues.cpp +++ b/gtsam/linear/tests/testVectorValues.cpp @@ -239,9 +239,10 @@ TEST(VectorValues, print) vv.insert(2, Vector2(4, 5)); vv.insert(5, Vector2(6, 7)); vv.insert(7, Vector2(8, 9)); + vv.print(); string expected = - "VectorValues: 5 elements\n 0: 1\n 1: 2 3\n 2: 4 5\n 5: 6 7\n 7: 8 9\n"; + " 0: 1\n 1: 2 3\n 2: 4 5\n 5: 6 7\n 7: 8 9\n"; stringstream actual; actual << vv; EXPECT(expected == actual.str());