Optimization for year and monthly data calculation.

[lib1wire.git] / src / DeviceData.hh

diff --git a/src/DeviceData.hh b/src/DeviceData.hh
index 367e00f0b1195ba484e7c4b1c78c67268d22c4c3..1ccbb4f29b9cd8ab64e2a7463692cb2f83a1b68a 100644 (file)
--- a/src/DeviceData.hh
+++ b/src/DeviceData.hh
@@ -17,24 +17,31 @@
 
 #include <time.h>
 
-namespace w1 {
+namespace plp {
        class DeviceData {
                public:
                        DeviceData(std::string device_id);
                        virtual ~DeviceData();
                        plp::DataRange *get_data_range();
-                       plp::DataRange *get_monthly_summary(plp::Date *date, EnumSummaryCalculationType calc_type);
                        /**
-                        * Get summary data calculated from the daily data items that is meaning full.
+                        * Get monthly summary data.
+                        * Depending from the device type, it may be daily mean value, daily delta, highest value, etc...
+                        */
+                       plp::DataRange *get_yearly_summary(plp::Date *date, EnumSummaryCalculationType calc_type);
+                       plp::DataRange *get_yearly_summary(plp::Date *date);
+                       plp::DataRange *get_yearly_summary(plp::Date *start_date, plp::Date *end_date);
+                       /**
+                        * Get monthly summary data.
                         * Depending from the device type, it may be daily mean value, daily delta, highest value, etc...
                         */
+                       plp::DataRange *get_monthly_summary(plp::Date *date, EnumSummaryCalculationType calc_type);
                        plp::DataRange *get_monthly_summary(plp::Date *date);
                        plp::DataRange *get_monthly_summary(plp::Date *start_date, plp::Date *end_date);
-                       plp::DataRange *get_daily_summary(plp::Date *date, EnumSummaryCalculationType calc_type);
                        /**
-                        * Get summary data calculated from the daily data items that is meaning full.
+                        * Get daily summary data calculated from the daily data items.
                         * Depending from the device type, it may be daily mean value, daily delta, highest value, etc...
                         */
+                       plp::DataRange *get_daily_summary(plp::Date *date, EnumSummaryCalculationType calc_type);
                        plp::DataRange *get_daily_summary(plp::Date *date);
                        plp::DataRange *get_daily_summary(plp::Date *start_date, plp::Date *end_date);
                        plp::DataRange *get_hourly_summary(plp::Date *date, EnumSummaryCalculationType calc_type);