Skip to content
Snippets Groups Projects
Unverified Commit e432e1b0 authored by Ganeva, Marina's avatar Ganeva, Marina Committed by GitHub
Browse files

Merge pull request #413 from waltervh/develop 

Replace floating equality with EXPECT_NEAR in RectangularConverterTest
parents 1f467bed dc1b6adc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Tests/UnitTests/Core/Detector/RectangularConverterTest.h
+ 32
− 28
View file @ e432e1b0
...@@ -48,32 +48,34 @@ TEST_F(RectangularConverterTest, RectangularConverter) ...@@ -48,32 +48,34 @@ TEST_F(RectangularConverterTest, RectangularConverter)
EXPECT_EQ(converter.dimension(), 2u); EXPECT_EQ(converter.dimension(), 2u);
EXPECT_DOUBLE_EQ(converter.calculateMin(0, AxesUnits::DEFAULT), 0.0); EXPECT_NEAR(converter.calculateMin(0, AxesUnits::DEFAULT), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(converter.calculateMin(0, AxesUnits::NBINS), 0.0); EXPECT_NEAR(converter.calculateMin(0, AxesUnits::NBINS), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(converter.calculateMin(0, AxesUnits::MM), 0.0); EXPECT_NEAR(converter.calculateMin(0, AxesUnits::MM), 0.0, 1e-12);
EXPECT_NEAR(converter.calculateMin(0, AxesUnits::RADIANS), -m_phi, m_phi*1e-10); EXPECT_NEAR(converter.calculateMin(0, AxesUnits::RADIANS), -m_phi, m_phi*1e-10);
EXPECT_NEAR(converter.calculateMin(0, AxesUnits::DEGREES), Units::rad2deg(-m_phi), EXPECT_NEAR(converter.calculateMin(0, AxesUnits::DEGREES), Units::rad2deg(-m_phi),
Units::rad2deg(m_phi)*1e-10); Units::rad2deg(m_phi)*1e-10);
EXPECT_NEAR(converter.calculateMin(0, AxesUnits::QSPACE), -m_kfy, m_kfy*1e-10); EXPECT_NEAR(converter.calculateMin(0, AxesUnits::QSPACE), -m_kfy, m_kfy*1e-10);
EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::DEFAULT), det_width); EXPECT_NEAR(converter.calculateMax(0, AxesUnits::DEFAULT), det_width, det_width*1e-10);
EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::NBINS), static_cast<double>(det_nx)); EXPECT_NEAR(converter.calculateMax(0, AxesUnits::NBINS), static_cast<double>(det_nx),
EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::MM), det_width); det_nx*1e-10);
EXPECT_NEAR(converter.calculateMax(0, AxesUnits::MM), det_width, det_width*1e-10);
EXPECT_NEAR(converter.calculateMax(0, AxesUnits::RADIANS), m_phi, m_phi*1e-10); EXPECT_NEAR(converter.calculateMax(0, AxesUnits::RADIANS), m_phi, m_phi*1e-10);
EXPECT_NEAR(converter.calculateMax(0, AxesUnits::DEGREES), Units::rad2deg(m_phi), EXPECT_NEAR(converter.calculateMax(0, AxesUnits::DEGREES), Units::rad2deg(m_phi),
Units::rad2deg(m_phi)*1e-10); Units::rad2deg(m_phi)*1e-10);
EXPECT_NEAR(converter.calculateMax(0, AxesUnits::QSPACE), m_kfy, m_kfy*1e-10); EXPECT_NEAR(converter.calculateMax(0, AxesUnits::QSPACE), m_kfy, m_kfy*1e-10);
EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::DEFAULT), 0.0); EXPECT_NEAR(converter.calculateMin(1, AxesUnits::DEFAULT), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::NBINS), 0.0); EXPECT_NEAR(converter.calculateMin(1, AxesUnits::NBINS), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::MM), 0.0); EXPECT_NEAR(converter.calculateMin(1, AxesUnits::MM), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::RADIANS), 0.0); EXPECT_NEAR(converter.calculateMin(1, AxesUnits::RADIANS), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::DEGREES), 0.0); EXPECT_NEAR(converter.calculateMin(1, AxesUnits::DEGREES), 0.0, 1e-12);
EXPECT_NEAR(converter.calculateMin(1, AxesUnits::QSPACE), - m_kiz, std::abs(m_kiz)*1e-10); EXPECT_NEAR(converter.calculateMin(1, AxesUnits::QSPACE), - m_kiz, std::abs(m_kiz)*1e-10);
EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::DEFAULT), det_height); EXPECT_NEAR(converter.calculateMax(1, AxesUnits::DEFAULT), det_height, det_height*1e-10);
EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::NBINS), static_cast<double>(det_ny)); EXPECT_NEAR(converter.calculateMax(1, AxesUnits::NBINS), static_cast<double>(det_ny),
EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::MM), det_height); det_ny*1e-10);
EXPECT_NEAR(converter.calculateMax(1, AxesUnits::MM), det_height, det_height*1e-10);
EXPECT_NEAR(converter.calculateMax(1, AxesUnits::RADIANS), m_alpha, m_alpha*1e-10); EXPECT_NEAR(converter.calculateMax(1, AxesUnits::RADIANS), m_alpha, m_alpha*1e-10);
EXPECT_NEAR(converter.calculateMax(1, AxesUnits::DEGREES), Units::rad2deg(m_alpha), EXPECT_NEAR(converter.calculateMax(1, AxesUnits::DEGREES), Units::rad2deg(m_alpha),
Units::rad2deg(m_alpha)*1e-10); Units::rad2deg(m_alpha)*1e-10);
...@@ -91,32 +93,34 @@ TEST_F(RectangularConverterTest, RectangularConverterClone) ...@@ -91,32 +93,34 @@ TEST_F(RectangularConverterTest, RectangularConverterClone)
EXPECT_EQ(P_clone->dimension(), 2u); EXPECT_EQ(P_clone->dimension(), 2u);
EXPECT_DOUBLE_EQ(P_clone->calculateMin(0, AxesUnits::DEFAULT), 0.0); EXPECT_NEAR(P_clone->calculateMin(0, AxesUnits::DEFAULT), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(P_clone->calculateMin(0, AxesUnits::NBINS), 0.0); EXPECT_NEAR(P_clone->calculateMin(0, AxesUnits::NBINS), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(P_clone->calculateMin(0, AxesUnits::MM), 0.0); EXPECT_NEAR(P_clone->calculateMin(0, AxesUnits::MM), 0.0, 1e-12);
EXPECT_NEAR(P_clone->calculateMin(0, AxesUnits::RADIANS), -m_phi, m_phi*1e-10); EXPECT_NEAR(P_clone->calculateMin(0, AxesUnits::RADIANS), -m_phi, m_phi*1e-10);
EXPECT_NEAR(P_clone->calculateMin(0, AxesUnits::DEGREES), Units::rad2deg(-m_phi), EXPECT_NEAR(P_clone->calculateMin(0, AxesUnits::DEGREES), Units::rad2deg(-m_phi),
Units::rad2deg(m_phi)*1e-10); Units::rad2deg(m_phi)*1e-10);
EXPECT_NEAR(P_clone->calculateMin(0, AxesUnits::QSPACE), -m_kfy, m_kfy*1e-10); EXPECT_NEAR(P_clone->calculateMin(0, AxesUnits::QSPACE), -m_kfy, m_kfy*1e-10);
EXPECT_DOUBLE_EQ(P_clone->calculateMax(0, AxesUnits::DEFAULT), det_width); EXPECT_NEAR(P_clone->calculateMax(0, AxesUnits::DEFAULT), det_width, det_width*1e-10);
EXPECT_DOUBLE_EQ(P_clone->calculateMax(0, AxesUnits::NBINS), static_cast<double>(det_nx)); EXPECT_NEAR(P_clone->calculateMax(0, AxesUnits::NBINS), static_cast<double>(det_nx),
EXPECT_DOUBLE_EQ(P_clone->calculateMax(0, AxesUnits::MM), det_width); det_nx*1e-10);
EXPECT_NEAR(P_clone->calculateMax(0, AxesUnits::MM), det_width, det_width*1e-10);
EXPECT_NEAR(P_clone->calculateMax(0, AxesUnits::RADIANS), m_phi, m_phi*1e-10); EXPECT_NEAR(P_clone->calculateMax(0, AxesUnits::RADIANS), m_phi, m_phi*1e-10);
EXPECT_NEAR(P_clone->calculateMax(0, AxesUnits::DEGREES), Units::rad2deg(m_phi), EXPECT_NEAR(P_clone->calculateMax(0, AxesUnits::DEGREES), Units::rad2deg(m_phi),
Units::rad2deg(m_phi)*1e-10); Units::rad2deg(m_phi)*1e-10);
EXPECT_NEAR(P_clone->calculateMax(0, AxesUnits::QSPACE), m_kfy, m_kfy*1e-10); EXPECT_NEAR(P_clone->calculateMax(0, AxesUnits::QSPACE), m_kfy, m_kfy*1e-10);
EXPECT_DOUBLE_EQ(P_clone->calculateMin(1, AxesUnits::DEFAULT), 0.0); EXPECT_NEAR(P_clone->calculateMin(1, AxesUnits::DEFAULT), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(P_clone->calculateMin(1, AxesUnits::NBINS), 0.0); EXPECT_NEAR(P_clone->calculateMin(1, AxesUnits::NBINS), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(P_clone->calculateMin(1, AxesUnits::MM), 0.0); EXPECT_NEAR(P_clone->calculateMin(1, AxesUnits::MM), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(P_clone->calculateMin(1, AxesUnits::RADIANS), 0.0); EXPECT_NEAR(P_clone->calculateMin(1, AxesUnits::RADIANS), 0.0, 1e-12);
EXPECT_DOUBLE_EQ(P_clone->calculateMin(1, AxesUnits::DEGREES), 0.0); EXPECT_NEAR(P_clone->calculateMin(1, AxesUnits::DEGREES), 0.0, 1e-12);
EXPECT_NEAR(P_clone->calculateMin(1, AxesUnits::QSPACE), - m_kiz, std::abs(m_kiz)*1e-10); EXPECT_NEAR(P_clone->calculateMin(1, AxesUnits::QSPACE), - m_kiz, std::abs(m_kiz)*1e-10);
EXPECT_DOUBLE_EQ(P_clone->calculateMax(1, AxesUnits::DEFAULT), det_height); EXPECT_NEAR(P_clone->calculateMax(1, AxesUnits::DEFAULT), det_height, det_height*1e-10);
EXPECT_DOUBLE_EQ(P_clone->calculateMax(1, AxesUnits::NBINS), static_cast<double>(det_ny)); EXPECT_NEAR(P_clone->calculateMax(1, AxesUnits::NBINS), static_cast<double>(det_ny),
EXPECT_DOUBLE_EQ(P_clone->calculateMax(1, AxesUnits::MM), det_height); det_ny*1e-10);
EXPECT_NEAR(P_clone->calculateMax(1, AxesUnits::MM), det_height, det_height*1e-10);
EXPECT_NEAR(P_clone->calculateMax(1, AxesUnits::RADIANS), m_alpha, m_alpha*1e-10); EXPECT_NEAR(P_clone->calculateMax(1, AxesUnits::RADIANS), m_alpha, m_alpha*1e-10);
EXPECT_NEAR(P_clone->calculateMax(1, AxesUnits::DEGREES), Units::rad2deg(m_alpha), EXPECT_NEAR(P_clone->calculateMax(1, AxesUnits::DEGREES), Units::rad2deg(m_alpha),
Units::rad2deg(m_alpha)*1e-10); Units::rad2deg(m_alpha)*1e-10);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment