Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6167431
WIP: Updating MultiThresholdObjects and unit tests
mmarineBlueQuartz Apr 22, 2026
4d32275
Multi-component count correction
mmarineBlueQuartz Apr 22, 2026
cf61eac
Updated single threshold tests
mmarineBlueQuartz Apr 22, 2026
254e874
Removed component requirement for multiple input arrays
mmarineBlueQuartz Apr 22, 2026
15ef05b
Restructuring MultiThresholdObjects for Set support
mmarineBlueQuartz Apr 23, 2026
a78129f
Fixed MultiThresholdObjects ThresholdSets algorithm
mmarineBlueQuartz Apr 23, 2026
8072368
Re-enabled Invalid Execution unit test
mmarineBlueQuartz Apr 23, 2026
1438e62
Cleaned up MultiThresholdObjects algorithm
mmarineBlueQuartz Apr 23, 2026
6f2075d
Re-enabled. updated, and cleaned up unit tests
mmarineBlueQuartz Apr 23, 2026
69ae773
Clang format unit test file
mmarineBlueQuartz Apr 24, 2026
e008748
Fixed macOS / Linux compile error
mmarineBlueQuartz Apr 24, 2026
b9d41b9
Updated for large data
mmarineBlueQuartz Apr 28, 2026
4b05356
Add input array DataType coverage tests
mmarineBlueQuartz Jul 23, 2026
13921f5
Add: V&V docs
mmarineBlueQuartz Jul 23, 2026
b3d2844
V&V Fixes
mmarineBlueQuartz Aug 7, 2026
fb60f24
Update V&V docs
mmarineBlueQuartz Aug 7, 2026
1714d75
Remove unused err parameter
mmarineBlueQuartz Aug 13, 2026
47ad972
Update InsertThreshold to use getValue / setValue methods
mmarineBlueQuartz Aug 13, 2026
b24f7f5
Fix algorithm errors due to casting comparison value
mmarineBlueQuartz Aug 14, 2026
b9e3408
Update unit tests
mmarineBlueQuartz Aug 14, 2026
01f7f7a
Misc. cleanup
mmarineBlueQuartz Aug 14, 2026
9bc7d1a
Update V&V docs
mmarineBlueQuartz Aug 18, 2026
b4061f7
BUG: Restore legacy comparison semantics and address V&V review feedback
imikejackson Aug 19, 2026
a39708d
PERF: Write the first threshold of a set directly instead of combinin…
imikejackson Aug 19, 2026
2af9b98
DOC: Correct the algorithm line count in the V&V report
imikejackson Aug 19, 2026
4da00c8
DOC: Second-engineer sign-off and template conformance for the MultiT…
imikejackson Aug 19, 2026
1c0f8d4
BUG: Preserve nested threshold sets when converting SIMPL pipelines
imikejackson Aug 19, 2026
b464157
TEST: Add the missing tuple-dims convention check to the out-of-bound…
imikejackson Aug 20, 2026
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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ IFilter::PreflightResult MultiThresholdObjectsFilter::preflightImpl(const DataSt

// Check for same number of tuples and components
usize numTuples = dataArray.getNumberOfTuples();
usize numComponents = dataArray.getNumberOfComponents();
for(const auto& dataPath : thresholdPaths)
{
const auto& currentDataArray = dataStructure.getDataRefAs<IDataArray>(dataPath);
Expand All @@ -174,13 +173,6 @@ IFilter::PreflightResult MultiThresholdObjectsFilter::preflightImpl(const DataSt
auto errorMessage = fmt::format("Data Arrays do not have same equal number of tuples. '{}:{}' and '{}:{}'", firstDataPath.toString(), numTuples, dataPath.toString(), currentNumTuples);
return MakePreflightErrorResult(to_underlying(ErrorCodes::UnequalTuples), errorMessage);
}
usize currentNumComponents = currentDataArray.getNumberOfComponents();
if(currentNumComponents != numComponents)
{
auto errorMessage =
fmt::format("Data Arrays do not have same equal number of components. '{}:{}' and '{}:{}'", firstDataPath.toString(), numComponents, dataPath.toString(), currentNumComponents);
return MakePreflightErrorResult(to_underlying(ErrorCodes::UnequalComponents), errorMessage);
}
}

Result<> componentIndicesResult = CheckComponentIndicesInThresholds(thresholdsObject, dataStructure);
Expand Down Expand Up @@ -223,8 +215,8 @@ IFilter::PreflightResult MultiThresholdObjectsFilter::preflightImpl(const DataSt
}

// Create the output boolean array
auto action =
std::make_unique<CreateArrayAction>(maskArrayType, dataArray.getIDataStoreRef().getTupleShape(), std::vector<usize>{1}, firstDataPath.replaceName(maskArrayName), dataArray.getDataFormat());
const auto& dataStore = dataArray.getIDataStoreRef();
auto action = std::make_unique<CreateArrayAction>(maskArrayType, dataStore.getTupleShape(), std::vector<usize>{1}, firstDataPath.replaceName(maskArrayName), dataArray.getDataFormat());

OutputActions actions;
actions.appendAction(std::move(action));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ class SIMPLNXCORE_EXPORT MultiThresholdObjectsFilter : public IFilter

enum ErrorCodes : int64
{
UnequalComponents = -4001,
UnequalTuples = -4002,
CustomTrueWithBoolean = -4003,
CustomFalseWithBoolean = -4004,
Expand Down
Loading
Loading