Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update names in ContourTree.h to comply with VTKm style

Browse Source
This commit is contained in:
Oliver Ruebel 2020-01-23 11:32:33 -08:00
parent 7ced203f6a
commit 70f0b96bd8
8 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/contour_tree_augmented/ContourTreeApp.cxx
View File

@ -880,7 +880,7 @@ int main(int argc, char* argv[])
<< std::left
<< " #Nodes"
<< ": "
<< ct.nodes.GetNumberOfValues()
<< ct.Nodes.GetNumberOfValues()
<< std::endl
<< std::setw(42)
<< std::left
@ -916,7 +916,7 @@ int main(int argc, char* argv[])
<< std::left
<< " #WhenTransferred"
<< ": "
<< ct.whenTransferred.GetNumberOfValues()
<< ct.WhenTransferred.GetNumberOfValues()
<< std::endl
<< std::setw(42)
<< std::left

6
vtkm/filter/ContourTreeUniformAugmented.hxx
View File

@ -343,7 +343,7 @@ public:
vtkm::worklet::contourtree_augmented::IdArrayType localGlobalMeshIndex;
vtkm::cont::ArrayHandlePermutation<vtkm::worklet::contourtree_augmented::IdArrayType,
vtkm::worklet::contourtree_augmented::IdArrayType>
permutedSortOrder(contourTree.augmentnodes, sortOrder);
permutedSortOrder(contourTree.Augmentnodes, sortOrder);
auto transformedIndex = vtkm::cont::make_ArrayHandleTransform(
permutedSortOrder,
vtkm::worklet::contourtree_augmented::mesh_dem::IdRelabler(
@ -351,7 +351,7 @@ public:
vtkm::cont::Algorithm::Copy(transformedIndex, localGlobalMeshIndex);
// Compute the local contour tree mesh
auto localContourTreeMesh = new vtkm::worklet::contourtree_augmented::ContourTreeMesh<T>(
contourTree.augmentnodes, contourTree.augmentarcs, sortOrder, field, localGlobalMeshIndex);
contourTree.Augmentnodes, contourTree.Augmentarcs, sortOrder, field, localGlobalMeshIndex);
return localContourTreeMesh;
}
else
@ -502,7 +502,7 @@ void MergeBlockFunctor(
{
// If we have the partially augmented (e.g., boundary augmented) contour tree
newContourTreeMesh = new vtkm::worklet::contourtree_augmented::ContourTreeMesh<FieldType>(
currContourTree.augmentnodes, currContourTree.augmentarcs, contourTreeMeshOut);
currContourTree.Augmentnodes, currContourTree.Augmentarcs, contourTreeMeshOut);
}
else
{

22
vtkm/worklet/contourtree_augmented/ContourTree.h
View File

@ -76,7 +76,7 @@ namespace contourtree_augmented
{
constexpr int N_NODE_COLORS = 12;
constexpr const char* nodeColors[N_NODE_COLORS] = { // nodeColors
constexpr const char* NODE_COLORS[N_NODE_COLORS] = { // nodeColors
"red", "red4", "green", "green4", "royalblue", "royalblue4",
"cyan", "cyan4", "magenta", "magenta4", "yellow", "yellow4"
}; // nodeColors
@ -107,7 +107,7 @@ public:
// VECTORS INDEXED ON N = SIZE OF DATA
// the list of nodes is implicit - but for some purposes, it's useful to have them pre-sorted by superarc
IdArrayType nodes;
IdArrayType Nodes;
// vector of (regular) arcs in the merge tree
IdArrayType Arcs;
@ -127,14 +127,14 @@ public:
IdArrayType Superarcs;
// for boundary augmented contour tree (note: these use the same convention as supernodes/superarcs)
IdArrayType augmentnodes;
IdArrayType augmentarcs;
IdArrayType Augmentnodes;
IdArrayType Augmentarcs;
// vector of Hyperarcs to which each supernode/arc belongs
IdArrayType Hyperparents;
// vector tracking which superarc was transferred on which iteration
IdArrayType whenTransferred;
IdArrayType WhenTransferred;
// VECTORS INDEXED ON H = SIZE OF HYPERTREE
@ -206,14 +206,14 @@ inline void ContourTree::PrintContent() const
PrintIndices("Supernodes", this->Supernodes);
PrintIndices("Superarcs", this->Superarcs);
PrintIndices("Hyperparents", this->Hyperparents);
PrintIndices("When Xferred", whenTransferred);
PrintIndices("When Xferred", this->WhenTransferred);
std::cout << std::endl;
PrintHeader(this->Hypernodes.GetNumberOfValues());
PrintIndices("Hypernodes", this->Hypernodes);
PrintIndices("Hyperarcs", this->Hyperarcs);
PrintHeader(augmentnodes.GetNumberOfValues());
PrintIndices("Augmentnodes", augmentnodes);
PrintIndices("Augmentarcs", augmentarcs);
PrintHeader(Augmentnodes.GetNumberOfValues());
PrintIndices("Augmentnodes", Augmentnodes);
PrintIndices("Augmentarcs", this->Augmentarcs);
}
void ContourTree::DebugPrint(const char* message, const char* fileName, long lineNum)
@ -248,7 +248,7 @@ void ContourTree::PrintDotSuperStructure()
printf("digraph G\n\t{\n");
printf("\tsize=\"6.5, 9\"\n\tratio=\"fill\"\n");
auto whenTransferredPortal = whenTransferred.GetPortalConstControl();
auto whenTransferredPortal = this->WhenTransferred.GetPortalConstControl();
auto supernodesPortal = this->Supernodes.GetPortalConstControl();
auto superarcsPortal = this->Superarcs.GetPortalConstControl();
auto hypernodesPortal = this->Hypernodes.GetPortalConstControl();
@ -261,7 +261,7 @@ void ContourTree::PrintDotSuperStructure()
vtkm::Id iteration = MaskedIndex(whenTransferredPortal.Get(supernode));
printf("\tnode s%lli [style=filled,fillcolor=%s]\n",
(vtkm::Int64)supernodesPortal.Get(supernode),
nodeColors[iteration % N_NODE_COLORS]);
NODE_COLORS[iteration % N_NODE_COLORS]);
} // per supernode
// loop through supernodes

