diff --git a/gtsam/base/timing.cpp b/gtsam/base/timing.cpp index 83556cbd2..57321b0b0 100644 --- a/gtsam/base/timing.cpp +++ b/gtsam/base/timing.cpp @@ -107,7 +107,7 @@ void TimingOutline::print(const std::string& outline) const { } /* ************************************************************************* */ -void TimingOutline::print_csv_header(bool addLineBreak) const { +void TimingOutline::printCsvHeader(bool addLineBreak) const { #ifdef GTSAM_USE_BOOST_FEATURES // Order is (CPU time, number of times, wall time, time + children in seconds, // min time, max time) @@ -116,14 +116,14 @@ void TimingOutline::print_csv_header(bool addLineBreak) const { << "," << label_ + " min time (s)" << "," << label_ + "max time(s)" << ","; // Order children - typedef FastMap > ChildOrder; + typedef FastMap> ChildOrder; ChildOrder childOrder; for (const ChildMap::value_type& child : children_) { childOrder[child.second->myOrder_] = child.second; } // Print children for (const ChildOrder::value_type& order_child : childOrder) { - order_child.second->print_csv_header(); + order_child.second->printCsvHeader(); } if (addLineBreak) { std::cout << std::endl; @@ -133,21 +133,21 @@ void TimingOutline::print_csv_header(bool addLineBreak) const { } /* ************************************************************************* */ -void TimingOutline::print_csv(bool addLineBreak) const { +void TimingOutline::printCsv(bool addLineBreak) const { #ifdef GTSAM_USE_BOOST_FEATURES // Order is (CPU time, number of times, wall time, time + children in seconds, // min time, max time) std::cout << self() << "," << n_ << "," << wall() << "," << secs() << "," << min() << "," << max() << ","; // Order children - typedef FastMap > ChildOrder; + typedef FastMap> ChildOrder; ChildOrder childOrder; for (const ChildMap::value_type& child : children_) { childOrder[child.second->myOrder_] = child.second; } // Print children for (const ChildOrder::value_type& order_child : childOrder) { - order_child.second->print_csv(false); + order_child.second->printCsv(false); } if (addLineBreak) { std::cout << std::endl; diff --git a/gtsam/base/timing.h b/gtsam/base/timing.h index dfc2928f1..4f484039d 100644 --- a/gtsam/base/timing.h +++ b/gtsam/base/timing.h @@ -209,7 +209,7 @@ namespace gtsam { * @param addLineBreak Flag indicating if a line break should be added at * the end. Only used at the top-leve. */ - GTSAM_EXPORT void print_csv_header(bool addLineBreak = false) const; + GTSAM_EXPORT void printCsvHeader(bool addLineBreak = false) const; /** * @brief Print the times recursively from parent to child in CSV format. @@ -220,7 +220,7 @@ namespace gtsam { * @param addLineBreak Flag indicating if a line break should be added at * the end. Only used at the top-leve. */ - GTSAM_EXPORT void print_csv(bool addLineBreak = false) const; + GTSAM_EXPORT void printCsv(bool addLineBreak = false) const; GTSAM_EXPORT const std::shared_ptr& child(size_t child, const std::string& label, const std::weak_ptr& thisPtr); @@ -292,11 +292,11 @@ inline void tictoc_print_() { ::gtsam::internal::gTimingRoot->print(); } // print timing in CSV format -inline void tictoc_print_csv_(bool displayHeader = false) { +inline void tictoc_printCsv_(bool displayHeader = false) { if (displayHeader) { - ::gtsam::internal::gTimingRoot->print_csv_header(true); + ::gtsam::internal::gTimingRoot->printCsvHeader(true); } - ::gtsam::internal::gTimingRoot->print_csv(true); + ::gtsam::internal::gTimingRoot->printCsv(true); } // print mean and standard deviation