From 8e1d108b2a5768b7ce1fa103189121b168073865 Mon Sep 17 00:00:00 2001
From: David Fairbrother <DavidFair@users.noreply.github.com>
Date: Fri, 15 Jun 2018 15:00:52 +0100
Subject: [PATCH] Re #21741 Formatting Fixes
---
Framework/Kernel/src/VectorHelper.cpp | 10 +++++-----
Framework/Kernel/test/VectorHelperTest.h | 14 ++++++++------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Framework/Kernel/src/VectorHelper.cpp b/Framework/Kernel/src/VectorHelper.cpp
index 78b6f804daa..3a28f631766 100644
--- a/Framework/Kernel/src/VectorHelper.cpp
+++ b/Framework/Kernel/src/VectorHelper.cpp
@@ -66,7 +66,7 @@ createAxisFromRebinParams(const std::vector<double> ¶ms,
xnew.clear();
if (resize_xnew)
- xnew.push_back(xcurr);
+ xnew.push_back(xcurr);
while ((ibound <= ibounds) && (istep <= isteps)) {
// if step is negative then it is logarithmic step
@@ -79,10 +79,10 @@ createAxisFromRebinParams(const std::vector<double> ¶ms,
// Someone gave a 0-sized step! What a dope.
throw std::runtime_error(
"Invalid binning step provided! Can't creating binning axis.");
- }
- else if (!std::isfinite(xs)) {
- throw std::runtime_error("An infinite or NaN value was found in the binning parameters.");
- }
+ } else if (!std::isfinite(xs)) {
+ throw std::runtime_error(
+ "An infinite or NaN value was found in the binning parameters.");
+ }
if ((xcurr + xs * (1.0 + lastBinCoef)) <= fullParams[ibound]) {
// If we can still fit current bin _plus_ specified portion of a last bin,
diff --git a/Framework/Kernel/test/VectorHelperTest.h b/Framework/Kernel/test/VectorHelperTest.h
index ebea587cefa..ce116198316 100644
--- a/Framework/Kernel/test/VectorHelperTest.h
+++ b/Framework/Kernel/test/VectorHelperTest.h
@@ -168,15 +168,17 @@ public:
}
void test_createAxisFromRebinParams_throwsOnInfiniteVal() {
- const std::vector<double> params = { 1.0, INFINITY };
- std::vector<double> axis;
- TS_ASSERT_THROWS(VectorHelper::createAxisFromRebinParams(params, axis), const std::runtime_error);
+ const std::vector<double> params = {1.0, INFINITY};
+ std::vector<double> axis;
+ TS_ASSERT_THROWS(VectorHelper::createAxisFromRebinParams(params, axis),
+ const std::runtime_error);
}
void test_createAxisFromRebinParams_throwsOnNaNVal() {
- const std::vector<double> params = { 1.0, NAN };
- std::vector<double> axis;
- TS_ASSERT_THROWS(VectorHelper::createAxisFromRebinParams(params, axis), const std::runtime_error);
+ const std::vector<double> params = {1.0, NAN};
+ std::vector<double> axis;
+ TS_ASSERT_THROWS(VectorHelper::createAxisFromRebinParams(params, axis),
+ const std::runtime_error);
}
void test_CreateAxisFromRebinParams_xMinXMaxHints() {
--
GitLab