Vastly simplified IPX timer.h/cc

Author: jajhall

highs/ipm/ipx/timer.cc

@@ -7,26 +7,10 @@ Timer::Timer(const double offset)
     Reset(true);
 }
 
-double Timer::Elapsed() const {
-    return toc(t0_);
-}
-
 void Timer::Reset(const bool first) {
-    if (!first)
-      offset_ -= duration_cast<duration<double>>(t0_.time_since_epoch()).count();    
-    t0_ = tic();
-    if (!first) 
-      offset_ += duration_cast<duration<double>>(t0_.time_since_epoch()).count();
-}
-
-Timer::TimePoint Timer::tic() {
-    return high_resolution_clock::now();
-}
-
-double Timer::toc(TimePoint start) {
-    TimePoint end = tic();
-    duration<double> diff = end-start;
-    return diff.count();
+  if (!first) offset_ -= t0_;
+  t0_ = read();
+  if (!first) offset_ += t0_;
 }
 
 }  // namespace ipx

highs/ipm/ipx/timer.h

@@ -9,15 +9,13 @@ namespace ipx {
 class Timer {
 public:
     Timer(const double offset=0);
-    double Elapsed() const;
+    double Elapsed() const { return toc(t0_); }
     void Reset(const bool first = false);
 
 private:
-    typedef time_point<high_resolution_clock> TimePoint;
-    static TimePoint tic();
-    static double toc(TimePoint start);
+    static double toc(double start) { return read() - start; }
     static double read() { return duration_cast<duration<double>>(high_resolution_clock::now().time_since_epoch()).count(); }
-    TimePoint t0_;
+    double t0_;
 public:
     double offset_;
 };