X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc63d290001cd127af79685f3cd811e03eebcece..1bf033cc925aa31693ef5163ea056fde5b75ff1e:/src/instr/jedule/jedule_events.cpp diff --git a/src/instr/jedule/jedule_events.cpp b/src/instr/jedule/jedule_events.cpp index 7047f22c36..b03a59d516 100644 --- a/src/instr/jedule/jedule_events.cpp +++ b/src/instr/jedule/jedule_events.cpp @@ -13,48 +13,48 @@ namespace simgrid{ namespace jedule{ Event::Event(std::string name, double start_time, double end_time, std::string type) - : name(name), start_time(start_time), end_time(end_time), type(type) + : name_(name), start_time_(start_time), end_time_(end_time), type_(type) { - this->resource_subsets = new std::vector(); + this->resource_subsets_ = new std::vector(); } Event::~Event() { - if (not this->resource_subsets->empty()) { - for (auto const& subset : *this->resource_subsets) + if (not this->resource_subsets_->empty()) { + for (auto const& subset : *this->resource_subsets_) delete subset; - delete this->resource_subsets; + delete this->resource_subsets_; } } void Event::add_resources(std::vector* host_selection) { - get_resource_selection_by_hosts(this->resource_subsets, host_selection); + get_resource_selection_by_hosts(this->resource_subsets_, host_selection); } void Event::add_characteristic(char* characteristic) { xbt_assert( characteristic != nullptr ); - this->characteristics_list.push_back(characteristic); + this->characteristics_list_.push_back(characteristic); } void Event::add_info(char* key, char* value) { xbt_assert((key != nullptr) && value != nullptr); - this->info_map.insert({key, value}); + this->info_map_.insert({key, value}); } void Event::print(FILE *jed_file) { fprintf(jed_file, " \n"); - fprintf(jed_file, " \n", this->name.c_str()); - fprintf(jed_file, " \n", this->start_time); - fprintf(jed_file, " \n", this->end_time); - fprintf(jed_file, " \n", this->type.c_str()); + fprintf(jed_file, " \n", this->name_.c_str()); + fprintf(jed_file, " \n", this->start_time_); + fprintf(jed_file, " \n", this->end_time_); + fprintf(jed_file, " \n", this->type_.c_str()); - xbt_assert(not this->resource_subsets->empty()); + xbt_assert(not this->resource_subsets_->empty()); fprintf(jed_file, " \n"); - for (auto const& subset : *this->resource_subsets) { + for (auto const& subset : *this->resource_subsets_) { fprintf(jed_file, "