diff options
author | Betsy McPhail <betsy.mcphail@kitware.com> | 2019-07-26 16:46:08 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-08-19 15:49:05 (GMT) |
commit | a36731c63460a41caae596b6dcbc75771a810549 (patch) | |
tree | 28c38e2c540d20eacbcf58cbadc5694c8cda82bf /Help/guide/tutorial/Step11/MathFunctions | |
parent | df9cdf629c5211282dcab2e4751f69032e25a244 (diff) | |
download | CMake-a36731c63460a41caae596b6dcbc75771a810549.zip CMake-a36731c63460a41caae596b6dcbc75771a810549.tar.gz CMake-a36731c63460a41caae596b6dcbc75771a810549.tar.bz2 |
Tutorial: Improve Step 6
* Print message when using the table
* Remove duplicated comment
* Remove HAVE_LOG and HAVE_EXP checks, use generated table instead
Diffstat (limited to 'Help/guide/tutorial/Step11/MathFunctions')
-rw-r--r-- | Help/guide/tutorial/Step11/MathFunctions/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Help/guide/tutorial/Step11/MathFunctions/mysqrt.cxx | 11 |
2 files changed, 1 insertions, 14 deletions
diff --git a/Help/guide/tutorial/Step11/MathFunctions/CMakeLists.txt b/Help/guide/tutorial/Step11/MathFunctions/CMakeLists.txt index 55a40d3..df9f4df 100644 --- a/Help/guide/tutorial/Step11/MathFunctions/CMakeLists.txt +++ b/Help/guide/tutorial/Step11/MathFunctions/CMakeLists.txt @@ -40,10 +40,6 @@ if(USE_MYMATH) target_link_libraries(SqrtLibrary PUBLIC tutorial_compiler_flags) target_compile_definitions(MathFunctions PRIVATE "USE_MYMATH") - if(HAVE_LOG AND HAVE_EXP) - target_compile_definitions(SqrtLibrary - PRIVATE "HAVE_LOG" "HAVE_EXP") - endif() target_link_libraries(MathFunctions PRIVATE SqrtLibrary) endif() diff --git a/Help/guide/tutorial/Step11/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Step11/MathFunctions/mysqrt.cxx index 436f96d..ff37312 100644 --- a/Help/guide/tutorial/Step11/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/Step11/MathFunctions/mysqrt.cxx @@ -4,8 +4,6 @@ // include the generated table #include "Table.h" -#include <cmath> - namespace mathfunctions { namespace detail { // a hack square root calculation using simple operations @@ -15,20 +13,13 @@ double mysqrt(double x) return 0; } - // if we have both log and exp then use them -#if defined(HAVE_LOG) && defined(HAVE_EXP) - double result = exp(log(x) * 0.5); - std::cout << "Computing sqrt of " << x << " to be " << result - << " using log and exp" << std::endl; -#else // use the table to help find an initial value double result = x; if (x >= 1 && x < 10) { + std::cout << "Use the table to help find an initial value " << std::endl; result = sqrtTable[static_cast<int>(x)]; } - // if we have both log and exp then use them - // do ten iterations for (int i = 0; i < 10; ++i) { if (result <= 0) { |