diff --git a/HandsOn/6-InRealEnvironment/Solution/Exercice43/TestDisplay.hpp b/HandsOn/6-InRealEnvironment/Solution/Exercice43/TestDisplay.hpp index f82b2eddf5af5692a227b7f626e89c85b24ac528..e429cc423ad402fe27e0b4b1d6c6b444379bd1e6 100644 --- a/HandsOn/6-InRealEnvironment/Solution/Exercice43/TestDisplay.hpp +++ b/HandsOn/6-InRealEnvironment/Solution/Exercice43/TestDisplay.hpp @@ -109,15 +109,15 @@ public: template<class IntT> -class TestDisplayMultiply : public TestDisplay +class TestDisplaySumOfMultiply : public TestDisplay { public: //! Constructor. - explicit TestDisplayMultiply(int resolution); + explicit TestDisplaySumOfMultiply(int resolution); //! To make the class a concrete one. - virtual ~TestDisplayMultiply() override; + virtual ~TestDisplaySumOfMultiply() override; //! Display the output for the chosen `Nbits`. diff --git a/HandsOn/6-InRealEnvironment/Solution/Exercice43/TestDisplay.hxx b/HandsOn/6-InRealEnvironment/Solution/Exercice43/TestDisplay.hxx index 00f871122df4fedd395ff91bdbdf58e9fd114b09..6b8e330796f03fb6325019e2dc0794e4d367527c 100644 --- a/HandsOn/6-InRealEnvironment/Solution/Exercice43/TestDisplay.hxx +++ b/HandsOn/6-InRealEnvironment/Solution/Exercice43/TestDisplay.hxx @@ -86,24 +86,24 @@ void TestDisplayPowerOfTwoApprox035<IntT>::operator()(int Nbits) const template<class IntT> -TestDisplayMultiply<IntT>::TestDisplayMultiply(int resolution) +TestDisplaySumOfMultiply<IntT>::TestDisplaySumOfMultiply(int resolution) : TestDisplay(resolution) { } template<class IntT> -TestDisplayMultiply<IntT>::~TestDisplayMultiply() = default; +TestDisplaySumOfMultiply<IntT>::~TestDisplaySumOfMultiply() = default; template<class IntT> -void TestDisplayMultiply<IntT>::operator()(int Nbits) const +void TestDisplaySumOfMultiply<IntT>::operator()(int Nbits) const { Display(Nbits, -0.65, static_cast<IntT>(3515), 0.35, static_cast<IntT>(4832)); } template<class IntT> -void TestDisplayMultiply<IntT>::Display(int Nbits, double value1, IntT coefficient1, double value2, IntT coefficient2) const +void TestDisplaySumOfMultiply<IntT>::Display(int Nbits, double value1, IntT coefficient1, double value2, IntT coefficient2) const { try { @@ -121,7 +121,7 @@ void TestDisplayMultiply<IntT>::Display(int Nbits, double value1, IntT coefficie IntT approx; if (__builtin_add_overflow(part1, part2, &approx)) - throw Error("Overflow (in TestDisplayMultiply<IntT>::Display())!"); + throw Error("Overflow (in TestDisplaySumOfMultiply<IntT>::Display())!"); PrintLine<IntT>(Nbits, exact, static_cast<double>(approx), oconv.str(), "", RoundToInteger::yes); }