diff --git a/GeoLib/SensorData.cpp b/GeoLib/SensorData.cpp index 066f1864747b841cc205e613c1d34875d9601414..87918e9c523485e172519c3f06ea04983942c186 100644 --- a/GeoLib/SensorData.cpp +++ b/GeoLib/SensorData.cpp @@ -24,7 +24,7 @@ SensorData::SensorData(const std::string& file_name) : _start(0), _end(0), _step_size(0), _time_unit(TimeStepType::NONE) { - this->readDataFromFile(file_name); + readDataFromFile(file_name); } SensorData::SensorData(std::vector<std::size_t> time_steps) @@ -55,9 +55,9 @@ void SensorData::addTimeSeries(const std::string& data_name, std::vector<float>* data, const std::string& data_unit_string) { - this->addTimeSeries(SensorData::convertString2SensorDataType(data_name), - data, - data_unit_string); + addTimeSeries(SensorData::convertString2SensorDataType(data_name), + data, + data_unit_string); } void SensorData::addTimeSeries(SensorDataType data_name, @@ -134,10 +134,9 @@ int SensorData::readDataFromFile(const std::string& file_name) // create vectors necessary to hold the data for (std::size_t i = 0; i < nDataArrays; i++) { - this->_vec_names.push_back( - SensorData::convertString2SensorDataType(*++it)); - this->_data_unit_string.emplace_back(""); - this->_data_vecs.push_back(new std::vector<float>); + _vec_names.push_back(SensorData::convertString2SensorDataType(*++it)); + _data_unit_string.emplace_back(""); + _data_vecs.push_back(new std::vector<float>); } while (std::getline(in, line)) @@ -154,19 +153,19 @@ int SensorData::readDataFromFile(const std::string& file_name) std::size_t const current_time_step = (pos == std::string::npos) ? atoi((it++)->c_str()) : BaseLib::strDate2int(*it++); - this->_time_steps.push_back(current_time_step); + _time_steps.push_back(current_time_step); for (std::size_t i = 0; i < nDataArrays; i++) { - this->_data_vecs[i]->push_back( + _data_vecs[i]->push_back( static_cast<float>(strtod((it++)->c_str(), nullptr))); } } in.close(); - this->_start = this->_time_steps[0]; - this->_end = this->_time_steps[this->_time_steps.size() - 1]; + _start = _time_steps[0]; + _end = _time_steps[_time_steps.size() - 1]; return 1; }