Skip to content

Avoid warnings when iterating over a TList in a range-based loop with auto const&& #12442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guitargeek merged 3 commits into from
Mar 7, 2023
Merged

Avoid warnings when iterating over a TList in a range-based loop with auto const&& #12442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14687b4
[RF] Code format HeatmapAnalyzer.cxx
guitargeek Mar 3, 2023
305f5ee
[RF] Fix memory leak and compiler warning in HeatmapAnalyzer.cxx
guitargeek Mar 4, 2023
e0739bb
[core] Use explicit type in TList iteration example
guitargeek Mar 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/cont/src/TList.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ not forced by other constraints:

1. (Preferred way) Using the C++ range-based `for` or `begin()` / `end()`:
~~~ {.cpp}
for(const auto&& obj: *GetListOfPrimitives())
for(TObject *obj: *GetListOfPrimitives())
obj->Write();
~~~
2. Using the R__FOR_EACH macro:
Expand Down
19 changes: 9 additions & 10 deletions roofit/multiprocess/src/HeatmapAnalyzer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ namespace MultiProcess {
/// \param[in] logs_dir Directory where log files are stored in the format
/// outputted by RooFit::MultiProcess::ProcessTimer.
/// There can be other files in this directory as well.
HeatmapAnalyzer::HeatmapAnalyzer(std::string const& logs_dir)
HeatmapAnalyzer::HeatmapAnalyzer(std::string const &logs_dir)
{
TSystemDirectory dir(logs_dir.c_str(), logs_dir.c_str());
TList *duration_files = dir.GetListOfFiles();
std::unique_ptr<TList> durationFiles{dir.GetListOfFiles()};

for (const auto &&file : *duration_files) {
for (TObject *file : *durationFiles) {
if (std::string(file->GetName()).find("p_") == std::string::npos)
continue;

Expand Down Expand Up @@ -81,8 +81,6 @@ HeatmapAnalyzer::HeatmapAnalyzer(std::string const& logs_dir)
}

sortTaskNames(tasks_names_);

duration_files->Delete();
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -96,13 +94,14 @@ std::unique_ptr<TH2I> HeatmapAnalyzer::analyze(int analyzed_gradient)
int gradient_start_t = gradients_["master:gradient"][analyzed_gradient * 2 - 2];
int gradient_end_t = gradients_["master:gradient"][analyzed_gradient * 2 - 1];


std::unique_ptr<TH2I> total_matrix = std::make_unique<TH2I>("heatmap", "", eval_partitions_names_.size(), 0, 1, tasks_names_.size(), 0, 1);
std::unique_ptr<TH2I> total_matrix =
std::make_unique<TH2I>("heatmap", "", eval_partitions_names_.size(), 0, 1, tasks_names_.size(), 0, 1);

// loop over all logfiles stored in durations_
for (json &durations_json : durations_) {
// partial heatmap is the heatmap that will be filled in for the current durations logfile
std::unique_ptr<TH2I> partial_matrix = std::make_unique<TH2I>("partial_heatmap", "", eval_partitions_names_.size(), 0, 1, tasks_names_.size(), 0, 1);
std::unique_ptr<TH2I> partial_matrix =
std::make_unique<TH2I>("partial_heatmap", "", eval_partitions_names_.size(), 0, 1, tasks_names_.size(), 0, 1);

// remove unnecessary components (those that are out of range)
for (auto &&el : durations_json.items()) {
Expand Down Expand Up @@ -135,8 +134,8 @@ std::unique_ptr<TH2I> HeatmapAnalyzer::analyze(int analyzed_gradient)
find(eval_partitions_names_.begin(), eval_partitions_names_.end(), eval_partition_name) -
eval_partitions_names_.begin() + 1;
partial_matrix->SetBinContent(eval_partitions_idx, tasks_idx,
durations_json[eval_partition_name][idx + 1].get<int>() -
durations_json[eval_partition_name][idx].get<int>());
durations_json[eval_partition_name][idx + 1].get<int>() -
durations_json[eval_partition_name][idx].get<int>());
}
}
// add all partial matrices to form one matrix with entire gradient evaluation information
Expand Down