value_arr.resize(size);
}
+Data::Data(int size, double default_value) {
+ int ii;
+
+ value_arr.resize(size);
+ for (ii = 0; ii < size; ii++) {
+ value_arr[ii] = default_value;
+ }
+}
+
Data::Data(vector<double> vector_param, Date *date_param) {
- int ii;
- int size;
+ unsigned int ii;
+ unsigned int size;
size = vector_param.size();
//log_debug("Data(), value count: %d\n", size);
value_arr.resize(size);
- for (int ii = 0; ii < vector_param.size(); ii++) {
+ for (ii = 0; ii < vector_param.size(); ii++) {
value_arr[ii] = vector_param.at(ii);
//log_debug("Data(), value[%d]: %f\n", ii, value_arr[ii]);
}
}
Data::Data(std::valarray<double> value_arr_param, Date *date_param) {
+ unsigned int ii;
+
value_arr.resize(value_arr_param.size());
- for (int ii = 0; ii < value_arr_param.size(); ii++) {
+
+ for (ii = 0; ii < value_arr_param.size(); ii++) {
value_arr[ii] = value_arr_param[ii];
}
date_time.copy(date_param);
}
void Data::printout() {
- int ii;
+ unsigned int ii;
date_time.printout();
for (ii = 0; ii < value_arr.size(); ii++) {
// parse date
date = W1Util::parse_date_str(item);
}
- // skip the device type and device id fields
- // TODO: store device type and id to own file
- else if (ii >= 3) {
+ else if (ii >= 1) {
suc_flg = string_to_number<double>(val, item, dec);
if (suc_flg) {
//log_debug("adding number: %f\n", val);
}
DataRange::~DataRange() {
- int ii;
- Date *date;
+ unsigned int ii;
+ Date *date;
if (val_matrix != NULL) {
free(val_matrix);
}
void DataRange::add_data(Data data) {
- int ii;
- int r_count;
- int indx;
- Date date;
+ unsigned int ii;
+ int indx;
+ Date date;
//log_debug("old row_count: %d, column_count: %d, value_arr_size: %d\n", row_count, column_count, data.value_arr.size());
val_matrix = (double *)realloc(val_matrix, ((row_count + 1) * column_count) * sizeof(double));