From 4f9c59c8793dc835111f50000556cd0613b67e87 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Fri, 15 Jan 2016 16:15:12 -0500
Subject: [PATCH] Refs #14988. Ran modernize-loop-convert on DataObjects.
---
.../DataObjects/src/BoxControllerNeXusIO.cpp | 4 +-
Framework/DataObjects/src/EventList.cpp | 8 +--
Framework/DataObjects/src/EventWorkspace.cpp | 12 ++--
.../DataObjects/src/EventWorkspaceMRU.cpp | 64 +++++++++----------
.../DataObjects/src/GroupingWorkspace.cpp | 14 ++--
Framework/DataObjects/src/MDBoxFlatTree.cpp | 7 +-
.../DataObjects/src/MDHistoWorkspace.cpp | 4 +-
.../src/MDHistoWorkspaceIterator.cpp | 12 ++--
Framework/DataObjects/src/MaskWorkspace.cpp | 8 +--
.../DataObjects/src/PeakShapeEllipsoid.cpp | 4 +-
Framework/DataObjects/src/PeaksWorkspace.cpp | 6 +-
.../DataObjects/src/SpecialWorkspace2D.cpp | 12 ++--
Framework/DataObjects/src/TableWorkspace.cpp | 31 +++++----
13 files changed, 91 insertions(+), 95 deletions(-)
diff --git a/Framework/DataObjects/src/BoxControllerNeXusIO.cpp b/Framework/DataObjects/src/BoxControllerNeXusIO.cpp
index a922c6b631f..109323b1384 100644
--- a/Framework/DataObjects/src/BoxControllerNeXusIO.cpp
+++ b/Framework/DataObjects/src/BoxControllerNeXusIO.cpp
@@ -30,8 +30,8 @@ BoxControllerNeXusIO::BoxControllerNeXusIO(API::BoxController *const bc)
m_ReadConversion(noConversion) {
m_BlockSize[1] = 4 + m_bc->getNDims();
- for (size_t i = 0; i < 2; i++) {
- m_EventsTypeHeaders.push_back(EventHeaders[i]);
+ for (auto &EventHeader : EventHeaders) {
+ m_EventsTypeHeaders.push_back(EventHeader);
}
m_EventsTypesSupported.resize(2);
diff --git a/Framework/DataObjects/src/EventList.cpp b/Framework/DataObjects/src/EventList.cpp
index da0f6969ab5..bb73766a621 100644
--- a/Framework/DataObjects/src/EventList.cpp
+++ b/Framework/DataObjects/src/EventList.cpp
@@ -353,8 +353,8 @@ EventList &EventList::operator+=(const std::vector<TofEvent> &more_events) {
// and append to the list
this->weightedEventsNoTime.reserve(this->weightedEventsNoTime.size() +
more_events.size());
- for (auto it = more_events.begin(); it != more_events.end(); ++it)
- this->weightedEventsNoTime.emplace_back(*it);
+ for (const auto &more_event : more_events)
+ this->weightedEventsNoTime.emplace_back(more_event);
break;
}
@@ -2560,8 +2560,8 @@ void EventList::convertTofHelper(std::vector<T> &events,
void EventList::convertTof(const double factor, const double offset) {
// fix the histogram parameter
MantidVec &x = this->refX.access();
- for (auto iter = x.begin(); iter != x.end(); ++iter)
- *iter = (*iter) * factor + offset;
+ for (double &iter : x)
+ iter = iter * factor + offset;
// this->refX.access() = x;
if ((factor < 0.) && (this->getSortType() == TOF_SORT))
diff --git a/Framework/DataObjects/src/EventWorkspace.cpp b/Framework/DataObjects/src/EventWorkspace.cpp
index 9a8d68f4f2e..c98fa879abc 100644
--- a/Framework/DataObjects/src/EventWorkspace.cpp
+++ b/Framework/DataObjects/src/EventWorkspace.cpp
@@ -378,8 +378,8 @@ void EventWorkspace::getEventXMinMax(double &xmin, double &xmax) const {
/// @returns The total number of events
size_t EventWorkspace::getNumberEvents() const {
size_t total = 0;
- for (auto it = this->data.begin(); it != this->data.end(); ++it) {
- total += (*it)->getNumberEvents();
+ for (auto it : this->data) {
+ total += it->getNumberEvents();
}
return total;
}
@@ -391,8 +391,8 @@ size_t EventWorkspace::getNumberEvents() const {
*/
Mantid::API::EventType EventWorkspace::getEventType() const {
Mantid::API::EventType out = Mantid::API::TOF;
- for (auto it = this->data.begin(); it != this->data.end(); ++it) {
- Mantid::API::EventType thisType = (*it)->getEventType();
+ for (auto it : this->data) {
+ Mantid::API::EventType thisType = it->getEventType();
if (static_cast<int>(out) < static_cast<int>(thisType)) {
out = thisType;
// This is the most-specialized it can get.
@@ -453,8 +453,8 @@ size_t EventWorkspace::getMemorySize() const {
// TODO: Add the MRU buffer
// Add the memory from all the event lists
- for (auto it = this->data.begin(); it != this->data.end(); ++it) {
- total += (*it)->getMemorySize();
+ for (auto it : this->data) {
+ total += it->getMemorySize();
}
total += run().getMemorySize();
diff --git a/Framework/DataObjects/src/EventWorkspaceMRU.cpp b/Framework/DataObjects/src/EventWorkspaceMRU.cpp
index 76ca4af7db5..3f3a5cb4ec5 100644
--- a/Framework/DataObjects/src/EventWorkspaceMRU.cpp
+++ b/Framework/DataObjects/src/EventWorkspaceMRU.cpp
@@ -16,22 +16,22 @@ EventWorkspaceMRU::EventWorkspaceMRU() {}
*/
EventWorkspaceMRU::~EventWorkspaceMRU() {
// Make sure you free up the memory in the MRUs
- for (size_t i = 0; i < m_bufferedDataY.size(); i++) {
- if (m_bufferedDataY[i]) {
- m_bufferedDataY[i]->clear();
- delete m_bufferedDataY[i];
+ for (auto &i : m_bufferedDataY) {
+ if (i) {
+ i->clear();
+ delete i;
}
}
- for (size_t i = 0; i < m_bufferedDataE.size(); i++) {
- if (m_bufferedDataE[i]) {
- m_bufferedDataE[i]->clear();
- delete m_bufferedDataE[i];
+ for (auto &i : m_bufferedDataE) {
+ if (i) {
+ i->clear();
+ delete i;
}
}
- for (size_t i = 0; i < m_markersToDelete.size(); i++) {
- delete m_markersToDelete[i];
+ for (auto &i : m_markersToDelete) {
+ delete i;
}
}
@@ -44,10 +44,9 @@ void EventWorkspaceMRU::ensureEnoughBuffersE(size_t thread_num) const {
Mutex::ScopedLock _lock(m_changeMruListsMutexE);
if (m_bufferedDataE.size() <= thread_num) {
m_bufferedDataE.resize(thread_num + 1, NULL);
- for (size_t i = 0; i < m_bufferedDataE.size(); i++) {
- if (!m_bufferedDataE[i])
- m_bufferedDataE[i] =
- new mru_list(50); // Create a MRU list with this many entries.
+ for (auto &i : m_bufferedDataE) {
+ if (!i)
+ i = new mru_list(50); // Create a MRU list with this many entries.
}
}
}
@@ -60,10 +59,9 @@ void EventWorkspaceMRU::ensureEnoughBuffersY(size_t thread_num) const {
Mutex::ScopedLock _lock(m_changeMruListsMutexY);
if (m_bufferedDataY.size() <= thread_num) {
m_bufferedDataY.resize(thread_num + 1, NULL);
- for (size_t i = 0; i < m_bufferedDataY.size(); i++) {
- if (!m_bufferedDataY[i])
- m_bufferedDataY[i] =
- new mru_list(50); // Create a MRU list with this many entries.
+ for (auto &i : m_bufferedDataY) {
+ if (!i)
+ i = new mru_list(50); // Create a MRU list with this many entries.
}
}
}
@@ -74,20 +72,20 @@ void EventWorkspaceMRU::clear() {
Mutex::ScopedLock _lock(this->m_toDeleteMutex);
// FIXME: don't clear the locked ones!
- for (size_t i = 0; i < m_markersToDelete.size(); i++)
- if (!m_markersToDelete[i]->m_locked)
- delete m_markersToDelete[i];
+ for (auto &i : m_markersToDelete)
+ if (!i->m_locked)
+ delete i;
m_markersToDelete.clear();
// Make sure you free up the memory in the MRUs
- for (size_t i = 0; i < m_bufferedDataY.size(); i++)
- if (m_bufferedDataY[i]) {
- m_bufferedDataY[i]->clear();
+ for (auto &i : m_bufferedDataY)
+ if (i) {
+ i->clear();
};
- for (size_t i = 0; i < m_bufferedDataE.size(); i++)
- if (m_bufferedDataE[i]) {
- m_bufferedDataE[i]->clear();
+ for (auto &i : m_bufferedDataE)
+ if (i) {
+ i->clear();
};
}
@@ -162,13 +160,13 @@ void EventWorkspaceMRU::insertE(size_t thread_num, MantidVecWithMarker *data) {
*/
void EventWorkspaceMRU::deleteIndex(size_t index) {
Mutex::ScopedLock _lock1(m_changeMruListsMutexE);
- for (size_t i = 0; i < m_bufferedDataE.size(); i++)
- if (m_bufferedDataE[i])
- m_bufferedDataE[i]->deleteIndex(index);
+ for (auto &i : m_bufferedDataE)
+ if (i)
+ i->deleteIndex(index);
Mutex::ScopedLock _lock2(m_changeMruListsMutexY);
- for (size_t i = 0; i < m_bufferedDataY.size(); i++)
- if (m_bufferedDataY[i])
- m_bufferedDataY[i]->deleteIndex(index);
+ for (auto &i : m_bufferedDataY)
+ if (i)
+ i->deleteIndex(index);
}
} // namespace Mantid
diff --git a/Framework/DataObjects/src/GroupingWorkspace.cpp b/Framework/DataObjects/src/GroupingWorkspace.cpp
index 6ddd541c0a3..3c1951b4524 100644
--- a/Framework/DataObjects/src/GroupingWorkspace.cpp
+++ b/Framework/DataObjects/src/GroupingWorkspace.cpp
@@ -59,8 +59,8 @@ void GroupingWorkspace::makeDetectorIDToGroupMap(
if (group == 0)
group = -1;
std::set<detid_t> detIDs = this->getDetectorIDs(wi);
- for (auto detID = detIDs.begin(); detID != detIDs.end(); ++detID) {
- detIDToGroup[*detID] = group;
+ for (value_type detID : detIDs) {
+ detIDToGroup[detID] = group;
if (group > ngroups)
ngroups = group;
}
@@ -85,13 +85,13 @@ void GroupingWorkspace::makeDetectorIDToGroupVector(
if (group == 0)
group = -1;
std::set<detid_t> detIDs = this->getDetectorIDs(wi);
- for (auto detID = detIDs.begin(); detID != detIDs.end(); ++detID) {
- if ((*detID) <
+ for (value_type detID : detIDs) {
+ if (detID <
0) // if you need negative detector ids, use the other function
continue;
- if (detIDToGroup.size() < static_cast<size_t>((*detID) + 1))
- detIDToGroup.resize((*detID) + 1);
- detIDToGroup[*detID] = group;
+ if (detIDToGroup.size() < static_cast<size_t>(detID + 1))
+ detIDToGroup.resize(detID + 1);
+ detIDToGroup[detID] = group;
if (group > ngroups)
ngroups = group;
}
diff --git a/Framework/DataObjects/src/MDBoxFlatTree.cpp b/Framework/DataObjects/src/MDBoxFlatTree.cpp
index 119a9e829f5..a87f0b17feb 100644
--- a/Framework/DataObjects/src/MDBoxFlatTree.cpp
+++ b/Framework/DataObjects/src/MDBoxFlatTree.cpp
@@ -144,8 +144,7 @@ void MDBoxFlatTree::setBoxesFilePositions(bool setFileBacked) {
// Kernel::ISaveable::sortObjByFilePos(m_Boxes);
// calculate the box positions in the resulting file and save it on place
uint64_t eventsStart = 0;
- for (size_t i = 0; i < m_Boxes.size(); i++) {
- API::IMDNode *mdBox = m_Boxes[i];
+ for (auto mdBox : m_Boxes) {
size_t ID = mdBox->getID();
// avoid grid boxes;
@@ -409,8 +408,8 @@ void MDBoxFlatTree::loadExperimentInfos(
std::map<std::string, std::string> entries;
file->getEntries(entries);
std::list<uint16_t> ExperimentBlockNum;
- for (auto it = entries.begin(); it != entries.end(); ++it) {
- std::string name = it->first;
+ for (auto &entrie : entries) {
+ std::string name = entrie.first;
if (boost::starts_with(name, "experiment")) {
try {
uint16_t num =
diff --git a/Framework/DataObjects/src/MDHistoWorkspace.cpp b/Framework/DataObjects/src/MDHistoWorkspace.cpp
index 15b6e08e450..fc4c493ccd4 100644
--- a/Framework/DataObjects/src/MDHistoWorkspace.cpp
+++ b/Framework/DataObjects/src/MDHistoWorkspace.cpp
@@ -132,8 +132,8 @@ MDHistoWorkspace::~MDHistoWorkspace() {
void MDHistoWorkspace::init(
std::vector<Mantid::Geometry::MDHistoDimension_sptr> &dimensions) {
std::vector<IMDDimension_sptr> dim2;
- for (size_t i = 0; i < dimensions.size(); i++)
- dim2.push_back(boost::dynamic_pointer_cast<IMDDimension>(dimensions[i]));
+ for (auto &dimension : dimensions)
+ dim2.push_back(boost::dynamic_pointer_cast<IMDDimension>(dimension));
this->init(dim2);
m_nEventsContributed = 0;
}
diff --git a/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp b/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp
index 9f8016d0feb..ccd8660b924 100644
--- a/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp
+++ b/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp
@@ -526,12 +526,12 @@ MDHistoWorkspaceIterator::findNeighbourIndexesFaceTouching() const {
std::vector<size_t> neighbourIndexes; // Accumulate neighbour indexes.
std::vector<int> widths(
m_nd, 3); // Face touching width is always 3 in each dimension
- for (size_t i = 0; i < m_permutationsFaceTouching.size(); ++i) {
- if (m_permutationsFaceTouching[i] == 0) {
+ for (long long i : m_permutationsFaceTouching) {
+ if (i == 0) {
continue;
}
- size_t neighbour_index = m_pos + m_permutationsFaceTouching[i];
+ size_t neighbour_index = m_pos + i;
if (neighbour_index < m_ws->getNPoints() &&
Utils::isNeighbourOfSubject(m_nd, neighbour_index, m_index,
m_indexMaker, m_indexMax, widths)) {
@@ -655,12 +655,12 @@ std::vector<size_t> MDHistoWorkspaceIterator::findNeighbourIndexesByWidth(
// Accumulate neighbour indexes.
std::vector<size_t> neighbourIndexes(permutationsVertexTouching.size());
size_t nextFree = 0;
- for (size_t i = 0; i < permutationsVertexTouching.size(); ++i) {
- if (permutationsVertexTouching[i] == 0) {
+ for (long long i : permutationsVertexTouching) {
+ if (i == 0) {
continue;
}
- size_t neighbour_index = m_pos + permutationsVertexTouching[i];
+ size_t neighbour_index = m_pos + i;
if (neighbour_index < m_ws->getNPoints() &&
Utils::isNeighbourOfSubject(m_nd, neighbour_index, m_index,
m_indexMaker, m_indexMax, widths)) {
diff --git a/Framework/DataObjects/src/MaskWorkspace.cpp b/Framework/DataObjects/src/MaskWorkspace.cpp
index b6a552d78f2..37941295a15 100644
--- a/Framework/DataObjects/src/MaskWorkspace.cpp
+++ b/Framework/DataObjects/src/MaskWorkspace.cpp
@@ -197,8 +197,8 @@ bool MaskWorkspace::isMasked(const std::set<detid_t> &detectorIDs) const {
}
bool masked(true);
- for (auto it = detectorIDs.cbegin(); it != detectorIDs.cend(); ++it) {
- if (!this->isMasked(*it)) {
+ for (value_type detectorID : detectorIDs) {
+ if (!this->isMasked(detectorID)) {
masked = false;
break; // allows space for a debug print statement
}
@@ -234,8 +234,8 @@ void MaskWorkspace::setMasked(const detid_t detectorID, const bool mask) {
*/
void MaskWorkspace::setMasked(const std::set<detid_t> &detectorIDs,
const bool mask) {
- for (auto detId = detectorIDs.begin(); detId != detectorIDs.end(); ++detId) {
- this->setMasked(*detId, mask);
+ for (value_type detectorID : detectorIDs) {
+ this->setMasked(detectorID, mask);
}
}
diff --git a/Framework/DataObjects/src/PeakShapeEllipsoid.cpp b/Framework/DataObjects/src/PeakShapeEllipsoid.cpp
index b5907b19854..8d8d5bbb993 100644
--- a/Framework/DataObjects/src/PeakShapeEllipsoid.cpp
+++ b/Framework/DataObjects/src/PeakShapeEllipsoid.cpp
@@ -82,8 +82,8 @@ std::vector<Kernel::V3D> PeakShapeEllipsoid::getDirectionInSpecificFrame(
"compatible with the direction vector");
}
- for (auto it = m_directions.cbegin(); it != m_directions.cend(); ++it) {
- directionsInFrame.push_back(invertedGoniometerMatrix * (*it));
+ for (const auto &m_direction : m_directions) {
+ directionsInFrame.push_back(invertedGoniometerMatrix * m_direction);
}
return directionsInFrame;
diff --git a/Framework/DataObjects/src/PeaksWorkspace.cpp b/Framework/DataObjects/src/PeaksWorkspace.cpp
index 5e5dc3fa4a4..bba1bc8b0b2 100644
--- a/Framework/DataObjects/src/PeaksWorkspace.cpp
+++ b/Framework/DataObjects/src/PeaksWorkspace.cpp
@@ -77,9 +77,9 @@ public:
/** Compare two peaks using the stored criteria */
inline bool operator()(const Peak &a, const Peak &b) {
- for (size_t i = 0; i < criteria.size(); i++) {
- std::string &col = criteria[i].first;
- bool ascending = criteria[i].second;
+ for (auto &i : criteria) {
+ std::string &col = i.first;
+ bool ascending = i.second;
bool lessThan = false;
if (col == "BankName") {
// If this criterion is equal, move on to the next one
diff --git a/Framework/DataObjects/src/SpecialWorkspace2D.cpp b/Framework/DataObjects/src/SpecialWorkspace2D.cpp
index 2978a692b96..aeb7d0692c9 100644
--- a/Framework/DataObjects/src/SpecialWorkspace2D.cpp
+++ b/Framework/DataObjects/src/SpecialWorkspace2D.cpp
@@ -46,8 +46,8 @@ SpecialWorkspace2D::SpecialWorkspace2D(Geometry::Instrument_const_sptr inst,
detID_to_WI.clear();
for (size_t wi = 0; wi < m_noVectors; wi++) {
set<detid_t> dets = getSpectrum(wi)->getDetectorIDs();
- for (auto det = dets.begin(); det != dets.end(); ++det) {
- detID_to_WI[*det] = wi;
+ for (value_type det : dets) {
+ detID_to_WI[det] = wi;
}
}
}
@@ -66,8 +66,8 @@ SpecialWorkspace2D::SpecialWorkspace2D(API::MatrixWorkspace_const_sptr parent) {
detID_to_WI.clear();
for (size_t wi = 0; wi < m_noVectors; wi++) {
set<detid_t> dets = getSpectrum(wi)->getDetectorIDs();
- for (auto det = dets.begin(); det != dets.end(); ++det) {
- detID_to_WI[*det] = wi;
+ for (value_type det : dets) {
+ detID_to_WI[det] = wi;
}
}
}
@@ -186,8 +186,8 @@ void SpecialWorkspace2D::setValue(const detid_t detectorID, const double value,
*/
void SpecialWorkspace2D::setValue(const set<detid_t> &detectorIDs,
const double value, const double error) {
- for (auto detID = detectorIDs.begin(); detID != detectorIDs.end(); ++detID) {
- this->setValue(*detID, value, error);
+ for (value_type detectorID : detectorIDs) {
+ this->setValue(detectorID, value, error);
}
}
diff --git a/Framework/DataObjects/src/TableWorkspace.cpp b/Framework/DataObjects/src/TableWorkspace.cpp
index be907c8ddb6..fcd58c3607a 100644
--- a/Framework/DataObjects/src/TableWorkspace.cpp
+++ b/Framework/DataObjects/src/TableWorkspace.cpp
@@ -48,8 +48,8 @@ TableWorkspace::~TableWorkspace() {}
size_t TableWorkspace::getMemorySize() const {
size_t data_size = 0;
- for (auto c = m_columns.cbegin(); c != m_columns.cend(); ++c) {
- data_size += (*c)->sizeOfData();
+ for (const auto &m_column : m_columns) {
+ data_size += m_column->sizeOfData();
}
data_size += m_LogManager->getMemorySize();
return data_size;
@@ -98,8 +98,8 @@ API::Column_sptr TableWorkspace::addColumn(const std::string &type,
void TableWorkspace::setRowCount(size_t count) {
if (count == rowCount())
return;
- for (auto ci = m_columns.begin(); ci != m_columns.end(); ci++)
- resizeColumn(ci->get(), count);
+ for (auto &m_column : m_columns)
+ resizeColumn(m_column.get(), count);
m_rowCount = count;
}
@@ -116,9 +116,9 @@ API::Column_sptr TableWorkspace::getColumn(const std::string &name) {
/// Gets the shared pointer to a column.
API::Column_const_sptr
TableWorkspace::getColumn(const std::string &name) const {
- for (auto c_it = m_columns.cbegin(); c_it != m_columns.cend(); ++c_it) {
- if (c_it->get()->name() == name) {
- return *c_it;
+ for (const auto &m_column : m_columns) {
+ if (m_column.get()->name() == name) {
+ return m_column;
}
}
std::string str = "Column " + name + " does not exist.\n";
@@ -162,8 +162,8 @@ void TableWorkspace::removeColumn(const std::string &name) {
size_t TableWorkspace::insertRow(size_t index) {
if (index >= rowCount())
index = rowCount();
- for (auto ci = m_columns.begin(); ci != m_columns.end(); ci++)
- insertInColumn(ci->get(), index);
+ for (auto &m_column : m_columns)
+ insertInColumn(m_column.get(), index);
++m_rowCount;
return index;
}
@@ -175,16 +175,16 @@ void TableWorkspace::removeRow(size_t index) {
g_log.error() << "Attempt to delete a non-existing row (" << index << ")\n";
return;
}
- for (auto ci = m_columns.begin(); ci != m_columns.end(); ci++)
- removeFromColumn(ci->get(), index);
+ for (auto &m_column : m_columns)
+ removeFromColumn(m_column.get(), index);
--m_rowCount;
}
std::vector<std::string> TableWorkspace::getColumnNames() const {
std::vector<std::string> nameList;
nameList.reserve(m_columns.size());
- for (auto ci = m_columns.begin(); ci != m_columns.end(); ci++)
- nameList.push_back((*ci)->name());
+ for (const auto &m_column : m_columns)
+ nameList.push_back(m_column->name());
return nameList;
}
@@ -256,10 +256,9 @@ void TableWorkspace::sort(std::vector<std::pair<std::string, bool>> &criteria) {
// add more records to the back of the queue
if (record.keyIndex < criteria.size() - 1) {
size_t keyIndex = record.keyIndex + 1;
- for (auto range = equalRanges.begin(); range != equalRanges.end();
- ++range) {
+ for (auto &equalRange : equalRanges) {
sortRecords.push(
- SortIterationRecord(keyIndex, range->first, range->second));
+ SortIterationRecord(keyIndex, equalRange.first, equalRange.second));
}
}
--
GitLab