From a336cd41f9b600dafe38aa34f83cedd814dc0c59 Mon Sep 17 00:00:00 2001
From: Sam <samjones714@gmail.com>
Date: Fri, 13 Jul 2018 09:35:26 +0100
Subject: [PATCH] Re #22515 ClangFormat
Re #22515
---
.../inc/MantidAlgorithms/SortXAxis2.h | 2 +-
Framework/Algorithms/src/SortXAxis2.cpp | 21 ++++++++++---------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h b/Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h
index 31442cce2ab..cc91d13156c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h
@@ -71,7 +71,7 @@ private:
Mantid::API::MatrixWorkspace_const_sptr inputWorkspace,
Mantid::API::MatrixWorkspace_sptr outputWorkspace,
const size_t sizeOfX, const size_t sizeOfY,
- unsigned int specNum);
+ unsigned int specNum);
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/src/SortXAxis2.cpp b/Framework/Algorithms/src/SortXAxis2.cpp
index 60f0c2c7599..14af349ab83 100644
--- a/Framework/Algorithms/src/SortXAxis2.cpp
+++ b/Framework/Algorithms/src/SortXAxis2.cpp
@@ -69,14 +69,13 @@ std::vector<std::size_t> SortXAxis::createIndexes(const size_t sizeOfX) {
template <typename Comparator>
void sortByXValue(std::vector<std::size_t> &workspaceIndicies,
- MatrixWorkspace_const_sptr inputWorkspace,
- unsigned int specNum,
- Comparator const& compare) {
- std::sort(workspaceIndicies.begin(), workspaceIndicies.end(),
- [&](std::size_t lhs, std::size_t rhs) -> bool {
- return compare(inputWorkspace->x(specNum)[lhs],
- inputWorkspace->x(specNum)[rhs]);
- });
+ MatrixWorkspace_const_sptr inputWorkspace,
+ unsigned int specNum, Comparator const &compare) {
+ std::sort(workspaceIndicies.begin(), workspaceIndicies.end(),
+ [&](std::size_t lhs, std::size_t rhs) -> bool {
+ return compare(inputWorkspace->x(specNum)[lhs],
+ inputWorkspace->x(specNum)[rhs]);
+ });
}
void SortXAxis::sortIndicesByX(std::vector<std::size_t> &workspaceIndicies,
@@ -84,9 +83,11 @@ void SortXAxis::sortIndicesByX(std::vector<std::size_t> &workspaceIndicies,
MatrixWorkspace_const_sptr inputWorkspace,
unsigned int specNum) {
if (order == "Ascending") {
- sortByXValue(workspaceIndicies, inputWorkspace, specNum, std::less<double>());
+ sortByXValue(workspaceIndicies, inputWorkspace, specNum,
+ std::less<double>());
} else if (order == "Descending") {
- sortByXValue(workspaceIndicies, inputWorkspace, specNum, std::greater<double>());
+ sortByXValue(workspaceIndicies, inputWorkspace, specNum,
+ std::greater<double>());
}
}
--
GitLab