From 50dff36dd817b64fe8b3ed70f214aab8772d57aa Mon Sep 17 00:00:00 2001
From: Chris Rogers <scarf148@cn248.scarf.rl.ac.uk>
Date: Wed, 5 Dec 2018 18:13:32 +0000
Subject: [PATCH] Use size_t not uint
---
.../AbsBeamline/PolynomialTest.cpp | 56 +++++++++----------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/tests/classic_src/AbsBeamline/PolynomialTest.cpp b/tests/classic_src/AbsBeamline/PolynomialTest.cpp
index b04a7abab..9a4a4ac26 100644
--- a/tests/classic_src/AbsBeamline/PolynomialTest.cpp
+++ b/tests/classic_src/AbsBeamline/PolynomialTest.cpp
@@ -125,16 +125,16 @@ TEST (PolynomialTest, RecursionRelation) {
polynomial::RecursionRelation r3(r2), r4, r5(1, 4);
r4 = r3;
r5.applyOperator();
- EXPECT_EQ(r1.getMaxXDerivatives(), uint(0));
- EXPECT_EQ(r1.getMaxSDerivatives(), uint(0));
- EXPECT_EQ(r2.getMaxXDerivatives(), uint(2));
- EXPECT_EQ(r2.getMaxSDerivatives(), uint(1));
- EXPECT_EQ(r3.getMaxXDerivatives(), uint(2));
- EXPECT_EQ(r3.getMaxSDerivatives(), uint(1));
- EXPECT_EQ(r4.getMaxXDerivatives(), uint(2));
- EXPECT_EQ(r4.getMaxSDerivatives(), uint(1));
- EXPECT_EQ(r5.getMaxXDerivatives(), uint(4));
- EXPECT_EQ(r5.getMaxSDerivatives(), uint(2));
+ EXPECT_EQ(r1.getMaxXDerivatives(), size_t(0));
+ EXPECT_EQ(r1.getMaxSDerivatives(), size_t(0));
+ EXPECT_EQ(r2.getMaxXDerivatives(), size_t(2));
+ EXPECT_EQ(r2.getMaxSDerivatives(), size_t(1));
+ EXPECT_EQ(r3.getMaxXDerivatives(), size_t(2));
+ EXPECT_EQ(r3.getMaxSDerivatives(), size_t(1));
+ EXPECT_EQ(r4.getMaxXDerivatives(), size_t(2));
+ EXPECT_EQ(r4.getMaxSDerivatives(), size_t(1));
+ EXPECT_EQ(r5.getMaxXDerivatives(), size_t(4));
+ EXPECT_EQ(r5.getMaxSDerivatives(), size_t(2));
EXPECT_NEAR(r4.evaluatePolynomial(0.2, 1, 0), 0.8336, 1e-6);
r4.truncate(2);
EXPECT_NEAR(r4.evaluatePolynomial(0.2, 1, 0), 0.84, 1e-6);
@@ -146,9 +146,9 @@ TEST (PolynomialTest, RecursionRelation) {
EXPECT_TRUE(r2.isPolynomialZero(2, 1));
EXPECT_TRUE(r2.isPolynomialZero(1, 1));
r2.resizeX(4);
- EXPECT_EQ(r2.getMaxXDerivatives(), uint(4));
+ EXPECT_EQ(r2.getMaxXDerivatives(), size_t(4));
r2.resizeS(7);
- EXPECT_EQ(r2.getMaxSDerivatives(), uint(7));
+ EXPECT_EQ(r2.getMaxSDerivatives(), size_t(7));
r3.differentiateX();
EXPECT_NEAR(r3.evaluatePolynomial(0.2, 3, 0), 1.0, 1e-6);
EXPECT_NEAR(r3.evaluatePolynomial(0.2, 1, 1), 0.696, 1e-6);
@@ -173,14 +173,14 @@ TEST (PolynomialTest, TwoPolynomial) {
}
std::vector<std::vector<int>> vec1, vec2;
polynomial::TwoPolynomial zpoly(vec1);
- EXPECT_EQ(zpoly.getMaxXorder(), uint(0));
- EXPECT_EQ(zpoly.getMaxSorder(), uint(0));
+ EXPECT_EQ(zpoly.getMaxXorder(), size_t(0));
+ EXPECT_EQ(zpoly.getMaxSorder(), size_t(0));
EXPECT_EQ(zpoly.getCoefficient(0, 0), 0);
vec1.resize(2);
vec2.resize(3);
polynomial::TwoPolynomial zpoly2(vec1);
- EXPECT_EQ(zpoly2.getMaxXorder(), uint(0));
- EXPECT_EQ(zpoly2.getMaxSorder(), uint(0));
+ EXPECT_EQ(zpoly2.getMaxXorder(), size_t(0));
+ EXPECT_EQ(zpoly2.getMaxSorder(), size_t(0));
EXPECT_EQ(zpoly2.getCoefficient(0, 0), 0);
vec1[0] = v1;
EXPECT_THROW({polynomial::TwoPolynomial dummy(vec1);}, std::length_error);
@@ -237,13 +237,13 @@ TEST (PolynomialTest, TwoPolynomial) {
EXPECT_EQ(poly2.getCoefficient(2, 0), 24);
EXPECT_EQ(poly2.getCoefficient(2, 2), 72);
EXPECT_EQ(poly2.getCoefficient(3, 1), 96);
- EXPECT_EQ(poly2.getMaxXorder(), uint(3));
- EXPECT_EQ(poly2.getMaxSorder(), uint(2));
+ EXPECT_EQ(poly2.getMaxXorder(), size_t(3));
+ EXPECT_EQ(poly2.getMaxSorder(), size_t(2));
poly2.setMaxXorder(6);
poly2.setMaxSorder(7);
- EXPECT_EQ(poly2.getMaxXorder(), uint(6));
- EXPECT_EQ(poly2.getMaxSorder(), uint(7));
- EXPECT_EQ(poly3.getNdSfactors(), uint(0));
+ EXPECT_EQ(poly2.getMaxXorder(), size_t(6));
+ EXPECT_EQ(poly2.getMaxSorder(), size_t(7));
+ EXPECT_EQ(poly3.getNdSfactors(), size_t(0));
poly5.differentiateX();
EXPECT_EQ(poly5.getCoefficient(0, 1), 4);
EXPECT_EQ(poly5.getCoefficient(1, 1), 4);
@@ -254,9 +254,9 @@ TEST (PolynomialTest, TwoPolynomial) {
EXPECT_EQ(poly3.getCoefficient(1, 1), 18);
EXPECT_EQ(poly3.getCoefficient(0, 2), 0);
EXPECT_EQ(poly3.getCoefficient(1, 0), 4);
- EXPECT_EQ(poly3.getNdSfactors(),uint(1));
+ EXPECT_EQ(poly3.getNdSfactors(),size_t(1));
poly3.setdSfactors(vv1);
- EXPECT_EQ(poly3.getNdSfactors(), uint(3));
+ EXPECT_EQ(poly3.getNdSfactors(), size_t(3));
std::vector<std::size_t> v4 = poly3.getdSfactors();
EXPECT_EQ(v4[0], size_t(1));
EXPECT_EQ(v4[1], size_t(2));
@@ -340,11 +340,11 @@ TEST (PolynomialTest, PolynomialSum) {
EXPECT_NEAR(sum3.evaluatePolynomial(0, 2, 1), 76.0, 1e-6);
EXPECT_NEAR(sum3.evaluatePolynomial(0, 1, 2), 54.0, 1e-6);
EXPECT_NEAR(sum3.evaluatePolynomial(0, 2, 2), 136.0, 1e-6);
- EXPECT_EQ(sum1.numberOfTerms(), uint(0));
- EXPECT_EQ(sum2.numberOfTerms(), uint(1));
- EXPECT_EQ(sum3.numberOfTerms(), uint(1));
- EXPECT_EQ(sum4.numberOfTerms(), uint(1));
- EXPECT_EQ(sum5.numberOfTerms(), uint(1));
+ EXPECT_EQ(sum1.numberOfTerms(), size_t(0));
+ EXPECT_EQ(sum2.numberOfTerms(), size_t(1));
+ EXPECT_EQ(sum3.numberOfTerms(), size_t(1));
+ EXPECT_EQ(sum4.numberOfTerms(), size_t(1));
+ EXPECT_EQ(sum5.numberOfTerms(), size_t(1));
EXPECT_TRUE(sum2.isPolynomialZero(1));
EXPECT_FALSE(sum2.isPolynomialZero(0));
EXPECT_TRUE(sum2.isPolynomialZero(3));
--
GitLab