Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENH: Fixes algorithm to compute shape factors from Triangle geometry #1157

Draft
wants to merge 12 commits into
base: develop
Choose a base branch
from
Draft

ENH: Fixes algorithm to compute shape factors from Triangle geometry #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6382eea
Add documentation to the functions.
imikejackson Dec 6, 2024
b4b262c
Compute Shape Values working.
imikejackson Dec 7, 2024
71986c9
Implement Unit test for Omega-3 Values only.
imikejackson Dec 7, 2024
87be91e
Use eigenvalues and eigenvector to find principle axes and primary axes
nyoungbq Dec 20, 2024
db939dd
correct production of eigenvalues/vectors
nyoungbq Dec 20, 2024
fe2c3d3
Correct axis length production, spacial requirement reduction, code c…
nyoungbq Dec 31, 2024
9c48092
strip unnecessary eigen processing
nyoungbq Dec 31, 2024
7479296
Correct CAD shape finder, Axis lengths are actually un-normalized ra…
nyoungbq Jan 2, 2025
3dee71a
parameter update: remove unused volumes array
nyoungbq Jan 2, 2025
e8a3457
Patch test and calculate Euler Characteristic fast watertight validation
nyoungbq Jan 3, 2025
33f62d4
use unordered set in fast edge counter, and move to utility file for …
nyoungbq Jan 8, 2025
f21b84d
[broken compile] intersection algorithm V1
nyoungbq Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Plugins/OrientationAnalysis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ set(FilterList
ComputeSchmidsFilter
ComputeShapesFilter
ComputeSlipTransmissionMetricsFilter
# ComputeTriangleGeomShapesFilter
ComputeTriangleGeomShapesFilter
ConvertHexGridToSquareGridFilter
ConvertOrientationsFilter
ConvertQuaternionFilter
Expand Down Expand Up @@ -186,7 +186,7 @@ set(filter_algorithms
ComputeSchmids
ComputeShapes
ComputeSlipTransmissionMetrics
# ComputeTriangleGeomShapes
ComputeTriangleGeomShapes
ConvertHexGridToSquareGrid
ConvertQuaternion
CreateEnsembleInfo
Expand Down
39 changes: 17 additions & 22 deletions src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ComputeShapes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,27 +139,28 @@ Result<> ComputeShapes::operator()()

if(imageGeom.getNumXCells() > 1 && imageGeom.getNumYCells() > 1 && imageGeom.getNumZCells() > 1)
{
find_moments();
find_axes();
find_axiseulers();
findMoments();
findAxes();
findAxisEulers();
}
if(imageGeom.getNumXCells() == 1 || imageGeom.getNumYCells() == 1 || imageGeom.getNumZCells() == 1)
{
find_moments2D();
find_axes2D();
find_axiseulers2D();
findMoments2D();
findAxes2D();
findAxisEulers2D();
}

return {};
}

// -----------------------------------------------------------------------------
void ComputeShapes::find_moments()
void ComputeShapes::findMoments()
{
const auto& imageGeom = m_DataStructure.getDataRefAs<ImageGeom>(m_InputValues->ImageGeometryPath);

const auto& featureIds = m_DataStructure.getDataRefAs<Int32Array>(m_InputValues->FeatureIdsArrayPath);
const auto& centroids = m_DataStructure.getDataRefAs<Float32Array>(m_InputValues->CentroidsArrayPath);
// Calculated Arrays
auto& volumes = m_DataStructure.getDataRefAs<Float32Array>(m_InputValues->VolumesArrayPath);
auto& omega3s = m_DataStructure.getDataRefAs<Float32Array>(m_InputValues->Omega3sArrayPath);

Expand Down Expand Up @@ -208,9 +209,11 @@ void ComputeShapes::find_moments()
y2 = y - (modYRes / 4.0f);
z1 = z + (modZRes / 4.0f);
z2 = z - (modZRes / 4.0f);

xdist1 = (x1 - (centroids[gnum * 3 + 0] * static_cast<float>(m_ScaleFactor)));
ydist1 = (y1 - (centroids[gnum * 3 + 1] * static_cast<float>(m_ScaleFactor)));
zdist1 = (z1 - (centroids[gnum * 3 + 2] * static_cast<float>(m_ScaleFactor)));

xdist2 = (x1 - (centroids[gnum * 3 + 0] * static_cast<float>(m_ScaleFactor)));
ydist2 = (y1 - (centroids[gnum * 3 + 1] * static_cast<float>(m_ScaleFactor)));
zdist2 = (z2 - (centroids[gnum * 3 + 2] * static_cast<float>(m_ScaleFactor)));
Expand Down Expand Up @@ -296,6 +299,7 @@ void ComputeShapes::find_moments()
m_FeatureEigenVals[featureId * 3 + 1] = eigenValues[idxs[1]].real();
m_FeatureEigenVals[featureId * 3 + 2] = eigenValues[idxs[2]].real();

// These values will be used to compute the axis eulers
// EigenVector associated with the largest EigenValue goes in the 3rd column
auto col = eigenVectors.col(idxs[0]);
m_EFVec[featureId * 9 + 2] = col(0).real();
Expand All @@ -321,6 +325,7 @@ void ComputeShapes::find_moments()
u110 = static_cast<float>(-m_FeatureMoments[featureId * 6 + 3]);
u011 = static_cast<float>(-m_FeatureMoments[featureId * 6 + 4]);
u101 = static_cast<float>(-m_FeatureMoments[featureId * 6 + 5]);

o3 = static_cast<double>((u200 * u020 * u002) + (2.0f * u110 * u101 * u011) - (u200 * u011 * u011) - (u020 * u101 * u101) - (u002 * u110 * u110));
vol5 = pow(vol5, 5.0);
omega3 = vol5 / o3;
Expand All @@ -338,9 +343,7 @@ void ComputeShapes::find_moments()
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void ComputeShapes::find_moments2D()
void ComputeShapes::findMoments2D()
{

const auto& featureIds = m_DataStructure.getDataRefAs<Int32Array>(m_InputValues->FeatureIdsArrayPath);
Expand Down Expand Up @@ -430,9 +433,7 @@ void ComputeShapes::find_moments2D()
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void ComputeShapes::find_axes()
void ComputeShapes::findAxes()
{
auto& axisLengths = m_DataStructure.getDataRefAs<Float32Array>(m_InputValues->AxisLengthsArrayPath);
auto& aspectRatios = m_DataStructure.getDataRefAs<Float32Array>(m_InputValues->AspectRatiosArrayPath);
Expand Down Expand Up @@ -476,9 +477,7 @@ void ComputeShapes::find_axes()
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void ComputeShapes::find_axes2D()
void ComputeShapes::findAxes2D()
{
auto& volumes = m_DataStructure.getDataRefAs<Float32Array>(m_InputValues->VolumesArrayPath);
auto& axisLengths = m_DataStructure.getDataRefAs<Float32Array>(m_InputValues->AxisLengthsArrayPath);
Expand Down Expand Up @@ -551,9 +550,7 @@ void ComputeShapes::find_axes2D()
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void ComputeShapes::find_axiseulers()
void ComputeShapes::findAxisEulers()
{
const auto& centroids = m_DataStructure.getDataRefAs<Float32Array>(m_InputValues->CentroidsArrayPath);
auto& axisEulerAngles = m_DataStructure.getDataRefAs<Float32Array>(m_InputValues->AxisEulerAnglesArrayPath);
Expand Down Expand Up @@ -588,9 +585,7 @@ void ComputeShapes::find_axiseulers()
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void ComputeShapes::find_axiseulers2D()
void ComputeShapes::findAxisEulers2D()
{
const auto& centroids = m_DataStructure.getDataRefAs<Float32Array>(m_InputValues->CentroidsArrayPath);
auto& axisEulerAngles = m_DataStructure.getDataRefAs<Float32Array>(m_InputValues->AxisEulerAnglesArrayPath);
Expand Down
12 changes: 6 additions & 6 deletions src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ComputeShapes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,32 +56,32 @@ class ORIENTATIONANALYSIS_EXPORT ComputeShapes
/**
* @brief find_moments Determines the second order moments for each Feature
*/
void find_moments();
void findMoments();

/**
* @brief find_moments2D Determines the second order moments for each Feature (2D version)
*/
void find_moments2D();
void findMoments2D();

/**
* @brief find_axes Determine principal axis lengths for each Feature
*/
void find_axes();
void findAxes();

/**
* @brief find_axes2D Determine principal axis lengths for each Feature (2D version)
*/
void find_axes2D();
void findAxes2D();

/**
* @brief find_axiseulers Determine principal axis directions for each Feature
*/
void find_axiseulers();
void findAxisEulers();

/**
* @brief find_axiseulers2D Determine principal axis directions for each Feature (2D version)
*/
void find_axiseulers2D();
void findAxisEulers2D();
};

} // namespace nx::core
Loading
Loading