]> pilppa.org Git - lib1wire.git/blobdiff - src/W1Store.cc
cleanups, renamed get_*_values functions to get_*_data
[lib1wire.git] / src / W1Store.cc
index d59e12121bf5999cb005cab53725f2e22f7f9296..09ff70636538ab54fae2d998d7f1cffd9c0698c3 100644 (file)
@@ -9,6 +9,7 @@
 #include <string>
 #include <fstream>
 #include <valarray>
+#include <limits>
 
 #include <time.h>
 #include <dirent.h>
@@ -18,6 +19,7 @@
 
 #include <plp/log.h>
 
+#include "DeviceConfig.hh"
 #include "W1Configure.hh"
 #include "W1Store.hh"
 #include "W1Util.hh"
@@ -26,57 +28,40 @@ using namespace std;
 using namespace w1;
 using namespace plp;
 
-std::string W1Store::store_base_dir    = DEFAULT_STORAGE_BASE_DIR;
-DataRange *data_range                  = NULL;
-
 W1Store::W1Store(string device_id,
                Date *date_time) {
-       data_range      = NULL;
-       store_file_name = get_store_file_name(device_id, date_time);
+       store_data      = NULL;
+       range_data      = NULL;
+       store_file_name = get_file_name(device_id, date_time);
        log_debug("data file name: %s\n", store_file_name.c_str());
 }
 
 W1Store::W1Store(string file_name_param) {
-       data_range      = NULL;
+       store_data      = NULL;
+       range_data      = NULL;
        store_file_name = file_name_param;
 }
 
 W1Store::~W1Store() {
-       if (data_range != NULL) {
-               delete(data_range);
-               data_range      = NULL;
-       }
-}
-
-void W1Store::set_store_base_dir(string store_param) {
-       int     pos;
-       int     b_count;
-
-       pos     = store_param.find_last_of("/");
-       b_count = store_param.length();
-       if (pos == (b_count - 1)) {
-               store_base_dir  = store_param;
+       if (store_data != NULL) {
+               delete(store_data);
+               store_data      = NULL;
        }
-       else {
-               store_base_dir  = store_param + "/";
-       }
-}
-
-string W1Store::get_store_base_dir() {
-       return store_base_dir;
 }
 
-string W1Store::get_store_dir_name(string device_id, Date *date_time) {
+string W1Store::get_dir_name(string device_id, Date *date_time) {
        string  ret_val;
        char    buffer[30];
+       string  d_name;
 
+       d_name  = DeviceConfig::get_base_dir_name();
        snprintf(buffer, 30, "%d/%02d", date_time->year, date_time->month);
-       ret_val = W1Util::concat_paths(store_base_dir, device_id);
+       ret_val = W1Util::concat_paths(d_name, device_id);
        ret_val = ret_val + "/" + buffer;
        return ret_val;
 }
 
-string W1Store::get_store_file_name(string device_id, Date *date_time) {
+string W1Store::get_file_name(string device_id, Date *date_time) {
        string  ret_val;
        string  fname;
        char    buffer[30];
@@ -84,20 +69,20 @@ string W1Store::get_store_file_name(string device_id, Date *date_time) {
        snprintf(buffer, 30, "%d-%02d-%02d", date_time->year, date_time->month, date_time->day);
        fname   = buffer;
        fname   = fname + DATAFILE_SUFFIX;
-       ret_val = get_store_dir_name(device_id, date_time);
+       ret_val = get_dir_name(device_id, date_time);
        ret_val = W1Util::concat_paths(ret_val, fname);
        return ret_val;
 }
 
-void W1Store::store(std::string device_id,
-               std::list<std::string> *string_list) {
+void W1Store::store(string device_id,
+               list<string> *string_list) {
        string          f_path;
        string          line;
        ofstream        *ostream;
        Date            *date;
 
        date    = new Date();
-       f_path  = get_store_file_name(device_id, date);
+       f_path  = get_file_name(device_id, date);
        ostream = W1Util::open_for_writing(f_path.c_str());
        // TODO: add mutex to protect string_list while it's read and emptied
        if (ostream != NULL) {
@@ -124,107 +109,485 @@ void W1Store::store(std::string device_id,
        delete(date);
 }
 
-void W1Store::load() {
+bool W1Store::load() {
        Data            *data;
        ifstream        in;
        string          line;
+       bool            ret_val;
 
-       if (data_range != NULL) {
-               delete(data_range);
-               data_range      = NULL;
+       ret_val = false;
+       if (store_data != NULL) {
+               delete(store_data);
+               store_data      = NULL;
        }
        in.open(store_file_name.c_str());
        if (in.is_open() == true) {
                while (in.eof() == false) {
                        getline(in, line);
-                       data    = W1Util::parse_data_line(line);
-                       if (data_range == NULL) {
-                               data_range      = new DataRange(*data);
+                       data    = Data::parse_data_string(line);
+                       if (store_data == NULL) {
+                               store_data      = new DataRange(*data);
                        }
                        else {
-                               data_range->add_data(*data);
+                               store_data->add_data(*data);
                        }
                        delete(data);
                }
+               ret_val = true;
        }
+       else {
+               log_error("Could not load data from file: %s\n", store_file_name.c_str());
+       }
+       return ret_val;
 }
 
-Data *W1Store::get_mean() {
-       int     d_count;
-       int     i_count;
-       double  avg;
+Data *W1Store::get_sum() {
+       int     row_count;
+       int     col_count;
        double  new_val;
        int     ii;
        int     jj;
-       Date    *date;
        Data    *data;
        Data    *ret_val;
 
        ret_val = NULL;
-       if (data_range == NULL) {
+       data    = NULL;
+       if (store_data == NULL) {
                load();
        }
-       if (data_range != NULL) {
-               d_count = data_range->get_data_row_count();
-               log_debug("data row count: %d\n", d_count);
-               if (d_count > 0) {
-                       i_count = data_range->get_data_column_count();
-                       log_debug("data item count per row: %d\n", i_count);
-                       ret_val = new Data(i_count);
-                       if (i_count > 0) {
-                               for (ii = 0; ii < d_count - 1; ii++) {
-                                       data    = data_range->get_data(ii);
-                                       for (jj = 0; jj < i_count; jj++) {
+       if (store_data != NULL) {
+               row_count       = store_data->get_data_row_count();
+               log_debug("data row count: %d\n", row_count);
+               if (row_count > 0) {
+                       col_count       = store_data->get_data_column_count();
+                       log_debug("data item count per row: %d\n", col_count);
+                       ret_val         = new Data(col_count);
+                       if (col_count > 0) {
+                               for (ii = 0; ii < row_count - 1; ii++) {
+                                       data    = store_data->get_data(ii);
+                                       for (jj = 0; jj < col_count; jj++) {
                                                new_val                 = data->value_arr[jj];
                                                ret_val->value_arr[jj]  = ret_val->value_arr[jj] + new_val;
                                        }
-                                       if (ii < (d_count - 2)) {
+                                       if (ii < (row_count - 2)) {
                                                delete(data);
+                                               data    = NULL;
                                        }
                                        //log_debug("new val: %f, sum: %f\n", new_val, sum);
                                }
-                               for (ii = 0; ii < i_count; ii++) {
-                                       ret_val->value_arr[ii]  = ret_val->value_arr[ii] / d_count;
+                       }
+                       ret_val->set_date(data->get_date());
+                       if (data != NULL) {
+                               delete(data);
+                       }
+               }
+       }
+       return ret_val;
+}
+
+Data *W1Store::get_delta() {
+       int             row_count;
+       int             col_count;
+       Data            *o_data;
+       Data            *n_data;
+       Data            *ret_val;
+       int             ii;
+       DataRange       *dr;
+
+       ret_val = NULL;
+       dr      = get_oldest_and_newest_data();
+       if (dr != NULL) {
+               row_count       = dr->get_data_row_count();
+               if (row_count == 2) {
+                       o_data          = dr->get_data(0);
+                       n_data          = dr->get_data(1);
+                       col_count       = dr->get_data_column_count();
+                       ret_val         = new Data(col_count);
+                       if (col_count > 0) {
+                               for (ii = 0; ii < col_count; ii++) {
+                                       ret_val->value_arr[ii]  = n_data->value_arr[ii] - o_data->value_arr[ii];
+                               }
+                       }
+                       ret_val->set_date(n_data->get_date());
+                       delete(o_data);
+                       delete(n_data);
+               }
+               delete(dr);
+       }
+       return ret_val;
+}
+
+Data *W1Store::get_mean() {
+       int     row_count;
+       int     col_count;
+       int     ii;
+       Data    *ret_val;
+
+       ret_val = NULL;
+       if (store_data == NULL) {
+               load();
+       }
+       if (store_data != NULL) {
+               row_count       = store_data->get_data_row_count();
+               if (row_count > 0) {
+                       col_count       = store_data->get_data_column_count();
+                       ret_val         = get_sum();
+                       if (col_count > 0) {
+                               for (ii = 0; ii < col_count; ii++) {
+                                       ret_val->value_arr[ii]  = ret_val->value_arr[ii] / row_count;
                                        log_debug("avg: %f\n", ret_val->value_arr[ii]);
                                }
                        }
+               }
+       }
+       return ret_val;
+}
+
+Data *W1Store::get_max() {
+       int     row_count;
+       int     col_count;
+       double  new_val;
+       int     ii;
+       int     jj;
+       Data    *data;
+       Data    *ret_val;
+       double  min_val;
+
+       ret_val = NULL;
+       data    = NULL;
+       if (store_data == NULL) {
+               load();
+       }
+       if (store_data != NULL) {
+               row_count       = store_data->get_data_row_count();
+               log_debug("data row count: %d\n", row_count);
+               if (row_count > 0) {
+                       col_count       = store_data->get_data_column_count();
+                       log_debug("data item count per row: %d\n", col_count);
+                       min_val         = numeric_limits<double>::min();
+                       ret_val         = new Data(col_count, min_val);
+                       if (col_count > 0) {
+                               for (ii = 0; ii < row_count - 1; ii++) {
+                                       data    = store_data->get_data(ii);
+                                       for (jj = 0; jj < col_count; jj++) {
+                                               new_val = data->value_arr[jj];
+                                               if (new_val > ret_val->value_arr[jj]) {
+                                                       ret_val->value_arr[jj]  = new_val;
+                                               }
+                                       }
+                                       if (ii < (row_count - 2)) {
+                                               delete(data);
+                                               data    = NULL;
+                                       }
+                               }
+                       }
                        ret_val->set_date(data->get_date());
-                       delete(data);
+                       if (data != NULL) {
+                               delete(data);
+                       }
                }
        }
        return ret_val;
 }
 
-Data *W1Store::load_first_data_row() {
-       Data            *ret_val;
-       ifstream        in;
-       string          line;
+Data *W1Store::get_min() {
+       int     row_count;
+       int     col_count;
+       double  new_val;
+       int     ii;
+       int     jj;
+       Data    *data;
+       Data    *ret_val;
+       double  max_val;
 
        ret_val = NULL;
-       in.open(store_file_name.c_str());
-       if (in.eof() == false) {
-               getline(in, line);
-               ret_val = W1Util::parse_data_line(line);
+       data    = NULL;
+       if (store_data == NULL) {
+               load();
+       }
+       if (store_data != NULL) {
+               row_count       = store_data->get_data_row_count();
+               log_debug("data row count: %d\n", row_count);
+               if (row_count > 0) {
+                       col_count       = store_data->get_data_column_count();
+                       log_debug("data item count per row: %d\n", col_count);
+                       max_val         = numeric_limits<double>::max();
+                       ret_val         = new Data(col_count, max_val);
+                       if (col_count > 0) {
+                               for (ii = 0; ii < row_count - 1; ii++) {
+                                       data    = store_data->get_data(ii);
+                                       for (jj = 0; jj < col_count; jj++) {
+                                               new_val = data->value_arr[jj];
+                                               if (new_val < ret_val->value_arr[jj]) {
+                                                       ret_val->value_arr[jj]  = new_val;
+                                               }
+                                       }
+                                       if (ii < (row_count - 2)) {
+                                               delete(data);
+                                               data    = NULL;
+                                       }
+                               }
+                       }
+                       ret_val->set_date(data->get_date());
+                       if (data != NULL) {
+                               delete(data);
+                       }
+               }
        }
        return ret_val;
 }
 
-Data *W1Store::load_last_data_row() {
-       Data            *ret_val;
+vector<Data *> W1Store::get_mean(int freq_sec) {
+       int             row_count;
+       int             col_count;
+       int             d_count;
+       int             jj;
+       int             ii;
+       Data            *data;
+       Data            *calc;
+       Date            *limit_d;
+       Date            date;
+       vector<Data *>  ret_val;
+
+       calc    = NULL;
+       limit_d = NULL;
+       d_count = 1;
+       if (store_data == NULL) {
+               load();
+       }
+       if (store_data != NULL) {
+               row_count       = store_data->get_data_row_count();
+               if (row_count > 0) {
+                       col_count       = store_data->get_data_column_count();
+                       if (col_count > 0) {
+                               for (ii = 0; ii < row_count; ii++) {
+                                       data    = store_data->get_data(ii);
+                                       if (data != NULL) {
+                                               if (calc == NULL) {
+                                                       d_count         = 1;
+                                                       calc            = data->clone();
+                                                       limit_d         = data->get_date().clone();
+                                                       limit_d->min    = 0;
+                                                       limit_d->sec    = 0;
+                                                       limit_d->inc_seconds(freq_sec);
+                                               }
+                                               else {
+                                                       date    = data->get_date();
+                                                       if (date.before(*limit_d)) {
+                                                               for (jj = 0; jj < col_count; jj++) {
+                                                                       calc->value_arr[jj]     = calc->value_arr[jj] + data->value_arr[jj];
+                                                               }
+                                                               d_count++;
+                                                       }
+                                                       else {
+                                                               for (jj = 0; jj < col_count; jj++) {
+                                                                       calc->value_arr[jj]     = calc->value_arr[jj] / d_count;
+                                                               }
+                                                               ret_val.push_back(calc);
+                                                               d_count         = 1;
+                                                               calc            = data->clone();
+                                                               if (limit_d != NULL) {
+                                                                       delete(limit_d);
+                                                               }
+                                                               limit_d         = data->get_date().clone();
+                                                               limit_d->min    = 0;
+                                                               limit_d->sec    = 0;
+                                                               limit_d->inc_seconds(freq_sec);
+                                                       }
+                                               }
+                                               delete(data);
+                                       }
+                               }
+                               if (calc != NULL) {
+                                       delete(calc);
+                                       calc    = NULL;
+                               }
+                               if (limit_d != NULL) {
+                                       delete(limit_d);
+                               }
+                       }
+               }
+       }
+       return ret_val;
+}
+
+vector<Data *> W1Store::get_delta(int freq_sec) {
+       int             row_count;
+       int             col_count;
+       int             jj;
+       int             ii;
+       Data            *data;
+       Data            *calc1;
+       Data            *calc2;
+       Date            *limit_d;
+       Date            date;
+       vector<Data *>  ret_val;
+
+       calc1   = NULL;
+       calc2   = NULL;
+       limit_d = NULL;
+       if (store_data == NULL) {
+               load();
+       }
+       if (store_data != NULL) {
+               row_count       = store_data->get_data_row_count();
+               if (row_count > 0) {
+                       col_count       = store_data->get_data_column_count();
+                       if (col_count > 0) {
+                               for (ii = 0; ii < row_count; ii++) {
+                                       data    = store_data->get_data(ii);
+                                       if (data != NULL) {
+                                               if (calc1 == NULL) {
+                                                       calc1           = data->clone();
+                                                       limit_d         = data->get_date().clone();
+                                                       limit_d->min    = 0;
+                                                       limit_d->sec    = 0;
+                                                       limit_d->inc_seconds(freq_sec);
+                                                       if (calc2 != NULL) {
+                                                               delete(calc2);
+                                                       }
+                                                       calc2           = NULL;
+                                               }
+                                               else {
+                                                       date    = data->get_date();
+                                                       if (date.before(*limit_d)) {
+                                                               if (calc2 != NULL) {
+                                                                       delete(calc2);
+                                                               }
+                                                               calc2   = data->clone();
+                                                       }
+                                                       else {
+                                                               if (calc2 == NULL) {
+                                                                       calc2   = calc1->clone();
+                                                               }
+                                                               for (jj = 0; jj < col_count; jj++) {
+                                                                       calc2->value_arr[jj]    = calc2->value_arr[jj] - calc1->value_arr[jj];
+                                                               }
+                                                               ret_val.push_back(calc2);
+                                                               delete(calc1);
+                                                               calc1   = data->clone();
+                                                               calc2   = NULL; // do not delete calc2 as it's stored to array
+                                                               if (limit_d != NULL) {
+                                                                       delete(limit_d);
+                                                               }
+                                                               limit_d         = data->get_date().clone();
+                                                               limit_d->min    = 0;
+                                                               limit_d->sec    = 0;
+                                                               limit_d->inc_seconds(freq_sec);
+                                                       }
+                                               }
+                                               delete(data);
+                                       }
+                               }
+                               if (calc1 != NULL) {
+                                       delete(calc1);
+                                       calc1   = NULL;
+                               }
+                               if (calc2 != NULL) {
+                                       delete(calc2);
+                                       calc2   = NULL;
+                               }
+                               if (limit_d != NULL) {
+                                       delete(limit_d);
+                               }
+                       }
+               }
+       }
+       return ret_val;
+}
+
+DataRange *W1Store::get_oldest_and_newest_data() {
+       DataRange       *ret_val;
        ifstream        in;
+       Data            *o_data;
+       Data            *n_data;
+       string          latest;
+       int             row_count;
        string          line;
        string          prev_line;
 
        ret_val = NULL;
-       in.open(store_file_name.c_str());
-       while (in.eof() == false) {
-               getline(in, line);
-               if (line.empty() == false) {
-                       prev_line       = line;
+       o_data  = NULL;
+       n_data  = NULL;
+       if (store_data != NULL) {
+               row_count       = store_data->get_data_row_count();
+               if (row_count > 0) {
+                       o_data          = store_data->get_data(0);
+                       n_data          = store_data->get_data(row_count - 1);
+               }
+       }
+       else {
+               if (range_data != NULL) {
+                       row_count       = range_data->get_data_row_count();
+                       if (row_count > 0) {
+                               o_data          = range_data->get_data(0);
+                               n_data          = range_data->get_data(row_count - 1);
+                       }
+               }
+               else {
+                       in.open(store_file_name.c_str());
+                       while (in.eof() == false) {
+                               getline(in, line);
+                               if (line.empty() == false) {
+                                       if (o_data == NULL) {
+                                               o_data  = Data::parse_data_string(line);
+                                       }
+                                       prev_line       = line;
+                               }
+                       }
+                       if (prev_line.empty() == false) {
+                               n_data  = Data::parse_data_string(prev_line);
+                       }
+               }
+       }
+       if ((o_data != NULL) &&
+           (n_data != NULL)) {
+               ret_val = new DataRange(*o_data);
+               ret_val->add_data(*n_data);
+               if (range_data != NULL) {
+                       range_data      = new DataRange(*o_data);
+                       range_data->add_data(*n_data);
                }
        }
-       if (prev_line.empty() == false) {
-               ret_val = W1Util::parse_data_line(prev_line);
+       if (o_data != NULL) {
+               delete(o_data);
+       }
+       if (n_data != NULL) {
+               delete(n_data);
+       }
+       return ret_val;
+}
+
+Data *W1Store::get_oldest_data() {
+       int             row_count;
+       Data            *ret_val;
+       DataRange       *dr;
+
+       ret_val = NULL;
+       dr      = get_oldest_and_newest_data();
+       if (dr != NULL) {
+               row_count       = dr->get_data_row_count();
+               if (row_count >= 1) {
+                       ret_val = dr->get_data(0);
+               }
+               delete(dr);
+       }
+       return ret_val;
+}
+
+Data *W1Store::get_newest_data() {
+       int             row_count;
+       Data            *ret_val;
+       DataRange       *dr;
+
+       ret_val = NULL;
+       dr      = get_oldest_and_newest_data();
+       if (dr != NULL) {
+               row_count       = dr->get_data_row_count();
+               if (row_count == 2) {
+                       ret_val = dr->get_data(1);
+               }
+               delete(dr);
        }
        return ret_val;
 }