rate value returned as double

Author: awegrzyn

src/DerivedMetrics.cxx

@@ -61,7 +61,7 @@ Metric DerivedMetrics::calculateRate(std::string name)
     throw MonitoringInternalException("DerivedMetrics/Calculate rate", "Division by 0");
   }
 
-  boost::variant< int, std::string, double, int64_t > rate =  boost::apply_visitor(VariantVisitorRate(timestampCount), current, previous);
+  auto rate =  boost::apply_visitor(VariantVisitorRate(timestampCount), current, previous);
   return Metric{rate, name + "Rate"};
 }
 

src/VariantVisitorRate.h

@@ -18,21 +18,21 @@ class VariantVisitorRate : public boost::static_visitor<boost::variant<int, std:
 
   /// Overloads operator() to avoid operating on strings
   /// \throws MonitoringInternalException
-  boost::variant<int, std::string, double, int64_t> operator()(const std::string& a, const std::string& b) const {
+  double operator()(const std::string& a, const std::string& b) const {
     throw MonitoringInternalException("DerivedMetrics/VariantRateVisitor", "Cannot operate on string values");
   }
 
   /// Calculates rate only when two arguments of the same type are passed
   /// \return calculated rate in Hz
   template<typename T>
-  boost::variant<int, std::string, double, int64_t> operator()(const T& a, const T& b) const {
-    return (1000*(a - b)) / timestampCount;
+  double operator()(const T& a, const T& b) const {
+    return static_cast<double>((1000*(a - b)) / timestampCount);
   }
 
   /// If arguments have different type an exception is raised
   /// \throws MonitoringInternalException
   template<typename T, typename U>
-  boost::variant<int, std::string, double, int64_t> operator()(const T& a, const U& b) const {
+  double operator()(const T& a, const U& b) const {
     throw MonitoringInternalException("DerivedMetrics/VariantRateVisitor", "Cannot operate on different types");
   }
 };

test/testDerived.cxx

@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(derivedRateInt)
       AliceO2::Monitoring::Metric metric(result.value, name);
       AliceO2::Monitoring::Metric derived = derivedHandler.processMetric(metric);
       BOOST_CHECK_EQUAL(derived.getName(), "metricIntRate");
-      BOOST_CHECK_EQUAL(boost::get<int>(derived.getValue()), result.rate);
+      BOOST_CHECK_EQUAL(boost::get<double>(derived.getValue()), result.rate);
     } catch(MonitoringInternalException &e) {
       BOOST_TEST(e.what() == std::string("Not enough values"));
     }
@@ -95,7 +95,7 @@ BOOST_AUTO_TEST_CASE(derivedRateInt64_t) {
       AliceO2::Monitoring::Metric metric(result.value, name);
       AliceO2::Monitoring::Metric derived = derivedHandler.processMetric(metric);
       BOOST_CHECK_EQUAL(derived.getName(), "metricInt64_tRate");
-      BOOST_CHECK_EQUAL(boost::get<int64_t>(derived.getValue()), result.rate);
+      BOOST_CHECK_EQUAL(boost::get<double>(derived.getValue()), result.rate);
     } catch(MonitoringInternalException &e) {
       BOOST_TEST(e.what() == std::string("Not enough values"));
     }