From 8b8d78735983571600b6172f00f764576b4a44ba Mon Sep 17 00:00:00 2001 From: Samuel Jones <samjones714@gmail.com> Date: Tue, 7 Aug 2018 10:20:31 +0100 Subject: [PATCH] Re #22515 Clang Formatting --- Framework/Algorithms/src/SortXAxis.cpp | 5 ++-- Framework/Algorithms/test/SortXAxisTest.h | 32 +++++++++++------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Framework/Algorithms/src/SortXAxis.cpp b/Framework/Algorithms/src/SortXAxis.cpp index 49c436c7cf7..37d1c87d8e3 100644 --- a/Framework/Algorithms/src/SortXAxis.cpp +++ b/Framework/Algorithms/src/SortXAxis.cpp @@ -223,8 +223,9 @@ bool isItSorted(Comparator const &compare, specNum++) { if (!std::is_sorted(inputWorkspace.x(specNum).begin(), inputWorkspace.x(specNum).end(), - [&](double lhs, double rhs) - -> bool { return compare(lhs, rhs); })) { + [&](double lhs, double rhs) -> bool { + return compare(lhs, rhs); + })) { return false; } } diff --git a/Framework/Algorithms/test/SortXAxisTest.h b/Framework/Algorithms/test/SortXAxisTest.h index f4bd883c12b..82aa4d497ed 100644 --- a/Framework/Algorithms/test/SortXAxisTest.h +++ b/Framework/Algorithms/test/SortXAxisTest.h @@ -1,8 +1,8 @@ #ifndef MANTID_ALGORITHMS_SORTXAXISTEST_H_ #define MANTID_ALGORITHMS_SORTXAXISTEST_H_ -#include "MantidAlgorithms/SortXAxis.h" #include "MantidAPI/MatrixWorkspace.h" +#include "MantidAlgorithms/SortXAxis.h" #include "MantidKernel/Workspace.h" #include <cxxtest/TestSuite.h> @@ -26,15 +26,15 @@ MatrixWorkspace_sptr createWorkspace(const HistogramX &xData, } class SortXAxisTest : public CxxTest::TestSuite { - // This pair of boilerplate methods prevent the suite being created statically + // This pair of boilerplate methods prevent the suite being created statically // This means the constructor isn't called when running other tests static SortXAxisTest *createSuite() { return new SortXAxisTest(); } static void destroySuite(SortXAxisTest *suite) { delete suite; } - void testXAscending(){ - std::vector<double> xData = {1,2,3}; - std::vector<double> yData = {1,2,3}; - std::vector<double> eData = {1,2,3}; + void testXAscending() { + std::vector<double> xData = {1, 2, 3}; + std::vector<double> yData = {1, 2, 3}; + std::vector<double> eData = {1, 2, 3}; MatrixWorkspace_sptr unsortedws = createWorkspace(xData, yData, eData); @@ -42,26 +42,24 @@ class SortXAxisTest : public CxxTest::TestSuite { alg.setProperty("InputWorkspacd", "unsortedws"); alg.setProperty("OutputWorkspace", "sortedws"); alg.execute(); - MatrixWorkspace_sptr sortedws = - + MatrixWorkspace_sptr sortedws = } - void testXDescending(){} + void testXDescending() {} - void testOnMultipleSpectrum(){} + void testOnMultipleSpectrum() {} - void testSortsXHistogramAscending(){} + void testSortsXHistogramAscending() {} - void testSortsXHistogramDescending(){} + void testSortsXHistogramDescending() {} - void testSortXWorksChild(){} + void testSortXWorksChild() {} - void testDxMultipleSpectrum(){} + void testDxMultipleSpectrum() {} - void testDxHistogramAscending(){} + void testDxHistogramAscending() {} - void testSortDescending(){} + void testSortDescending() {} }; - #endif /*MANTID_ALGORITHMS_SORTXAXISTEST_H_*/ -- GitLab