Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 02:55:47 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

one more attemp to get the data type right

Browse Source
This commit is contained in:
Li-Ta Lo 2017-04-20 15:09:38 -06:00
parent 22d0e35521
commit 58ef7c8de0
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vtkm/cont/testing/TestingDeviceAdapter.h
View File

@ -1352,7 +1352,7 @@ private:
VTKM_TEST_ASSERT(valuesOut.GetNumberOfValues() == expectedLength,
"Got wrong number of output values");
for (std::size_t i = 0; i < expectedLength; i++) {
for (auto i = 0; i < expectedLength; i++) {
const vtkm::Id v = valuesOut.GetPortalConstControl().Get(i);
VTKM_TEST_ASSERT(expectedValues[i] == v, "Incorrect scanned value");
}
@ -1365,11 +1365,11 @@ private:
const vtkm::Id inputLength = ARRAY_SIZE;
std::vector<vtkm::Id> inputKeys(inputLength);
for (vtkm::Id i = 0; i < ARRAY_SIZE; i++) {
for (std::size_t i = 0; i < ARRAY_SIZE; i++) {
if (i % 100 < 98)
inputKeys[i] = i / 100;
inputKeys[i] = static_cast<vtkm::Id>(i / 100);
else
inputKeys[i] = i;
inputKeys[i] = static_cast<vtkm::Id>(i);
}
std::vector<vtkm::Id> inputValues(inputLength, 1);
@ -1377,9 +1377,9 @@ private:
std::vector<vtkm::Id> expectedValues(expectedLength);
for (std::size_t i = 0; i < ARRAY_SIZE; i++) {
if (i % 100 < 98)
expectedValues[i] = 1 + i % 100;
expectedValues[i] = static_cast<vtkm::Id>(1 + i % 100);
else
expectedValues[i] = 1;
expectedValues[i] = static_cast<vtkm::Id>(1);
}
IdArrayHandle keys = vtkm::cont::make_ArrayHandle(inputKeys);
@ -1391,7 +1391,7 @@ private:
VTKM_TEST_ASSERT(valuesOut.GetNumberOfValues() == expectedLength,
"Got wrong number of output values");
for (std::size_t i = 0; i < expectedLength; i++) {
for (auto i = 0; i < expectedLength; i++) {
const vtkm::Id v = valuesOut.GetPortalConstControl().Get(i);
VTKM_TEST_ASSERT(expectedValues[i] == v, "Incorrect scanned value");
}
@ -1416,7 +1416,7 @@ private:
Algorithm::ScanInclusiveByKey(keys, values, valuesOut);
VTKM_TEST_ASSERT(valuesOut.GetNumberOfValues() == expectedLength,
"Got wrong number of output values");
for (std::size_t i= 0; i < expectedLength; i++) {
for (auto i = 0; i < expectedLength; i++) {
const vtkm::Id v = valuesOut.GetPortalConstControl().Get(i);
VTKM_TEST_ASSERT(expectedValues[i] == v, "Incorrect scanned value");
}
@ -1471,7 +1471,7 @@ private:
VTKM_TEST_ASSERT(valuesOut.GetNumberOfValues() == expectedLength,
"Got wrong number of output values");
for (std::size_t i = 0; i < expectedLength; i++) {
for (auto i = 0; i < expectedLength; i++) {
const vtkm::Id v = valuesOut.GetPortalConstControl().Get(i);
VTKM_TEST_ASSERT(expectedValues[i] == v, "Incorrect scanned value");
}
@ -1487,9 +1487,9 @@ private:
std::vector<vtkm::Id> inputKeys(inputLength);
for (std::size_t i = 0; i < ARRAY_SIZE; i++) {
if (i % 100 < 98)
inputKeys[i] = i / 100;
inputKeys[i] = static_cast<vtkm::Id>(i / 100);
else
inputKeys[i] = i;
inputKeys[i] = static_cast<vtkm::Id>(i);
}
std::vector<vtkm::Id> inputValues(inputLength, 1);
vtkm::Id init = 5;
@ -1498,7 +1498,7 @@ private:
std::vector<vtkm::Id> expectedValues(expectedLength);
for (std::size_t i = 0; i < ARRAY_SIZE; i++) {
if (i % 100 < 98)
expectedValues[i] = init + i % 100;
expectedValues[i] = static_cast<vtkm::Id>(init + i % 100);
else
expectedValues[i] = init;
}
@ -1512,7 +1512,7 @@ private:
VTKM_TEST_ASSERT(valuesOut.GetNumberOfValues() == expectedLength,
"Got wrong number of output values");
for (std::size_t i= 0; i < expectedLength; i++) {
for (auto i= 0; i < expectedLength; i++) {
const vtkm::Id v = valuesOut.GetPortalConstControl().Get(i);
VTKM_TEST_ASSERT(expectedValues[i] == v, "Incorrect scanned value");
}
@ -1540,7 +1540,7 @@ private:
VTKM_TEST_ASSERT(valuesOut.GetNumberOfValues() == expectedLength,
"Got wrong number of output values");
for (std::size_t i= 0; i < expectedLength; i++) {
for (auto i= 0; i < expectedLength; i++) {
const vtkm::Id v = valuesOut.GetPortalConstControl().Get(i);
VTKM_TEST_ASSERT(expectedValues[i] == v, "Incorrect scanned value");
}