From 6743c4f6bcde90e1bcaa7b89b4da6a847abccbe3 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sat, 21 Jan 2023 20:26:06 -0800 Subject: [PATCH] Fixed some stragglers in timing --- gtsam_unstable/timing/timeDSFvariants.cpp | 3 +-- timing/timeCameraExpression.cpp | 1 - timing/timeSchurFactors.cpp | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gtsam_unstable/timing/timeDSFvariants.cpp b/gtsam_unstable/timing/timeDSFvariants.cpp index 3da01bfaf..35ae7d4d5 100644 --- a/gtsam_unstable/timing/timeDSFvariants.cpp +++ b/gtsam_unstable/timing/timeDSFvariants.cpp @@ -40,8 +40,7 @@ int main(int argc, char* argv[]) { os << "images,points,matches,Base,Map,BTree" << endl; // loop over number of images - vector ms; - ms += 10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 1000; + vector ms {10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 1000}; for(size_t m: ms) { // We use volatile here to make these appear to the optimizing compiler as // if their values are only known at run-time. diff --git a/timing/timeCameraExpression.cpp b/timing/timeCameraExpression.cpp index 07eeb1bcb..509294999 100644 --- a/timing/timeCameraExpression.cpp +++ b/timing/timeCameraExpression.cpp @@ -100,7 +100,6 @@ int main() { // Oct 3, 2014, Macbook Air // 9.0 musecs/call typedef PinholeCamera Camera; - typedef Expression Camera_; NonlinearFactor::shared_ptr g3 = boost::make_shared >(model, z, Point2_(myProject, x, p)); diff --git a/timing/timeSchurFactors.cpp b/timing/timeSchurFactors.cpp index 370486c5f..95296e80e 100644 --- a/timing/timeSchurFactors.cpp +++ b/timing/timeSchurFactors.cpp @@ -101,7 +101,7 @@ void timeAll(size_t m, size_t N) { { // Raw memory Version FastVector < Key > keys; for (size_t i = 0; i < m; i++) - keys += i; + keys.push_back(i); Vector x = xvalues.vector(keys); double* xdata = x.data(); @@ -144,7 +144,7 @@ int main(void) { // ms += 20, 30, 40, 50; // ms += 20,30,40,50,60,70,80,90,100; for (size_t m = 2; m <= 50; m += 2) - ms += m; + ms.push_back(m); //for (size_t m=10;m<=100;m+=10) ms += m; // loop over number of images for(size_t m: ms)