From eb4661414ebd9ee0de094b56a2e1754cb3a38014 Mon Sep 17 00:00:00 2001 From: Jared Duffey Date: Fri, 1 Nov 2024 15:48:26 -0400 Subject: [PATCH 1/2] Use ImageGeom::getCoordsf to get voxel center for ComputeShapes * Fixes inconsistency between filters with where the voxel center is assumed to be Signed-off-by: Jared Duffey --- .../Filters/Algorithms/ComputeShapes.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ComputeShapes.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ComputeShapes.cpp index 834dd39a9d..db52421d06 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ComputeShapes.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ComputeShapes.cpp @@ -199,9 +199,10 @@ void ComputeShapes::find_moments() for(size_t k = 0; k < xPoints; k++) { int32_t gnum = featureIds[zStride + yStride + k]; - x = float(k * modXRes) + (origin[0] * static_cast(m_ScaleFactor)); - y = float(j * modYRes) + (origin[1] * static_cast(m_ScaleFactor)); - z = float(i * modZRes) + (origin[2] * static_cast(m_ScaleFactor)); + FloatVec3 voxelCenter = imageGeom.getCoordsf(k, j, i); + x = voxelCenter[0] * static_cast(m_ScaleFactor); + y = voxelCenter[1] * static_cast(m_ScaleFactor); + z = voxelCenter[2] * static_cast(m_ScaleFactor); x1 = x + (modXRes / 4.0f); x2 = x - (modXRes / 4.0f); y1 = y + (modYRes / 4.0f); From 6518e08417a624263255f4abaca4ace47d4d8a4f Mon Sep 17 00:00:00 2001 From: Jared Duffey Date: Fri, 1 Nov 2024 15:57:32 -0400 Subject: [PATCH 2/2] Updated tests files using 6_6_stats_test to v2 Signed-off-by: Jared Duffey --- .../test/AlignSectionsMutualInformationTest.cpp | 4 ++-- src/Plugins/OrientationAnalysis/test/CMakeLists.txt | 2 +- .../test/ComputeFeatureReferenceMisorientationsTest.cpp | 4 ++-- .../test/ComputeKernelAvgMisorientationsTest.cpp | 4 ++-- .../OrientationAnalysis/test/ComputeMisorientationsTest.cpp | 4 ++-- src/Plugins/OrientationAnalysis/test/ComputeSchmidsTest.cpp | 4 ++-- .../OrientationAnalysis/test/ComputeShapesFilterTest.cpp | 4 ++-- src/Plugins/SimplnxCore/test/CMakeLists.txt | 2 +- src/Plugins/SimplnxCore/test/ComputeEuclideanDistMapTest.cpp | 4 ++-- src/Plugins/SimplnxCore/test/ComputeFeatureCentroidsTest.cpp | 4 ++-- src/Plugins/SimplnxCore/test/ComputeFeatureNeighborsTest.cpp | 4 ++-- .../SimplnxCore/test/ComputeFeaturePhasesFilterTest.cpp | 4 ++-- src/Plugins/SimplnxCore/test/ComputeFeatureSizesTest.cpp | 4 ++-- src/Plugins/SimplnxCore/test/ComputeNeighborhoodsTest.cpp | 4 ++-- .../SimplnxCore/test/ComputeSurfaceAreaToVolumeTest.cpp | 4 ++-- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp b/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp index 78feef3f09..2585f07af7 100644 --- a/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp @@ -138,10 +138,10 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: InValid filter execution") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); // Instantiate the filter and an Arguments Object AlignSectionsMutualInformationFilter filter; diff --git a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt index cd903dceef..eb76166119 100644 --- a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt @@ -127,7 +127,7 @@ if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_read_ang_data.tar.gz SHA512 1777431a1623e2fffdc2daad9be51a72c3bdf6a83a33893827892c98a811991e21f1cf636e036604d0bbc523d8ca0b9d655c28be3d0e89ccafc1486dfa0bd0c7) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_read_ctf_data_2.tar.gz SHA512 f397fa3bf457615a90a4b48eaafded2aa4952b41ccb28d9da6a83adc38aea9c22f2bb5a955f251edeca9ef8265b6bf1d74e829b1340f45cf52620a237aad1707) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_Small_IN100_GBCD.tar.gz SHA512 543e3bdcee24ff9e5cd80dfdedc39ceef1529e7172cebd01d8e5518292ffdf4e0eb2e79d75854cb3eaca5c60e19c861ca67f369e21b81c306edb66327f47a1e3) - download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_stats_test.tar.gz SHA512 cb1d1c004ab5a3cb29cc10f7b6c291dd5819e57e303242b8162cd0b268dea24b1d3e5e3811ec4f5ee216179b6eb6b81c76ee7d37b7c49e83c6ab336147b4b14e) + download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_stats_test_v2.tar.gz SHA512 e84999dec914d81efce4fc4237c49c9bf32e48381b1e79f58aa4df934f0d7606cd7a948f9a5e7b17a126a7944cc531b531cfdc70756ca3e2207b20734e089723) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME align_sections.tar.gz SHA512 b6892e437df86bd79bd2f1d8f48e44d05bfe38b3453058744320bfaf1b1dc461a484edc9e593f6b9de4ad4d04c41b5dbd0a30e6fc605341d046aec4c3062e33e) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME bad_data_neighbor_orientation_check.tar.gz SHA512 6452cfb1f2394c10050082256f60a2068cfad78ef742e9e35b1d6e63b3fb7c35c9fe7bbe093bed4dbb4e758c49ec6da7b1f7e2473838a0421f39fbdd9f4a2f76) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME convert_hex_grid_to_square_grid_test.tar.gz SHA512 bb672ebbe2540ba493ad95bea95dac1f85b5634ac3311b5aa774ce3d2177103d1b45a13225221993dd40f0cbe02daf20ccd209d4ae0cab0bf034d97c5b234ba4) diff --git a/src/Plugins/OrientationAnalysis/test/ComputeFeatureReferenceMisorientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/ComputeFeatureReferenceMisorientationsTest.cpp index 5975234835..d0f837b2f0 100644 --- a/src/Plugins/OrientationAnalysis/test/ComputeFeatureReferenceMisorientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ComputeFeatureReferenceMisorientationsTest.cpp @@ -29,10 +29,10 @@ TEST_CASE("OrientationAnalysis::ComputeFeatureReferenceMisorientationsFilter", " { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); diff --git a/src/Plugins/OrientationAnalysis/test/ComputeKernelAvgMisorientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/ComputeKernelAvgMisorientationsTest.cpp index a86e6dc236..4afc895103 100644 --- a/src/Plugins/OrientationAnalysis/test/ComputeKernelAvgMisorientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ComputeKernelAvgMisorientationsTest.cpp @@ -25,10 +25,10 @@ TEST_CASE("OrientationAnalysis::ComputeKernelAvgMisorientationsFilter", "[Orient { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); diff --git a/src/Plugins/OrientationAnalysis/test/ComputeMisorientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/ComputeMisorientationsTest.cpp index 60e72b2895..a94b9b59c9 100644 --- a/src/Plugins/OrientationAnalysis/test/ComputeMisorientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ComputeMisorientationsTest.cpp @@ -25,10 +25,10 @@ TEST_CASE("OrientationAnalysis::ComputeMisorientationsFilter", "[OrientationAnal { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); diff --git a/src/Plugins/OrientationAnalysis/test/ComputeSchmidsTest.cpp b/src/Plugins/OrientationAnalysis/test/ComputeSchmidsTest.cpp index 07129733ad..eac04f32a5 100644 --- a/src/Plugins/OrientationAnalysis/test/ComputeSchmidsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ComputeSchmidsTest.cpp @@ -29,10 +29,10 @@ TEST_CASE("OrientationAnalysis::ComputeSchmidsFilter", "[OrientationAnalysis][Co { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); diff --git a/src/Plugins/OrientationAnalysis/test/ComputeShapesFilterTest.cpp b/src/Plugins/OrientationAnalysis/test/ComputeShapesFilterTest.cpp index bd154c3a18..df4a17b322 100644 --- a/src/Plugins/OrientationAnalysis/test/ComputeShapesFilterTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ComputeShapesFilterTest.cpp @@ -17,10 +17,10 @@ TEST_CASE("OrientationAnalysis::ComputeShapesFilter", "[SimplnxCore][ComputeShap { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); const std::string k_Omega3sArrayName("Omega3s"); diff --git a/src/Plugins/SimplnxCore/test/CMakeLists.txt b/src/Plugins/SimplnxCore/test/CMakeLists.txt index d382927785..35c02ced47 100644 --- a/src/Plugins/SimplnxCore/test/CMakeLists.txt +++ b/src/Plugins/SimplnxCore/test/CMakeLists.txt @@ -204,7 +204,7 @@ if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_replace_element_attributes_with_neighbor.tar.gz SHA512 319ebdf08b83ce5ec915afda8ee2af1e0952a3ce26b3e65a4171eb3125c7bc6613c3994610bf526f70413c00da9061c3e6c2d867643220d62faa8c3cd79a96cd) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_resample_rect_grid_to_image_geom.tar.gz SHA512 58cabfb83deeef7aff1252963a8cb378745ca00fc120a9623f699b4c9c618d216c4d3fa88e964772706a0096e979abc741be7ba6f96a2398162b3f6d4ec8ec13) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_sample_surface_mesh.tar.gz SHA512 b1eec1127d125303a4757a482a7fd4b6c0e42241f01f8afabec9a15dc1ffa6d732afc11b4623aaf81c7a9e53de59423ef4bbc470710c31fe9a5c61916bdf544e) - download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_stats_test.tar.gz SHA512 cb1d1c004ab5a3cb29cc10f7b6c291dd5819e57e303242b8162cd0b268dea24b1d3e5e3811ec4f5ee216179b6eb6b81c76ee7d37b7c49e83c6ab336147b4b14e) + download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_stats_test_v2.tar.gz SHA512 e84999dec914d81efce4fc4237c49c9bf32e48381b1e79f58aa4df934f0d7606cd7a948f9a5e7b17a126a7944cc531b531cfdc70756ca3e2207b20734e089723) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_vertex_to_triangle_distances.tar.gz SHA512 d679cde985c326a249c2b52c6e5732dcead263127a8e7f5578c4bf450730a691c840af75a0162d2bbb38eb97f9572cf72a3e1b01d3fd6c670db59619f46aeec9) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_volume_fraction_feature_count.dream3d.tar.gz SHA512 e4205186dee5b97bef3fb5f265bc12f8379a68860f70de33a483680eba0433a35c9c98db56bc92c949fb215f73f5f7698f83394697e81604c8c4b8a06874943f) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_write_stl_file_test.tar.gz SHA512 05455dfb57724a14a3b2d92ad02ac335b5596ca4f353830ee60d84ffc858523136140328a1c95b6693331be9dc5c40a26e76f45ee54ab11e218f5efb6b2a4c38) diff --git a/src/Plugins/SimplnxCore/test/ComputeEuclideanDistMapTest.cpp b/src/Plugins/SimplnxCore/test/ComputeEuclideanDistMapTest.cpp index cf15d05168..25e8d8b03a 100644 --- a/src/Plugins/SimplnxCore/test/ComputeEuclideanDistMapTest.cpp +++ b/src/Plugins/SimplnxCore/test/ComputeEuclideanDistMapTest.cpp @@ -13,10 +13,10 @@ using namespace nx::core::UnitTest; TEST_CASE("SimplnxCore::ComputeEuclideanDistMap", "[SimplnxCore][ComputeEuclideanDistMap]") { - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); const DataPath k_CellFeatureDataAM = k_DataContainerPath.createChildPath("CellFeatureData"); diff --git a/src/Plugins/SimplnxCore/test/ComputeFeatureCentroidsTest.cpp b/src/Plugins/SimplnxCore/test/ComputeFeatureCentroidsTest.cpp index 8037e33755..6247b21ec8 100644 --- a/src/Plugins/SimplnxCore/test/ComputeFeatureCentroidsTest.cpp +++ b/src/Plugins/SimplnxCore/test/ComputeFeatureCentroidsTest.cpp @@ -18,10 +18,10 @@ using namespace nx::core::Constants; TEST_CASE("SimplnxCore::ComputeFeatureCentroidsFilter", "[SimplnxCore][ComputeFeatureCentroidsFilter]") { - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = LoadDataStructure(baseDataFilePath); const std::string k_CentroidsNX("Centroids NX"); diff --git a/src/Plugins/SimplnxCore/test/ComputeFeatureNeighborsTest.cpp b/src/Plugins/SimplnxCore/test/ComputeFeatureNeighborsTest.cpp index 539d24ea95..6cd1af017f 100644 --- a/src/Plugins/SimplnxCore/test/ComputeFeatureNeighborsTest.cpp +++ b/src/Plugins/SimplnxCore/test/ComputeFeatureNeighborsTest.cpp @@ -12,9 +12,9 @@ using namespace nx::core::UnitTest; TEST_CASE("SimplnxCore::ComputeFeatureNeighborsFilter", "[SimplnxCore][ComputeFeatureNeighborsFilter]") { - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); diff --git a/src/Plugins/SimplnxCore/test/ComputeFeaturePhasesFilterTest.cpp b/src/Plugins/SimplnxCore/test/ComputeFeaturePhasesFilterTest.cpp index a9d1c2133c..eb898e169c 100644 --- a/src/Plugins/SimplnxCore/test/ComputeFeaturePhasesFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/ComputeFeaturePhasesFilterTest.cpp @@ -13,9 +13,9 @@ using namespace nx::core::UnitTest; TEST_CASE("SimplnxCore::ComputeFeaturePhasesFilter(Valid Parameters)", "[SimplnxCore][ComputeFeaturePhasesFilter]") { - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); diff --git a/src/Plugins/SimplnxCore/test/ComputeFeatureSizesTest.cpp b/src/Plugins/SimplnxCore/test/ComputeFeatureSizesTest.cpp index ece76e5070..fd57ddaae6 100644 --- a/src/Plugins/SimplnxCore/test/ComputeFeatureSizesTest.cpp +++ b/src/Plugins/SimplnxCore/test/ComputeFeatureSizesTest.cpp @@ -22,10 +22,10 @@ const std::string k_EquivalentDiameters("EquivalentDiameters"); TEST_CASE("SimplnxCore::ComputeFeatureSizes", "[SimplnxCore][ComputeFeatureSizes]") { - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); diff --git a/src/Plugins/SimplnxCore/test/ComputeNeighborhoodsTest.cpp b/src/Plugins/SimplnxCore/test/ComputeNeighborhoodsTest.cpp index bf556a2923..a9f1edcaf0 100644 --- a/src/Plugins/SimplnxCore/test/ComputeNeighborhoodsTest.cpp +++ b/src/Plugins/SimplnxCore/test/ComputeNeighborhoodsTest.cpp @@ -25,10 +25,10 @@ const std::string k_NeighborhoodListNX("NeighborhoodListNX"); TEST_CASE("SimplnxCore::ComputeNeighborhoods", "[SimplnxCore][ComputeNeighborhoods]") { - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); const DataPath k_CellFeatureDataAM = k_DataContainerPath.createChildPath(k_CellFeatureData); diff --git a/src/Plugins/SimplnxCore/test/ComputeSurfaceAreaToVolumeTest.cpp b/src/Plugins/SimplnxCore/test/ComputeSurfaceAreaToVolumeTest.cpp index 13bb79a629..fad4c99728 100644 --- a/src/Plugins/SimplnxCore/test/ComputeSurfaceAreaToVolumeTest.cpp +++ b/src/Plugins/SimplnxCore/test/ComputeSurfaceAreaToVolumeTest.cpp @@ -25,10 +25,10 @@ const std::string k_SphericityArrayNameNX("SphericityNX"); TEST_CASE("SimplnxCore::ComputeSurfaceAreaToVolume", "[SimplnxCore][ComputeSurfaceAreaToVolume]") { - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test_v2.tar.gz", "6_6_stats_test_v2.dream3d"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test_v2.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); // Instantiate the filter, a DataStructure object and an Arguments Object