From 21e2b9b0cb83761e08449d1a4bf1002f5bde79fe Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Tue, 21 Nov 2023 10:25:56 -0500 Subject: [PATCH] Random without range tests done --- .../ComplexCore/Filters/InitializeData.cpp | 26 +++++++++------- .../ComplexCore/test/InitializeDataTest.cpp | 30 ++++++++++--------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeData.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeData.cpp index d028d03c15..7c3b69bb72 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeData.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeData.cpp @@ -603,20 +603,26 @@ IFilter::PreflightResult InitializeData::preflightImpl(const DataStructure& data auto createAction = std::make_unique(DataType::uint64, std::vector{1}, std::vector{1}, DataPath({seedArrayNameValue})); resultOutputActions.value().appendAction(std::move(createAction)); - if(args.value(k_StandardizeSeed_Key) && numComp == 1) + if(numComp == 1) { - operationNuancesStrm << fmt::format("You chose to standardize the seed for each component, but the array {} is a single component so it will not alter the randomization scheme.", - iDataArray.getName()); - } - else if(args.value(k_StandardizeSeed_Key)) - { - operationNuancesStrm << "This generates THE SAME sequences of random numbers for each component in the array based on one seed.\n"; - operationNuancesStrm << "The resulting array will look like | 1,1,1 | 9,9,9 | ...\n"; + if(args.value(k_StandardizeSeed_Key)) + { + operationNuancesStrm << fmt::format("You chose to standardize the seed for each component, but the array {} is a single component so it will not alter the randomization scheme.", + iDataArray.getName()); + } } else { - operationNuancesStrm << "This generates DIFFERENT sequences of random numbers for each component in the array based on x seeds all modified versions of an original seed.\n"; - operationNuancesStrm << "The resulting array will look like | 1,9,5 | 7,1,6 | ...\n"; + if(args.value(k_StandardizeSeed_Key)) + { + operationNuancesStrm << "This generates THE SAME sequences of random numbers for each component in the array based on one seed.\n"; + operationNuancesStrm << "The resulting array will look like | 1,1,1 | 9,9,9 | ...\n"; + } + else + { + operationNuancesStrm << "This generates DIFFERENT sequences of random numbers for each component in the array based on x seeds all modified versions of an original seed.\n"; + operationNuancesStrm << "The resulting array will look like | 1,9,5 | 7,1,6 | ...\n"; + } } break; diff --git a/src/Plugins/ComplexCore/test/InitializeDataTest.cpp b/src/Plugins/ComplexCore/test/InitializeDataTest.cpp index 838be8e7f6..857b655067 100644 --- a/src/Plugins/ComplexCore/test/InitializeDataTest.cpp +++ b/src/Plugins/ComplexCore/test/InitializeDataTest.cpp @@ -518,8 +518,9 @@ TEST_CASE("ComplexCore::InitializeData 17: Boolean Multi Component Standardized- TEST_CASE("ComplexCore::InitializeData 18: Single Component Random Initialization", "[ComplexCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "k_files.tar.gz", "k_files"); - DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_single_component_fill.dream3d", unit_test::k_TestFilesDir))); + const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); + DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_single_comp_rand.dream3d", unit_test::k_TestFilesDir))); { // Instantiate the filter and an Arguments Object @@ -527,11 +528,11 @@ TEST_CASE("ComplexCore::InitializeData 18: Single Component Random Initializatio Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(InitializeData::k_ArrayPath_Key, std::make_any(DataPath{})); - args.insertOrAssign(InitializeData::k_InitType_Key, std::make_any(2)); // Default Seed + args.insertOrAssign(InitializeData::k_ArrayPath_Key, std::make_any(DataPath({"baseline"}))); + args.insertOrAssign(InitializeData::k_InitType_Key, std::make_any(2)); args.insertOrAssign(InitializeData::k_UseSeed_Key, std::make_any(true)); - // omit seed value to use default seed type - // omit seed array name since it will not be used + args.insertOrAssign(InitializeData::k_SeedValue_Key, std::make_any(5489)); + args.insertOrAssign(InitializeData::k_SeedArrayName_Key, std::make_any("InitializeData SeedValue Test")); args.insertOrAssign(InitializeData::k_StandardizeSeed_Key, std::make_any(false)); // Preflight the filter and check result @@ -543,13 +544,14 @@ TEST_CASE("ComplexCore::InitializeData 18: Single Component Random Initializatio REQUIRE(executeResult.result.valid()); } - UnitTest::CompareArrays(dataStructure, DataPath({"exemplar"}), DataPath{}); + UnitTest::CompareArrays(dataStructure, DataPath({"exemplar"}), DataPath({"baseline"})); } TEST_CASE("ComplexCore::InitializeData 19: Multi Component Standardized-Random Initialization", "[ComplexCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "k_files.tar.gz", "k_files"); - DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_single_component_fill.dream3d", unit_test::k_TestFilesDir))); + const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); + DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_stand_rand.dream3d", unit_test::k_TestFilesDir))); { // Instantiate the filter and an Arguments Object @@ -557,11 +559,11 @@ TEST_CASE("ComplexCore::InitializeData 19: Multi Component Standardized-Random I Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(InitializeData::k_ArrayPath_Key, std::make_any(DataPath{})); - args.insertOrAssign(InitializeData::k_InitType_Key, std::make_any(2)); // Default Seed + args.insertOrAssign(InitializeData::k_ArrayPath_Key, std::make_any(DataPath({"baseline"}))); + args.insertOrAssign(InitializeData::k_InitType_Key, std::make_any(2)); args.insertOrAssign(InitializeData::k_UseSeed_Key, std::make_any(true)); - // omit seed value to use default seed type - // omit seed array name since it will not be used + args.insertOrAssign(InitializeData::k_SeedValue_Key, std::make_any(5489)); + args.insertOrAssign(InitializeData::k_SeedArrayName_Key, std::make_any("InitializeData SeedValue Test")); args.insertOrAssign(InitializeData::k_StandardizeSeed_Key, std::make_any(true)); // Preflight the filter and check result @@ -573,7 +575,7 @@ TEST_CASE("ComplexCore::InitializeData 19: Multi Component Standardized-Random I REQUIRE(executeResult.result.valid()); } - UnitTest::CompareArrays(dataStructure, DataPath({"exemplar"}), DataPath{}); + UnitTest::CompareArrays(dataStructure, DataPath({"exemplar"}), DataPath({"baseline"})); } TEST_CASE("ComplexCore::InitializeData 20: Multi Component Non-Standardized-Random Initialization", "[ComplexCore][InitializeData]")