From 8272c24350a508136ea9799f666ad2e6688ded37 Mon Sep 17 00:00:00 2001
From: Chris Rogers <scarf148@cn248.scarf.rl.ac.uk>
Date: Wed, 5 Dec 2018 14:10:08 +0000
Subject: [PATCH] Fix compiler warnings (compare unsigned with signed int)
---
.../AbsBeamline/PolynomialTest.cpp | 152 +++++++++---------
1 file changed, 76 insertions(+), 76 deletions(-)
diff --git a/tests/classic_src/AbsBeamline/PolynomialTest.cpp b/tests/classic_src/AbsBeamline/PolynomialTest.cpp
index 396a392ef..b04a7abab 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(), 0);
- EXPECT_EQ(r1.getMaxSDerivatives(), 0);
- EXPECT_EQ(r2.getMaxXDerivatives(), 2);
- EXPECT_EQ(r2.getMaxSDerivatives(), 1);
- EXPECT_EQ(r3.getMaxXDerivatives(), 2);
- EXPECT_EQ(r3.getMaxSDerivatives(), 1);
- EXPECT_EQ(r4.getMaxXDerivatives(), 2);
- EXPECT_EQ(r4.getMaxSDerivatives(), 1);
- EXPECT_EQ(r5.getMaxXDerivatives(), 4);
- EXPECT_EQ(r5.getMaxSDerivatives(), 2);
+ 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_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(), 4);
+ EXPECT_EQ(r2.getMaxXDerivatives(), uint(4));
r2.resizeS(7);
- EXPECT_EQ(r2.getMaxSDerivatives(), 7);
+ EXPECT_EQ(r2.getMaxSDerivatives(), uint(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(), 0);
- EXPECT_EQ(zpoly.getMaxSorder(), 0);
+ EXPECT_EQ(zpoly.getMaxXorder(), uint(0));
+ EXPECT_EQ(zpoly.getMaxSorder(), uint(0));
EXPECT_EQ(zpoly.getCoefficient(0, 0), 0);
vec1.resize(2);
vec2.resize(3);
polynomial::TwoPolynomial zpoly2(vec1);
- EXPECT_EQ(zpoly2.getMaxXorder(), 0);
- EXPECT_EQ(zpoly2.getMaxSorder(), 0);
+ EXPECT_EQ(zpoly2.getMaxXorder(), uint(0));
+ EXPECT_EQ(zpoly2.getMaxSorder(), uint(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(), 3);
- EXPECT_EQ(poly2.getMaxSorder(), 2);
+ EXPECT_EQ(poly2.getMaxXorder(), uint(3));
+ EXPECT_EQ(poly2.getMaxSorder(), uint(2));
poly2.setMaxXorder(6);
poly2.setMaxSorder(7);
- EXPECT_EQ(poly2.getMaxXorder(), 6);
- EXPECT_EQ(poly2.getMaxSorder(), 7);
- EXPECT_EQ(poly3.getNdSfactors(), 0);
+ EXPECT_EQ(poly2.getMaxXorder(), uint(6));
+ EXPECT_EQ(poly2.getMaxSorder(), uint(7));
+ EXPECT_EQ(poly3.getNdSfactors(), uint(0));
poly5.differentiateX();
EXPECT_EQ(poly5.getCoefficient(0, 1), 4);
EXPECT_EQ(poly5.getCoefficient(1, 1), 4);
@@ -254,13 +254,13 @@ 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(), 1);
+ EXPECT_EQ(poly3.getNdSfactors(),uint(1));
poly3.setdSfactors(vv1);
- EXPECT_EQ(poly3.getNdSfactors(), 3);
+ EXPECT_EQ(poly3.getNdSfactors(), uint(3));
std::vector<std::size_t> v4 = poly3.getdSfactors();
- EXPECT_EQ(v4[0], 1);
- EXPECT_EQ(v4[1], 2);
- EXPECT_EQ(v4[2], 3);
+ EXPECT_EQ(v4[0], size_t(1));
+ EXPECT_EQ(v4[1], size_t(2));
+ EXPECT_EQ(v4[2], size_t(3));
poly3.setZero();
EXPECT_TRUE(poly3.isZero());
EXPECT_NEAR(poly2.evaluatePolynomial(2, 1), 3264.0, 1e-6);
@@ -340,24 +340,24 @@ 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(), 0);
- EXPECT_EQ(sum2.numberOfTerms(), 1);
- EXPECT_EQ(sum3.numberOfTerms(), 1);
- EXPECT_EQ(sum4.numberOfTerms(), 1);
- EXPECT_EQ(sum5.numberOfTerms(), 1);
+ 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_TRUE(sum2.isPolynomialZero(1));
EXPECT_FALSE(sum2.isPolynomialZero(0));
EXPECT_TRUE(sum2.isPolynomialZero(3));
EXPECT_TRUE(sum3.isPolynomialZero(1));
EXPECT_FALSE(sum3.isPolynomialZero(0));
std::vector<std::size_t> v4 = sum3.getdSfactors(0);
- EXPECT_EQ(v4[0], 1);
+ EXPECT_EQ(v4[0], size_t(1));
sum3.differentiateS();
v4 = sum3.getdSfactors(0);
- EXPECT_EQ(v4[0], 2);
+ EXPECT_EQ(v4[0], size_t(2));
v4 = sum3.getdSfactors(1);
- EXPECT_EQ(v4[0], 0);
- EXPECT_EQ(v4[1], 1);
+ EXPECT_EQ(v4[0], size_t(0));
+ EXPECT_EQ(v4[1], size_t(1));
sum4.multiplyPolynomial(poly1);
EXPECT_NEAR(sum4.evaluatePolynomial(0, 2, 1), 816.0, 1e-6);
EXPECT_NEAR(sum4.evaluatePolynomial(0, 1, 2), 372.0, 1e-6);
@@ -367,7 +367,7 @@ TEST (PolynomialTest, PolynomialSum) {
EXPECT_NEAR(sum4.evaluatePolynomial(0, 1, 2), 102.0, 1e-6);
EXPECT_NEAR(sum4.evaluatePolynomial(0, 2, 2), 408.0, 1e-6);
sum4.addPolynomial(sum5);
- EXPECT_EQ(sum4.numberOfTerms(), 2);
+ EXPECT_EQ(sum4.numberOfTerms(), size_t(2));
EXPECT_NEAR(sum4.evaluatePolynomial(1, 2, 1), 52.0, 1e-6);
EXPECT_NEAR(sum4.evaluatePolynomial(1, 1, 2), 62.0, 1e-6);
EXPECT_NEAR(sum4.evaluatePolynomial(1, 2, 2), 158.0, 1e-6);
@@ -404,21 +404,21 @@ TEST (PolynomialTest, DifferentialOperatorTwo) {
polynomial::DifferentialOperatorTwo op4(op3), op5;
op5 = op4;
for (int i = 0; i < 2; i++) {
- EXPECT_EQ(op1.getXDerivatives(), 0);
- EXPECT_EQ(op1.getSDerivatives(), 0);
- EXPECT_EQ(op2.getXDerivatives(), 1);
- EXPECT_EQ(op2.getXDerivatives(), 1);
- EXPECT_EQ(op3.getXDerivatives(), 1);
- EXPECT_EQ(op3.getXDerivatives(), 1);
- EXPECT_EQ(op4.getXDerivatives(), 1);
- EXPECT_EQ(op4.getXDerivatives(), 1);
- EXPECT_EQ(op5.getXDerivatives(), 1);
- EXPECT_EQ(op5.getXDerivatives(), 1);
+ EXPECT_EQ(op1.getXDerivatives(), size_t(0));
+ EXPECT_EQ(op1.getSDerivatives(), size_t(0));
+ EXPECT_EQ(op2.getXDerivatives(), size_t(1));
+ EXPECT_EQ(op2.getXDerivatives(), size_t(1));
+ EXPECT_EQ(op3.getXDerivatives(), size_t(1));
+ EXPECT_EQ(op3.getXDerivatives(), size_t(1));
+ EXPECT_EQ(op4.getXDerivatives(), size_t(1));
+ EXPECT_EQ(op4.getXDerivatives(), size_t(1));
+ EXPECT_EQ(op5.getXDerivatives(), size_t(1));
+ EXPECT_EQ(op5.getXDerivatives(), size_t(1));
}
op3.resizeX(5);
- EXPECT_EQ(op3.getXDerivatives(), 5);
+ EXPECT_EQ(op3.getXDerivatives(), size_t(5));
op3.resizeS(6);
- EXPECT_EQ(op3.getSDerivatives(), 6);
+ EXPECT_EQ(op3.getSDerivatives(), size_t(6));
op2.setPolynomial(poly2, 1, 1);
op2.setPolynomial(poly3, 0, 0);
op3.setPolynomial(poly3, 1, 1);
@@ -429,10 +429,10 @@ TEST (PolynomialTest, DifferentialOperatorTwo) {
op5.setPolynomial(poly2, 0, 0);
EXPECT_TRUE(op2.isPolynomialZero(1, 0, 0));
EXPECT_TRUE(op2.isPolynomialZero(0, 1, 0));
- EXPECT_EQ(op2.numberOfTerms(0, 0), 1);
- EXPECT_EQ(op2.numberOfTerms(0, 1), 0);
- EXPECT_EQ(op2.numberOfTerms(1, 0), 0);
- EXPECT_EQ(op2.numberOfTerms(1, 1), 1);
+ EXPECT_EQ(op2.numberOfTerms(0, 0), size_t(1));
+ EXPECT_EQ(op2.numberOfTerms(0, 1), size_t(0));
+ EXPECT_EQ(op2.numberOfTerms(1, 0), size_t(0));
+ EXPECT_EQ(op2.numberOfTerms(1, 1), size_t(1));
EXPECT_NEAR(op2.evaluatePolynomial(2, 1, 0, 0, dSvalues), 52.0, 1e-6);
EXPECT_NEAR(op2.evaluatePolynomial(1, 2, 0, 0, dSvalues), 62.0, 1e-6);
EXPECT_NEAR(op2.evaluatePolynomial(2, 2, 0, 0, dSvalues), 158.0, 1e-6);
@@ -454,17 +454,17 @@ TEST (PolynomialTest, DifferentialOperatorTwo) {
EXPECT_NEAR(op3.evaluatePolynomial(1, 2, 1, 1, dSvalues), 54.0, 1e-6);
EXPECT_NEAR(op3.evaluatePolynomial(2, 2, 1, 1, dSvalues), 136.0, 1e-6);
op3.differentiateS();
- EXPECT_EQ(op3.numberOfTerms(0, 0), 2);
- EXPECT_EQ(op3.numberOfTerms(0, 1), 2);
- EXPECT_EQ(op3.numberOfTerms(1, 0), 0);
- EXPECT_EQ(op3.numberOfTerms(1, 1), 2);
+ EXPECT_EQ(op3.numberOfTerms(0, 0), size_t(2));
+ EXPECT_EQ(op3.numberOfTerms(0, 1), size_t(2));
+ EXPECT_EQ(op3.numberOfTerms(1, 0), size_t(0));
+ EXPECT_EQ(op3.numberOfTerms(1, 1), size_t(2));
std::vector<std::size_t> v4 = op3.getdSFactors(0, 0, 0);
- EXPECT_EQ(v4[0], 2);
+ EXPECT_EQ(v4[0], size_t(2));
v4 = op3.getdSFactors(0, 0, 1);
- EXPECT_EQ(v4[0], 0);
- EXPECT_EQ(v4[1], 1);
+ EXPECT_EQ(v4[0], size_t(0));
+ EXPECT_EQ(v4[1], size_t(1));
v4 = op3.getdSFactors(0, 1, 0);
- EXPECT_EQ(v4[0], 1);
+ EXPECT_EQ(v4[0], size_t(1));
op5.addOperator(op4);
EXPECT_NEAR(op4.evaluatePolynomial(2, 1, 1, 0, dSvalues), 52.0, 1e-6);
EXPECT_NEAR(op4.evaluatePolynomial(1, 2, 1, 0, dSvalues), 62.0, 1e-6);
@@ -507,16 +507,16 @@ TEST (PolynomialTest, RecursionRelationTwo) {
polynomial::RecursionRelationTwo r3(r2), r4, r5(1, 4);
r4 = r3;
r5.applyOperator();
- EXPECT_EQ(r1.getMaxXDerivatives(), 0);
- EXPECT_EQ(r1.getMaxSDerivatives(), 0);
- EXPECT_EQ(r2.getMaxXDerivatives(), 2);
- EXPECT_EQ(r2.getMaxSDerivatives(), 2);
- EXPECT_EQ(r3.getMaxXDerivatives(), 2);
- EXPECT_EQ(r3.getMaxSDerivatives(), 2);
- EXPECT_EQ(r4.getMaxXDerivatives(), 2);
- EXPECT_EQ(r4.getMaxSDerivatives(), 2);
- EXPECT_EQ(r5.getMaxXDerivatives(), 4);
- EXPECT_EQ(r5.getMaxSDerivatives(), 4);
+ 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(2));
+ EXPECT_EQ(r3.getMaxXDerivatives(), size_t(2));
+ EXPECT_EQ(r3.getMaxSDerivatives(), size_t(2));
+ EXPECT_EQ(r4.getMaxXDerivatives(), size_t(2));
+ EXPECT_EQ(r4.getMaxSDerivatives(), size_t(2));
+ EXPECT_EQ(r5.getMaxXDerivatives(), size_t(4));
+ EXPECT_EQ(r5.getMaxSDerivatives(), size_t(4));
r4.truncate(4);
EXPECT_NEAR(r4.evaluatePolynomial(2, 1, 0, 0, dSvalues), 0.0, 1e-6);
EXPECT_NEAR(r4.evaluatePolynomial(2, 1, 1, 0, dSvalues), 11.0, 1e-6);
@@ -535,10 +535,10 @@ TEST (PolynomialTest, RecursionRelationTwo) {
EXPECT_NEAR(r4.evaluatePolynomial(1, 2, 1, 2, dSvalues), 0.0, 1e-6);
EXPECT_NEAR(r4.evaluatePolynomial(1, 2, 2, 1, dSvalues), 0.0, 1e-6);
std::vector<std::size_t> v4 = r4.getdSfactors(2, 0, 0);
- EXPECT_EQ((int)v4.size(), 0);
+ EXPECT_EQ(v4.size(), size_t(0));
v4 = r4.getdSfactors(0, 1, 0);
- EXPECT_EQ((int)v4.size(), 1);
- EXPECT_EQ(v4[0], 1);
+ EXPECT_EQ(v4.size(), size_t(1));
+ EXPECT_EQ(v4[0], size_t(1));
r4.truncate(2);
EXPECT_NEAR(r4.evaluatePolynomial(0.2, 1, 1, 0, dSvalues), 0.84, 1e-6);
r5.truncate(2);
@@ -549,15 +549,15 @@ TEST (PolynomialTest, RecursionRelationTwo) {
EXPECT_TRUE(r2.isPolynomialZero(2, 1, 0));
EXPECT_TRUE(r2.isPolynomialZero(1, 1, 0));
r2.resizeX(4);
- EXPECT_EQ(r2.getMaxXDerivatives(), 4);
+ EXPECT_EQ(r2.getMaxXDerivatives(), size_t(4));
r2.resizeS(7);
- EXPECT_EQ(r2.getMaxSDerivatives(), 7);
+ EXPECT_EQ(r2.getMaxSDerivatives(), size_t(7));
r3.differentiateX();
EXPECT_NEAR(r3.evaluatePolynomial(0.2, 1, 3, 0, dSvalues), 1.0, 1e-6);
EXPECT_NEAR(r3.evaluatePolynomial(0.2, 1, 1, 2, dSvalues), 0.696, 1e-6);
EXPECT_NEAR(r3.evaluatePolynomial(1, 0.2, 1, 2, dSvalues), 0.696, 1e-6);
r4.differentiateS();
- EXPECT_EQ(r4.numberOfTerms(0, 1), 3);
+ EXPECT_EQ(r4.numberOfTerms(0, 1), size_t(3));
}
TEST (PolynomialTest, TanhDeriv) {
--
GitLab