diff --git a/vtkm/cont/testing/UnitTestArrayHandleRandomStandardNormal.cxx b/vtkm/cont/testing/UnitTestArrayHandleRandomStandardNormal.cxx index dc95cf157..92748ad46 100644 --- a/vtkm/cont/testing/UnitTestArrayHandleRandomStandardNormal.cxx +++ b/vtkm/cont/testing/UnitTestArrayHandleRandomStandardNormal.cxx @@ -13,11 +13,11 @@ void TestArrayHandleStandardNormal() { - auto array = vtkm::cont::ArrayHandleRandomStandardNormal(1000000, { 0xceed }); + auto array = vtkm::cont::ArrayHandleRandomStandardNormal(50000, { 0xceed }); auto stats = vtkm::worklet::DescriptiveStatistics::Run(array); - VTKM_TEST_ASSERT(test_equal(stats.Mean(), 0, 0.001)); - VTKM_TEST_ASSERT(test_equal(stats.PopulationStddev(), 1, 0.001)); + VTKM_TEST_ASSERT(test_equal(stats.Mean(), 0, 0.01)); + VTKM_TEST_ASSERT(test_equal(stats.PopulationStddev(), 1, 0.01)); VTKM_TEST_ASSERT(test_equal(stats.Skewness(), 0.0f, 1.0f / 100)); VTKM_TEST_ASSERT(test_equal(stats.Kurtosis(), 3.0f, 1.0f / 100)); } diff --git a/vtkm/cont/testing/UnitTestArrayHandleRandomUniformReal.cxx b/vtkm/cont/testing/UnitTestArrayHandleRandomUniformReal.cxx index f6a1fa85b..7ee6edd52 100644 --- a/vtkm/cont/testing/UnitTestArrayHandleRandomUniformReal.cxx +++ b/vtkm/cont/testing/UnitTestArrayHandleRandomUniformReal.cxx @@ -15,7 +15,7 @@ void TestRangeBounds() { // the random numbers should fall into the range of [0, 1). - auto array = vtkm::cont::ArrayHandleRandomUniformReal(1000000, { 0xceed }); + auto array = vtkm::cont::ArrayHandleRandomUniformReal(100, { 0xceed }); auto portal = array.ReadPortal(); for (vtkm::Id i = 0; i < array.GetNumberOfValues(); ++i) { @@ -26,7 +26,7 @@ void TestRangeBounds() void TestStatisticsProperty() { - auto array = vtkm::cont::ArrayHandleRandomUniformReal(1000000, { 0xceed }); + auto array = vtkm::cont::ArrayHandleRandomUniformReal(10000, { 0xceed }); auto result = vtkm::worklet::DescriptiveStatistics::Run(array); VTKM_TEST_ASSERT(test_equal(result.Mean(), 0.5, 0.001)); diff --git a/vtkm/worklet/testing/UnitTestOrientNormals.cxx b/vtkm/worklet/testing/UnitTestOrientNormals.cxx index a8679add5..2d324a719 100644 --- a/vtkm/worklet/testing/UnitTestOrientNormals.cxx +++ b/vtkm/worklet/testing/UnitTestOrientNormals.cxx @@ -51,7 +51,7 @@ namespace VTKM_CONT vtkm::cont::DataSet CreateDataSet(bool pointNormals, bool cellNormals) { - vtkm::source::Wavelet wavelet({ -25 }, { 25 }); + vtkm::source::Wavelet wavelet({ -5 }, { 5 }); wavelet.SetFrequency({ 20, 15, 25 }); wavelet.SetMagnitude({ 5 }); auto dataSet = wavelet.Execute(); @@ -252,13 +252,6 @@ private: const NormalType curNormal = this->PointNormals.Get(curPtIdx); if (!this->SameHemisphere(curNormal, refNormal)) { - const auto coord = points.Get(curPtIdx); - std::cerr << "BadPointNormal PtId: " << curPtIdx << "\n\t" - << "- Normal: {" << curNormal[0] << ", " << curNormal[1] << ", " << curNormal[2] - << "}\n\t" - << "- Reference: {" << refNormal[0] << ", " << refNormal[1] << ", " - << refNormal[2] << "}\n\t" - << "- Coord: {" << coord[0] << ", " << coord[1] << ", " << coord[2] << "}\n"; throw vtkm::cont::ErrorBadValue("Bad point normal found!"); } refNormal = curNormal; @@ -283,11 +276,6 @@ private: const NormalType curNormal = this->CellNormals.Get(curCellIdx); if (!this->SameHemisphere(curNormal, refNormal)) { - std::cerr << "BadCellNormal: CellId: " << curCellIdx << "\n\t" - << "- Normal: {" << curNormal[0] << ", " << curNormal[1] << ", " - << curNormal[2] << "}\n\t" - << "- Reference: {" << refNormal[0] << ", " << refNormal[1] << ", " - << refNormal[2] << "}\n"; throw vtkm::cont::ErrorBadValue("Bad cell normal found!"); } refNormal = curNormal; @@ -326,14 +314,11 @@ void TestOrientNormals(bool testPoints, bool testCells) const bool inputValid = [&]() -> bool { try { - std::cerr << "Expecting to throw a BadNormal exception...\n"; ValidateNormals::Run(dataset, testPoints, testCells); return true; // Dataset is already oriented } catch (vtkm::cont::ErrorBadValue&) { - std::cerr << "Expected exception caught! All is well. " - "Future exceptions are errors.\n"; return false; // Dataset is unoriented } }(); @@ -348,8 +333,6 @@ void TestOrientNormals(bool testPoints, bool testCells) const auto cells = dataset.GetCellSet(); if (testPoints && testCells) { - std::cerr << "Testing point and cell normals...\n"; - const auto pointNormalField = dataset.GetPointField("normals"); const auto cellNormalField = dataset.GetCellField("normals"); auto pointNormals = pointNormalField.GetData().AsArrayHandle(); @@ -359,7 +342,6 @@ void TestOrientNormals(bool testPoints, bool testCells) } else if (testPoints) { - std::cerr << "Testing point normals...\n"; const auto pointNormalField = dataset.GetPointField("normals"); auto pointNormals = pointNormalField.GetData().AsArrayHandle(); @@ -367,7 +349,6 @@ void TestOrientNormals(bool testPoints, bool testCells) } else if (testCells) { - std::cerr << "Testing cell normals...\n"; const auto cellNormalField = dataset.GetCellField("normals"); auto cellNormals = cellNormalField.GetData().AsArrayHandle();