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

minor change based on code review feedback

Browse Source
This commit is contained in:
Li-Ta Lo 2019-03-20 11:58:22 -06:00
parent d3caf6dfbd
commit cbd04b4bed
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changelog/connected-components.md Normal file
View File

@ -0,0 +1,4 @@
# Add connected component worklets and filters
We have added the `ImageConnectivity` and `CellSetConnectivity` worklets and
the corresponding filters to identify connected in Uni.

5
vtkm/filter/CellSetConnectivity.hxx
View File

@ -32,11 +32,12 @@ inline VTKM_CONT vtkm::cont::DataSet CellSetConnectivity::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::cont::ArrayHandle<T, StorageType>&,
const vtkm::filter::FieldMetadata& fieldMetadata,
const vtkm::filter::PolicyBase<DerivedPolicy>&)
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
{
vtkm::cont::ArrayHandle<vtkm::Id> component;
// TODO: is the Casting right?
vtkm::worklet::connectivity::CellSetConnectivity().Run(input.GetCellSet(0), component);
vtkm::worklet::connectivity::CellSetConnectivity().Run(
vtkm::filter::ApplyPolicy(input.GetCellSet(0), policy), component);
auto result = internal::CreateResult(
input, component, "component", fieldMetadata.GetAssociation(), fieldMetadata.GetCellSetName());

5
vtkm/filter/ImageConnectivity.hxx
View File

@ -31,12 +31,13 @@ inline VTKM_CONT vtkm::cont::DataSet ImageConnectivity::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::cont::ArrayHandle<T, StorageType>& field,
const vtkm::filter::FieldMetadata& fieldMetadata,
const vtkm::filter::PolicyBase<DerivedPolicy>&)
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
{
vtkm::cont::ArrayHandle<vtkm::Id> component;
// TODO: is there such thing as Active CellSet?
vtkm::worklet::connectivity::ImageConnectivity().Run(input.GetCellSet(0), field, component);
vtkm::worklet::connectivity::ImageConnectivity().Run(
vtkm::filter::ApplyPolicy(input.GetCellSet(0), policy), field, component);
auto result = internal::CreateResult(
input, component, "component", fieldMetadata.GetAssociation(), fieldMetadata.GetCellSetName());

2
vtkm/filter/testing/UnitTestImageConnectivityFilter.cxx
View File

@ -68,7 +68,7 @@ void TestImageConnectivity()
for (vtkm::Id i = 0; i < resultArrayHandle.GetNumberOfValues(); ++i)
{
VTKM_TEST_ASSERT(
test_equal(resultArrayHandle.GetPortalConstControl().Get(i), componentExpected[i]),
test_equal(resultArrayHandle.GetPortalConstControl().Get(i), componentExpected[size_t(i)]),
"Wrong result for ImageConnectivity");
}
}

2
vtkm/worklet/testing/UnitTestImageConnectivity.cxx
View File

@ -97,7 +97,7 @@ public:
for (vtkm::Id i = 0; i < component.GetNumberOfValues(); ++i)
{
VTKM_TEST_ASSERT(component.GetPortalConstControl().Get(i) == componentExpected[i],
VTKM_TEST_ASSERT(component.GetPortalConstControl().Get(i) == componentExpected[size_t(i)],
"Components has unexpected value.");
}
}