using namespace plp;
DeviceData::DeviceData(string device_id_param) {
- string base_dir;
+ string base_dir;
device_config = Factory::get_device_config(device_id_param);
summary_calc_type = device_config->get_summary_calculation_type();
string year_dr;
string mon_dr;
vector<string> mon_vcr;
- vector<string> d_vcr;
+ vector<string> dta_vcr;
string f_name;
W1Store *store;
Data *ret_val;
mon_dr = mon_vcr.at(ii);
mon_dr = W1Util::concat_paths(year_dr, mon_dr);
// scan data files from month dir
- d_vcr = W1Util::get_data_files(mon_dr);
- if (d_vcr.size() > 0) {
- f_name = d_vcr.at(0);
+ dta_vcr = W1Util::get_data_files(mon_dr);
+ if (dta_vcr.size() > 0) {
+ f_name = dta_vcr.at(0);
f_name = W1Util::concat_paths(mon_dr, f_name);
store = new W1Store(f_name);
ret_val = store->get_oldest_data();
DataRange *DeviceData::get_data_range() {
DataRange *ret_val;
- vector<string> year_list;
- Data *first_data;
- Data *newest_data;
+ vector<string> y_list;
+ Data *o_data;
+ Data *n_data;
- ret_val = NULL;
- year_list = W1Util::get_subdirectories(device_dir);
- first_data = find_oldest_data(year_list);
- if (first_data != NULL) {
- newest_data = find_newest_data(year_list);
- if (newest_data != NULL) {
- ret_val = new DataRange(*first_data);
- ret_val->add_data(*newest_data);
- delete(newest_data);
+ ret_val = NULL;
+ y_list = W1Util::get_subdirectories(device_dir);
+ o_data = find_oldest_data(y_list);
+ if (o_data != NULL) {
+ n_data = find_newest_data(y_list);
+ if (n_data != NULL) {
+ ret_val = new DataRange(o_data);
+ ret_val->add_data(n_data);
+ delete(n_data);
}
- delete(first_data);
+ delete(o_data);
}
return ret_val;
}
return ret_val;
}
-Data *DeviceData::get_day_summary(Date *date) {
+Data *DeviceData::get_daily_summary(Date *date,
+ int calc_type) {
Data *ret_val;
W1Store *store;
bool suc_flg;
if (store != NULL) {
suc_flg = store->load();
if (suc_flg == true) {
- switch(summary_calc_type) {
+ switch(calc_type) {
case SUM:
ret_val = store->get_sum();
break;
case DELTA:
ret_val = store->get_delta();
break;
- case MEAN:
- default:
- ret_val = store->get_mean();
- break;
case MAX:
ret_val = store->get_max();
break;
case MIN:
ret_val = store->get_min();
break;
+ case MEAN:
+ default:
+ ret_val = store->get_mean();
+ break;
}
if (ret_val != NULL) {
ret_val->printout();
return ret_val;
}
+Data *DeviceData::get_daily_summary(Date *date) {
+ Data *ret_val;
+
+ ret_val = get_daily_summary(date, summary_calc_type);
+ return ret_val;
+}
+
DataRange *DeviceData::get_daily_summary(Date *start_date,
Date *end_date) {
DataRange *ret_val;
ret_val = NULL;
date = start_date->clone();
- while(date->before(*end_date)) {
- data = get_day_summary(date);
+ while(date->before(end_date)) {
+ data = get_daily_summary(date);
if (data != NULL) {
if (ret_val == NULL) {
- ret_val = new DataRange(*data);
+ ret_val = new DataRange(data);
}
else {
- ret_val->add_data(*data);
+ ret_val->add_data(data);
}
delete(data);
}
return ret_val;
}
-vector<Data *> DeviceData::get_hourly_summary(Date *date) {
- vector<Data *> ret_val;
- W1Store * store;
+vector<Data *> *DeviceData::get_hourly_summary(Date *date,
+ int calc_type) {
+ vector<Data *> *ret_val;
+ W1Store *store;
+ ret_val = NULL;
store = new W1Store(device_id, date);
store->load();
- switch(summary_calc_type) {
-/*
+ switch(calc_type) {
case SUM:
- ret_val = store->get_sum();
+ ret_val = store->get_sum(3600);
break;
-*/
case DELTA:
ret_val = store->get_delta(3600);
break;
default:
ret_val = store->get_mean(3600);
break;
-/*
case MAX:
- ret_val = store->get_max();
+ ret_val = store->get_max(3600);
break;
case MIN:
- ret_val = store->get_min();
+ ret_val = store->get_min(3600);
break;
-*/
}
delete(store);
return ret_val;
}
+vector<Data *> *DeviceData::get_hourly_summary(Date *date) {
+ vector<Data *> *ret_val;
+
+ ret_val = get_hourly_summary(date, summary_calc_type);
+ return ret_val;
+}
+
DataRange *DeviceData::get_hourly_summary(Date *start_date,
Date *end_date) {
DataRange *ret_val;
- vector<Data *> dta_list;
+ vector<Data *> *dta_lst;
Data *data;
Date *date;
vector<Data *>::iterator iter;
ret_val = NULL;
date = start_date->clone();
- while(date->before(*end_date)) {
- dta_list = get_hourly_summary(date);
- for(iter = dta_list.begin(); iter != dta_list.end(); iter++) {
+ while(date->before(end_date)) {
+ dta_lst = get_hourly_summary(date);
+ for(iter = dta_lst->begin(); iter != dta_lst->end(); iter++) {
data = (Data *)*iter;
if (data != NULL) {
if (ret_val == NULL) {
- ret_val = new DataRange(*data);
+ ret_val = new DataRange(data);
}
else {
- ret_val->add_data(*data);
+ ret_val->add_data(data);
}
delete(data);
}
delete(date);
return ret_val;
}
+
DataRange *DeviceData::get_data(Date *start_date,
Date *end_date) {
DataRange *ret_val;