[mlpack-git] master: Refactor for shorter lines. (4551dd0)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/386138b3172e0485aced365cb31e4f5b13c3bd7d...086a75de129a97ff575c555630084c583b8ae15c

>---------------------------------------------------------------

commit 4551dd09d7170723afb0adfa9cf50a3dbf6b7b30
Author: Ryan Curtin <ryan at ratml.org>
Date:   Mon Mar 14 13:42:06 2016 -0700

    Refactor for shorter lines.


>---------------------------------------------------------------

4551dd09d7170723afb0adfa9cf50a3dbf6b7b30
 src/mlpack/core/util/timers.cpp | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/mlpack/core/util/timers.cpp b/src/mlpack/core/util/timers.cpp
index d23ae8a..25a8fc4 100644
--- a/src/mlpack/core/util/timers.cpp
+++ b/src/mlpack/core/util/timers.cpp
@@ -61,19 +61,24 @@ bool Timers::GetState(std::string timerName)
 
 void Timers::PrintTimer(const std::string& timerName)
 {
-  std::chrono::microseconds totalDuration = timers[timerName];
-  // Converting microseconds to seconds
-  std::chrono::seconds totalDurationSec = std::chrono::duration_cast<std::chrono::seconds>(totalDuration);
-  std::chrono::microseconds totalDurationMicroSec = std::chrono::duration_cast<std::chrono::microseconds>(totalDuration % std::chrono::seconds(1));
-  Log::Info << totalDurationSec.count() << "." << std::setw(6) << std::setfill('0')
-      << totalDurationMicroSec.count() << "s";
+  // To make things shorter.
+  using std::chrono;
+
+  microseconds totalDuration = timers[timerName];
+  // Convert microseconds to seconds.
+  seconds totalDurationSec = duration_cast<seconds>(totalDuration);
+  microseconds totalDurationMicroSec =
+      duration_cast<microseconds>(totalDuration % seconds(1));
+  Log::Info << totalDurationSec.count() << "." << std::setw(6)
+      << std::setfill('0') << totalDurationMicroSec.count() << "s";
 
   // Also output convenient day/hr/min/sec.
-  // The following line is a custom duration for a day
-  std::chrono::duration<int, std::ratio<60*60*24,1> > days = std::chrono::duration_cast<std::chrono::duration<int, std::ratio<60*60*24,1> > >(totalDuration); // Integer division rounds down.
-  std::chrono::hours hours = std::chrono::duration_cast<std::chrono::hours>(totalDuration % std::chrono::duration<int, std::ratio<60*60*24,1> >(1));
-  std::chrono::minutes minutes = std::chrono::duration_cast<std::chrono::minutes>(totalDuration % std::chrono::hours(1));
-  std::chrono::seconds seconds = std::chrono::duration_cast<std::chrono::seconds>(totalDuration % std::chrono::minutes(1));
+  // The following line is a custom duration for a day.
+  typedef duration<int, std::ratio<60 * 60 * 24, 1>> days;
+  days days = duration_cast<days>(totalDuration);
+  hours hours = duration_cast<hours>(totalDuration % days(1));
+  minutes minutes = duration_cast<minutes>(totalDuration % hours(1));
+  seconds seconds = duration_cast<seconds>(totalDuration % minutes(1));
   // No output if it didn't even take a minute.
   if (!(days.count() == 0 && hours.count() == 0 && minutes.count() == 0))
   {
@@ -107,8 +112,8 @@ void Timers::PrintTimer(const std::string& timerName)
     {
       if (output)
         Log::Info << ", ";
-      Log::Info << seconds.count() << "." << std::setw(1) << (totalDurationMicroSec.count() / 100000) <<
-          "secs";
+      Log::Info << seconds.count() << "." << std::setw(1)
+          << (totalDurationMicroSec.count() / 100000) << " secs";
       output = true;
     }