Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-07-30 18:50:59 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix operator for IteratorFromArrayPortal

Browse Source 
There was an error in `operator-=` for `IteratorFromArrayPortal` that went
by unnoticed. The operator is fixed and regression tests for the operators
has been added.
This commit is contained in:
Kenneth Moreland 2023-04-06 16:55:04 -06:00
parent 15133b6fba
commit 09c0139b4e
3 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changelog/fix-iterator-operator.md Normal file
View File

@ -0,0 +1,5 @@
# Fixed operator for IteratorFromArrayPortal
There was an error in `operator-=` for `IteratorFromArrayPortal` that went
by unnoticed. The operator is fixed and regression tests for the operators
has been added.

2
vtkm/cont/internal/IteratorFromArrayPortal.h
View File

@ -98,7 +98,7 @@ public:
VTKM_EXEC_CONT
iter& operator-=(difference_type n)
{
this->Index += static_cast<vtkm::Id>(n);
this->Index -= static_cast<vtkm::Id>(n);
VTKM_ASSERT(this->Index >= 0);
return *this;
}

72
vtkm/cont/testing/UnitTestIteratorFromArrayPortal.cxx
View File

@ -11,6 +11,7 @@
#include <vtkm/cont/internal/IteratorFromArrayPortal.h>
#include <vtkm/VecTraits.h>
#include <vtkm/cont/ArrayHandleImplicit.h>
#include <vtkm/cont/internal/ArrayPortalFromIterators.h>
#include <vtkm/cont/testing/Testing.h>
@ -115,6 +116,74 @@ struct TemplatedTests
"Did not get correct values when writing to iterator.");
}
void TestOperators()
{
struct Functor
{
VTKM_EXEC ValueType operator()(vtkm::Id index) const { return TestValue(index, ValueType{}); }
};
Functor functor;
auto array = vtkm::cont::make_ArrayHandleImplicit(functor, ARRAY_SIZE);
auto portal = array.ReadPortal();
VTKM_TEST_ASSERT(test_equal(portal.Get(0), functor(0)));
::CheckPortal(portal);
// Normally, you would use `ArrayPortalToIterators`, but we want to test this
// class specifically.
using IteratorType = vtkm::cont::internal::IteratorFromArrayPortal<decltype(portal)>;
IteratorType begin{ portal };
IteratorType end{ portal, ARRAY_SIZE };
VTKM_TEST_ASSERT(test_equal(*begin, functor(0)));
VTKM_TEST_ASSERT(test_equal(begin[0], functor(0)));
VTKM_TEST_ASSERT(test_equal(begin[3], functor(3)));
IteratorType iter = begin;
VTKM_TEST_ASSERT(test_equal(*iter, functor(0)));
VTKM_TEST_ASSERT(test_equal(*(iter++), functor(0)));
VTKM_TEST_ASSERT(test_equal(*iter, functor(1)));
VTKM_TEST_ASSERT(test_equal(*(++iter), functor(2)));
VTKM_TEST_ASSERT(test_equal(*iter, functor(2)));
VTKM_TEST_ASSERT(test_equal(*(iter--), functor(2)));
VTKM_TEST_ASSERT(test_equal(*iter, functor(1)));
VTKM_TEST_ASSERT(test_equal(*(--iter), functor(0)));
VTKM_TEST_ASSERT(test_equal(*iter, functor(0)));
VTKM_TEST_ASSERT(test_equal(*(iter += 3), functor(3)));
VTKM_TEST_ASSERT(test_equal(*(iter -= 3), functor(0)));
VTKM_TEST_ASSERT(end - begin == ARRAY_SIZE);
VTKM_TEST_ASSERT(test_equal(*(iter + 3), functor(3)));
VTKM_TEST_ASSERT(test_equal(*(3 + iter), functor(3)));
iter += 3;
VTKM_TEST_ASSERT(test_equal(*(iter - 3), functor(0)));
VTKM_TEST_ASSERT(iter == (begin + 3));
VTKM_TEST_ASSERT(!(iter != (begin + 3)));
VTKM_TEST_ASSERT(iter != begin);
VTKM_TEST_ASSERT(!(iter == begin));
VTKM_TEST_ASSERT(!(iter < begin));
VTKM_TEST_ASSERT(!(iter < (begin + 3)));
VTKM_TEST_ASSERT((iter < end));
VTKM_TEST_ASSERT(!(iter <= begin));
VTKM_TEST_ASSERT((iter <= (begin + 3)));
VTKM_TEST_ASSERT((iter <= end));
VTKM_TEST_ASSERT((iter > begin));
VTKM_TEST_ASSERT(!(iter > (begin + 3)));
VTKM_TEST_ASSERT(!(iter > end));
VTKM_TEST_ASSERT((iter >= begin));
VTKM_TEST_ASSERT((iter >= (begin + 3)));
VTKM_TEST_ASSERT(!(iter >= end));
}
void operator()()
{
ValueType array[ARRAY_SIZE];
@ -133,6 +202,9 @@ struct TemplatedTests
std::cout << " Test write to iterator." << std::endl;
TestIteratorWrite(portal);
std::cout << " Test operators." << std::endl;
TestOperators();
}
};