Skip to content

Commit ac46cab

Browse files
authored
ENH: Update neighbor lists to latest API (#11)
Depends on SIMPLNX PR BlueQuartzSoftware/simplnx#1439
1 parent 2b33dd8 commit ac46cab

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/SimplnxReview/Filters/Algorithms/GroupMicroTextureRegions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ Result<> GroupMicroTextureRegions::operator()()
195195
{
196196
return MakeErrorResult(-87000, fmt::format("The number of grouped Features was {} which means no grouped Features were detected. A grouping value may be set too high", m_NumTuples));
197197
}
198-
m_DataStructure.getDataRefAs<AttributeMatrix>(m_InputValues->NewCellFeatureAttributeMatrixName).resizeTuples(AttributeMatrix::ShapeType{m_NumTuples});
198+
m_DataStructure.getDataRefAs<AttributeMatrix>(m_InputValues->NewCellFeatureAttributeMatrixName).resizeTuples(ShapeType{m_NumTuples});
199199

200200
auto& cellParentIds = m_DataStructure.getDataRefAs<Int32Array>(m_InputValues->CellParentIdsArrayName);
201201
auto& featureIds = m_DataStructure.getDataRefAs<Int32Array>(m_InputValues->FeatureIdsArrayPath);

src/SimplnxReview/Filters/ComputeGroupingDensityFilter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ IFilter::PreflightResult ComputeGroupingDensityFilter::preflightImpl(const DataS
150150
else
151151
{
152152
{
153-
auto createArrayAction = std::make_unique<CreateArrayAction>(nx::core::DataType::int32, std::vector<usize>{1}, std::vector<usize>{1}, k_ThrowawayCheckedFeatures);
153+
auto createArrayAction = std::make_unique<CreateArrayAction>(nx::core::DataType::int32, ShapeType{1}, ShapeType{1}, k_ThrowawayCheckedFeatures);
154154
resultOutputActions.value().appendAction(std::move(createArrayAction));
155155
}
156156
{
@@ -162,7 +162,7 @@ IFilter::PreflightResult ComputeGroupingDensityFilter::preflightImpl(const DataS
162162
if(!pUseNonContiguousNeighbors)
163163
{
164164
{
165-
auto createArrayAction = std::make_unique<CreateNeighborListAction>(nx::core::DataType::int32, 1, k_ThrowawayNonContiguous);
165+
auto createArrayAction = std::make_unique<CreateNeighborListAction>(nx::core::DataType::int32, ShapeType{1}, k_ThrowawayNonContiguous);
166166
resultOutputActions.value().appendAction(std::move(createArrayAction));
167167
}
168168
{

src/SimplnxReview/Filters/GroupMicroTextureRegionsFilter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ IFilter::PreflightResult GroupMicroTextureRegionsFilter::preflightImpl(const Dat
139139
}
140140

141141
{
142-
auto createAction = std::make_unique<CreateAttributeMatrixAction>(pNewCellFeatureAMPath, AttributeMatrix::ShapeType{1});
142+
auto createAction = std::make_unique<CreateAttributeMatrixAction>(pNewCellFeatureAMPath, ShapeType{1});
143143
resultOutputActions.value().appendAction(std::move(createAction));
144144
}
145145
{

0 commit comments

Comments
 (0)