Skip to content

Commit

Permalink
COMP: Fix msvc compiler warnings
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Jackson <[email protected]>
  • Loading branch information
imikejackson committed Oct 17, 2024
1 parent 67217d1 commit 2c4128d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ Result<> CreateAMScanPaths::operator()()
char good = determineIntersectCoord(p1, p2, vert1, vert2, coord);
if(good == 'i')
{
intersectionCoords.insert(std::pair<float, usize>(coord, 0));
intersectionCoords.insert(std::pair<float, usize>(coord, 0ULL));
}
else if(good == 'c' || good == 'd')
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ IFilter::PreflightResult CreateDataArrayAdvancedFilter::preflightImpl(const Data
usize numComponents = std::accumulate(compDims.begin(), compDims.end(), static_cast<usize>(1), std::multiplies<>());
if(numComponents <= 0)
{
std::string compDimsStr = std::accumulate(compDims.begin() + 1, compDims.end(), std::to_string(compDims[0]), [](const std::string& a, int b) { return a + " x " + std::to_string(b); });
std::string compDimsStr = std::accumulate(compDims.begin() + 1ULL, compDims.end(), std::to_string(compDims[0]), [](const std::string& a, int b) { return a + " x " + std::to_string(b); });
return MakePreflightErrorResult(
-78601,
fmt::format("The chosen component dimensions ({}) results in 0 total components. Please choose component dimensions that result in a positive number of total components.", compDimsStr));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Parameters DBSCANFilter::parameters() const

params.insertSeparator(Parameters::Separator{"Input Parameter(s)"});
params.insert(std::make_unique<BoolParameter>(k_UsePrecaching_Key, "Use Precaching", "If true the algorithm will be significantly faster, but it requires more memory", true));
params.insert(std::make_unique<Float32Parameter>(k_Epsilon_Key, "Epsilon", "The epsilon-neighborhood around each point is queried", 0.0001));
params.insert(std::make_unique<Float32Parameter>(k_Epsilon_Key, "Epsilon", "The epsilon-neighborhood around each point is queried", 0.0001f));
params.insert(std::make_unique<Int32Parameter>(k_MinPoints_Key, "Minimum Points",
"The minimum number of points needed to form a 'dense region' (i.e., the minimum number of points needed to be called a cluster)", 2));
params.insert(
Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/SimplnxCore/test/DBSCANTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TEST_CASE("SimplnxCore::DBSCAN: Valid Filter Execution (Precached, Iterative)",
// Create default Parameters for the filter.
args.insertOrAssign(DBSCANFilter::k_InitTypeIndex_Key, std::make_any<ChoicesParameter::ValueType>(to_underlying(AlgType::Iterative)));
args.insertOrAssign(DBSCANFilter::k_UsePrecaching_Key, std::make_any<bool>(true));
args.insertOrAssign(DBSCANFilter::k_Epsilon_Key, std::make_any<float32>(0.01));
args.insertOrAssign(DBSCANFilter::k_Epsilon_Key, std::make_any<float32>(0.01f));
args.insertOrAssign(DBSCANFilter::k_MinPoints_Key, std::make_any<int32>(50));
args.insertOrAssign(DBSCANFilter::k_UseMask_Key, std::make_any<bool>(false));
args.insertOrAssign(DBSCANFilter::k_SelectedArrayPath_Key, std::make_any<DataPath>(k_TargetArrayPath));
Expand Down

0 comments on commit 2c4128d

Please sign in to comment.