54
vtkm/worklet/contourtree_augmented/ContourTreeMaker.h
View File

@ -226,7 +226,7 @@ void ContourTreeMaker::ComputeHyperAndSuperStructure()
contourTree.Superarcs.GetPortalControl().Set(superID, (vtkm::Id)NO_SUCH_ELEMENT);
contourTree.Hyperarcs.GetPortalControl().Set(superID, (vtkm::Id)NO_SUCH_ELEMENT);
contourTree.Hyperparents.GetPortalControl().Set(superID, superID);
contourTree.whenTransferred.GetPortalControl().Set(superID, nIterations | IS_HYPERNODE);
contourTree.WhenTransferred.GetPortalControl().Set(superID, nIterations | IS_HYPERNODE);
} // meet at a vertex
DebugPrint("Contour Tree Constructed. Now Swizzling", __FILE__, __LINE__);
@ -245,7 +245,7 @@ void ContourTreeMaker::ComputeHyperAndSuperStructure()
vtkm::cont::Algorithm::Sort(
contourTree.Hypernodes,
contourtree_maker_inc_ns::ContourTreeSuperNodeComparator(
contourTree.Hyperparents, contourTree.Supernodes, contourTree.whenTransferred));
contourTree.Hyperparents, contourTree.Supernodes, contourTree.WhenTransferred));
// we have to permute a bunch of arrays, so let's have some temporaries to store them
IdArrayType permutedHyperparents;
@ -295,17 +295,17 @@ void ContourTreeMaker::ComputeHyperAndSuperStructure()
contourtree_maker_inc_ns::ComputeHyperAndSuperStructure_PermuteArcs permuteHyperarcsWorklet;
this->Invoke(permuteHyperarcsWorklet, permutedHyperarcs, superSortIndex, contourTree.Hyperarcs);
// now swizzle the whenTransferred value
// now swizzle the WhenTransferred value
IdArrayType permutedWhenTransferred;
PermuteArray<vtkm::Id>(
contourTree.whenTransferred, contourTree.Hypernodes, permutedWhenTransferred);
vtkm::cont::Algorithm::Copy(permutedWhenTransferred, contourTree.whenTransferred);
contourTree.WhenTransferred, contourTree.Hypernodes, permutedWhenTransferred);
vtkm::cont::Algorithm::Copy(permutedWhenTransferred, contourTree.WhenTransferred);
// now we compress both the hypernodes & Hyperarcs
IdArrayType newHypernodePosition;
OnefIfHypernode oneIfHypernodeFunctor;
auto oneIfHypernodeArrayHandle = vtkm::cont::ArrayHandleTransform<IdArrayType, OnefIfHypernode>(
contourTree.whenTransferred, oneIfHypernodeFunctor);
contourTree.WhenTransferred, oneIfHypernodeFunctor);
vtkm::cont::Algorithm::ScanExclusive(oneIfHypernodeArrayHandle, newHypernodePosition);
vtkm::Id nHypernodes = 0;
@ -315,7 +315,7 @@ void ContourTreeMaker::ComputeHyperAndSuperStructure()
vtkm::cont::Algorithm::CopySubRange(
newHypernodePosition, newHypernodePosition.GetNumberOfValues() - 1, 1, temp);
vtkm::cont::Algorithm::CopySubRange(
contourTree.whenTransferred, contourTree.whenTransferred.GetNumberOfValues() - 1, 1, temp, 1);
contourTree.WhenTransferred, contourTree.WhenTransferred.GetNumberOfValues() - 1, 1, temp, 1);
auto portal = temp.GetPortalControl();
nHypernodes = portal.Get(0) + oneIfHypernodeFunctor(portal.Get(1));
}
@ -329,7 +329,7 @@ void ContourTreeMaker::ComputeHyperAndSuperStructure()
setNewHypernodesAndArcsWorklet;
this->Invoke(setNewHypernodesAndArcsWorklet,
contourTree.Supernodes,
contourTree.whenTransferred,
contourTree.WhenTransferred,
contourTree.Hypernodes,
contourTree.Hyperarcs,
newHypernodePosition,
@ -395,7 +395,7 @@ void ContourTreeMaker::ComputeRegularStructure(MeshExtrema& meshExtrema)
contourTree.Hypernodes.GetNumberOfValues(), contourTree.Supernodes.GetNumberOfValues());
this->Invoke(locateSuperarcsWorklet,
contourTree.Superparents, // (input/output)
contourTree.whenTransferred, // (input)
contourTree.WhenTransferred, // (input)
contourTree.Hyperparents, // (input)
contourTree.Hyperarcs, // (input)
contourTree.Hypernodes, // (input)
@ -405,9 +405,9 @@ void ContourTreeMaker::ComputeRegularStructure(MeshExtrema& meshExtrema)
// We have now set the superparent correctly for each node, and need to sort them to get the correct regular arcs
vtkm::cont::Algorithm::Copy(vtkm::cont::ArrayHandleIndex(contourTree.Arcs.GetNumberOfValues()),
contourTree.nodes);
contourTree.Nodes);
vtkm::cont::Algorithm::Sort(contourTree.nodes,
vtkm::cont::Algorithm::Sort(contourTree.Nodes,
contourtree_maker_inc_ns::ContourTreeNodeComparator(
contourTree.Superparents, contourTree.Superarcs));
@ -415,7 +415,7 @@ void ContourTreeMaker::ComputeRegularStructure(MeshExtrema& meshExtrema)
contourtree_maker_inc_ns::ComputeRegularStructure_SetArcs setArcsWorklet(
contourTree.Arcs.GetNumberOfValues());
this->Invoke(setArcsWorklet,
contourTree.nodes, // (input) arcSorter array
contourTree.Nodes, // (input) arcSorter array
contourTree.Superparents, // (input)
contourTree.Superarcs, // (input)
contourTree.Supernodes, // (input)
@ -465,7 +465,7 @@ void ContourTreeMaker::ComputeBoundaryRegularStructure(
contourTree.Supernodes.GetNumberOfValues());
this->Invoke(locateSuperarcsOnBoundaryWorklet,
superparents, // (input/output)
contourTree.whenTransferred, // (input)
contourTree.WhenTransferred, // (input)
contourTree.Hyperparents, // (input)
contourTree.Hyperarcs, // (input)
contourTree.Hypernodes, // (input)
@ -478,17 +478,17 @@ void ContourTreeMaker::ComputeBoundaryRegularStructure(
// DAVID "ContourTreeMaker.h" line 338
IdArrayType node;
vtkm::cont::Algorithm::Copy(vtkm::cont::ArrayHandleIndex(superparents.GetNumberOfValues()),
contourTree.augmentnodes);
contourTree.Augmentnodes);
vtkm::cont::Algorithm::Copy(vtkm::cont::ArrayHandleIndex(superparents.GetNumberOfValues()), node);
vtkm::cont::Algorithm::CopyIf(
node, superparents, contourTree.augmentnodes, ContourTreeNoSuchElementSuperParents());
node, superparents, contourTree.Augmentnodes, ContourTreeNoSuchElementSuperParents());
IdArrayType toCompressed;
InitIdArrayTypeNoSuchElement(toCompressed, superparents.GetNumberOfValues());
vtkm::cont::Algorithm::Copy(
vtkm::cont::ArrayHandleIndex(contourTree.augmentnodes.GetNumberOfValues()), node);
vtkm::cont::ArrayHandleIndex(contourTree.Augmentnodes.GetNumberOfValues()), node);
auto permutedToCompressed =
vtkm::cont::make_ArrayHandlePermutation(contourTree.augmentnodes, // index array
vtkm::cont::make_ArrayHandlePermutation(contourTree.Augmentnodes, // index array
toCompressed); // value array
vtkm::cont::Algorithm::Copy(node, // source value array
permutedToCompressed); // target array
@ -502,7 +502,7 @@ void ContourTreeMaker::ComputeBoundaryRegularStructure(
// Create array for sorting
IdArrayType augmentnodes_sorted;
vtkm::cont::Algorithm::Copy(
vtkm::cont::ArrayHandleIndex(contourTree.augmentnodes.GetNumberOfValues()),
vtkm::cont::ArrayHandleIndex(contourTree.Augmentnodes.GetNumberOfValues()),
augmentnodes_sorted);
// use a comparator to do the sort
@ -510,17 +510,17 @@ void ContourTreeMaker::ComputeBoundaryRegularStructure(
augmentnodes_sorted,
contourtree_maker_inc_ns::ContourTreeNodeComparator(superparents, contourTree.Superarcs));
// now set the arcs based on the array
InitIdArrayTypeNoSuchElement(contourTree.augmentarcs,
contourTree.augmentnodes.GetNumberOfValues());
InitIdArrayTypeNoSuchElement(contourTree.Augmentarcs,
contourTree.Augmentnodes.GetNumberOfValues());
contourtree_maker_inc_ns::ComputeRegularStructure_SetAugmentArcs setAugmentArcsWorklet(
contourTree.augmentarcs.GetNumberOfValues());
contourTree.Augmentarcs.GetNumberOfValues());
this->Invoke(setAugmentArcsWorklet,
augmentnodes_sorted, // (input) arcSorter array
superparents, // (input)
contourTree.Superarcs, // (input)
contourTree.Supernodes, // (input)
toCompressed, // (input)
contourTree.augmentarcs); // (output)
contourTree.Augmentarcs); // (output)
DebugPrint("Regular Boundary Structure Computed", __FILE__, __LINE__);
} // ComputeRegularStructure()
@ -664,7 +664,7 @@ void ContourTreeMaker::AugmentMergeTrees()
vtkm::cont::Algorithm::Copy(noSuchElementArray, contourTree.Hyperparents);
vtkm::cont::Algorithm::Copy(noSuchElementArray, contourTree.Hypernodes);
vtkm::cont::Algorithm::Copy(noSuchElementArray, contourTree.Hyperarcs);
vtkm::cont::Algorithm::Copy(noSuchElementArray, contourTree.whenTransferred);
vtkm::cont::Algorithm::Copy(noSuchElementArray, contourTree.WhenTransferred);
// TODO We should only need to allocate the updegree/downdegree arrays. We initialize them with 0 here to ensure consistency of debug output
//updegree.Allocate(nSupernodes);
@ -815,7 +815,7 @@ void ContourTreeMaker::TransferLeafChains(bool isJoin)
contourTree.Hyperparents, // (output)
contourTree.Hyperarcs, // (output)
contourTree.Superarcs, // (output)
contourTree.whenTransferred); // (output)
contourTree.WhenTransferred); // (output)
DebugPrint(isJoin ? "Upper Regular Chains Transferred" : "Lower Regular Chains Transferred",
__FILE__,
@ -854,13 +854,13 @@ void ContourTreeMaker::CompressTrees()
// compresses trees to remove transferred vertices
void ContourTreeMaker::CompressActiveSupernodes()
{ // ContourTreeMaker::CompressActiveSupernodes()
// copy only if contourTree.whenTransferred has been set
// copy only if contourTree.WhenTransferred has been set
IdArrayType compressedActiveSupernodes;
// Transform the whenTransferred array to return 1 if the index was not transferred and 0 otherwise
// Transform the WhenTransferred array to return 1 if the index was not transferred and 0 otherwise
auto wasNotTransferred =
vtkm::cont::ArrayHandleTransform<IdArrayType, contourtree_maker_inc_ns::WasNotTransferred>(
contourTree.whenTransferred, contourtree_maker_inc_ns::WasNotTransferred());
contourTree.WhenTransferred, contourtree_maker_inc_ns::WasNotTransferred());
// Permute the wasNotTransferred array handle so that the lookup is based on the value of the indices in the active supernodes array
auto notTransferredActiveSupernodes =
vtkm::cont::make_ArrayHandlePermutation(activeSupernodes, wasNotTransferred);

10
vtkm/worklet/contourtree_augmented/ProcessContourTree.h
View File

@ -228,8 +228,8 @@ public:
auto hypernodesPortal = contourTree.Hypernodes.GetPortalConstControl();
auto hyperarcsPortal = contourTree.Hyperarcs.GetPortalConstControl();
// auto superarcsPortal = contourTree.Superarcs.GetPortalConstControl();
auto nodesPortal = contourTree.nodes.GetPortalConstControl();
auto whenTransferredPortal = contourTree.whenTransferred.GetPortalConstControl();
auto nodesPortal = contourTree.Nodes.GetPortalConstControl();
auto whenTransferredPortal = contourTree.WhenTransferred.GetPortalConstControl();
for (vtkm::Id sortedNode = 0; sortedNode < contourTree.Arcs.GetNumberOfValues(); sortedNode++)
{ // per node in sorted order
vtkm::Id sortID = nodesPortal.Get(sortedNode);
@ -432,7 +432,7 @@ public:
vtkm::cont::ArrayCopy(vtkm::cont::ArrayHandleConstant<EdgePair>(EdgePair(-1, -1), nSuperarcs),
superarcList);
auto superarcListPortal = superarcList.GetPortalControl();
vtkm::Id totalVolume = contourTree.nodes.GetNumberOfValues();
vtkm::Id totalVolume = contourTree.Nodes.GetNumberOfValues();
#ifdef DEBUG_PRINT
std::cout << "Total Volume: " << totalVolume << std::endl;
#endif
@ -953,7 +953,7 @@ public:
// Reroot the Euler Tour at the global max
tour.getTourAtRoot(MaskedIndex(contourTree.Superparents.GetPortalConstControl().Get(
contourTree.nodes.GetNumberOfValues() - 1)),
contourTree.Nodes.GetNumberOfValues() - 1)),
maxTourEdges.GetPortalControl());
//
@ -1000,7 +1000,7 @@ public:
vtkm::cont::Invoker Invoke;
Invoke(bestUpDownWorklet,
tour.first,
contourTree.nodes,
contourTree.Nodes,
contourTree.Supernodes,
minValues,
minParents,

2
vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeHyperAndSuperStructure_SetNewHypernodesAndArcs.h
View File

@ -109,7 +109,7 @@ public:
/*
for (vtkm::Id supernode = 0; supernode < contourTree.Supernodes.size(); supernode++)
{ // per supernode
bool isAHypernode = IsHypernode(contourTree.whenTransferred[supernode]);
bool isAHypernode = IsHypernode(contourTree.WhenTransferred[supernode]);
// ignore non-hypernodes
// all others (including the root hypernode) are kept

16
vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeRegularStructure_LocateSuperarcs.h
View File

@ -259,8 +259,8 @@ public:
indexType topSuperparent = contourTree.Superparents[top];
indexType bottomSuperparent = contourTree.Superparents[bottom];
// and we can also find out when they transferred
indexType topWhen = contourTree.whenTransferred[topSuperparent];
indexType bottomWhen = contourTree.whenTransferred[bottomSuperparent];
indexType topWhen = contourTree.WhenTransferred[topSuperparent];
indexType bottomWhen = contourTree.WhenTransferred[bottomSuperparent];
// and their hyperparent
indexType topHyperparent = contourTree.hyperparents[topSuperparent];
indexType bottomHyperparent = contourTree.hyperparents[bottomSuperparent];
@ -280,7 +280,7 @@ public:
topSuperparent = contourTree.hyperarcs[MaskedIndex(topHyperparent)];
top = contourTree.Supernodes[MaskedIndex(topSuperparent)];
topWhen = contourTree.whenTransferred[MaskedIndex(topSuperparent)];
topWhen = contourTree.WhenTransferred[MaskedIndex(topSuperparent)];
// test to see if we've passed the node
if (top < node)
{ // just pruned past
@ -297,7 +297,7 @@ public:
// we prune up to the top of the hyperarc in either case, by updating the bottom superparent
bottomSuperparent = contourTree.hyperarcs[MaskedIndex(bottomHyperparent)];
bottom = contourTree.Supernodes[MaskedIndex(bottomSuperparent)];
bottomWhen = contourTree.whenTransferred[MaskedIndex(bottomSuperparent)];
bottomWhen = contourTree.WhenTransferred[MaskedIndex(bottomSuperparent)];
// test to see if we've passed the node
if (bottom > node)
{ // just pruned past
@ -600,8 +600,8 @@ public:
indexType topSuperparent = contourTree.Superparents[top];
indexType bottomSuperparent = contourTree.Superparents[bottom];
// and we can also find out when they transferred
indexType topWhen = contourTree.whenTransferred[topSuperparent];
indexType bottomWhen = contourTree.whenTransferred[bottomSuperparent];
indexType topWhen = contourTree.WhenTransferred[topSuperparent];
indexType bottomWhen = contourTree.WhenTransferred[bottomSuperparent];
// and their hyperparent
indexType topHyperparent = contourTree.hyperparents[topSuperparent];
indexType bottomHyperparent = contourTree.hyperparents[bottomSuperparent];
@ -621,7 +621,7 @@ public:
topSuperparent = contourTree.hyperarcs[MaskedIndex(topHyperparent)];
top = contourTree.Supernodes[MaskedIndex(topSuperparent)];
topWhen = contourTree.whenTransferred[MaskedIndex(topSuperparent)];
topWhen = contourTree.WhenTransferred[MaskedIndex(topSuperparent)];
// test to see if we've passed the node
if (top < node)
{ // just pruned past
@ -638,7 +638,7 @@ public:
// we prune up to the top of the hyperarc in either case, by updating the bottom superparent
bottomSuperparent = contourTree.hyperarcs[MaskedIndex(bottomHyperparent)];
bottom = contourTree.Supernodes[MaskedIndex(bottomSuperparent)];
bottomWhen = contourTree.whenTransferred[MaskedIndex(bottomSuperparent)];
bottomWhen = contourTree.WhenTransferred[MaskedIndex(bottomSuperparent)];
// test to see if we've passed the node
if (bottom > node)
{ // just pruned past

4
vtkm/worklet/contourtree_augmented/contourtreemaker/ContourTreeSuperNodeComparator.h
View File

@ -86,8 +86,8 @@ public:
const IdArrayType& whenTransferred)
{
this->HyperparentsPortal = hyperparents.PrepareForInput(DeviceAdapter());
SupernodesPortal = supernodes.PrepareForInput(DeviceAdapter());
WhenTransferredPortal = whenTransferred.PrepareForInput(DeviceAdapter());
this->SupernodesPortal = supernodes.PrepareForInput(DeviceAdapter());
this->WhenTransferredPortal = whenTransferred.PrepareForInput(DeviceAdapter());
}
// () operator - gets called to do comparison