OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed: Use Values() instead of ValuesIn() since the former syntax

Browse Source 
also compiles on Ubuntu 14.04 with gcc 4.8
This commit is contained in:
Kjell Magne Mathisen 2018-04-03 21:13:47 +02:00 committed by Knut Morten Okstad
parent 8374c8b293
commit 3c4cde49f0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Utility/Test/TestGaussQuadrature.C
View File

@ -15,6 +15,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include <cmath> #include <cmath>
class TestGaussQuadrature : public testing::Test, class TestGaussQuadrature : public testing::Test,
public testing::WithParamInterface<int> public testing::WithParamInterface<int>
{ {
@ -27,10 +28,9 @@ TEST_P(TestGaussQuadrature, Integrate)
const double* wi = GaussQuadrature::getWeight(GetParam()); const double* wi = GaussQuadrature::getWeight(GetParam());
double res = 0.0; double res = 0.0;
for (int i = 0; i < GetParam(); ++i) { for (int i = 0; i < GetParam(); ++i)
for (int p = 0; p < GetParam(); ++p) for (int p = 0; p < GetParam(); ++p)
res += wi[i]*pow(xi[i], p); // 1+x+x^2+x^3+.. res += wi[i]*pow(xi[i], p); // 1+x+x^2+x^3+..
}
double exa = 0.0; double exa = 0.0;
for (int p = 0; p < GetParam(); ++p) for (int p = 0; p < GetParam(); ++p)
@ -42,4 +42,4 @@ TEST_P(TestGaussQuadrature, Integrate)
INSTANTIATE_TEST_CASE_P(TestGaussQuadrature, INSTANTIATE_TEST_CASE_P(TestGaussQuadrature,
TestGaussQuadrature, TestGaussQuadrature,
testing::ValuesIn({1, 2, 3, 4, 5, 6, 7, 8, 9, 10})); testing::Values(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));