summaryrefslogtreecommitdiffstats
path: root/Help/guide/tutorial/Step8/MathFunctions
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-08-20 13:16:35 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-08-20 13:19:22 (GMT)
commitb80417f0fd1491d1c0f5d57019b47d4c13729545 (patch)
treee55ae56966bd154cec46c56184a9f4a6f1b09d7e /Help/guide/tutorial/Step8/MathFunctions
parent8c1d3e3b79fb921bfada3b19e6bb4115da4a4e6e (diff)
parent6f6a32a0f601688da24e1737509a0b6e1ed4f63f (diff)
downloadCMake-b80417f0fd1491d1c0f5d57019b47d4c13729545.zip
CMake-b80417f0fd1491d1c0f5d57019b47d4c13729545.tar.gz
CMake-b80417f0fd1491d1c0f5d57019b47d4c13729545.tar.bz2
Merge topic 'cmake-tutorial'
6f6a32a0f6 Tutorial: Improve Step 9 6a35d630dc Tutorial: Improve Step 8 61d4d990d6 Tutorial: Improve Step 7 a36731c634 Tutorial: Improve Step 6 df9cdf629c Tutorial: Improve Step 5 442c0f0d46 Tutorial: Improve Step 4 bc64401c3d Tutorial: Improve Step 3 49ce4d6ff4 Tutorial: Improve Step 2 ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3528
Diffstat (limited to 'Help/guide/tutorial/Step8/MathFunctions')
-rw-r--r--Help/guide/tutorial/Step8/MathFunctions/CMakeLists.txt3
-rw-r--r--Help/guide/tutorial/Step8/MathFunctions/mysqrt.cxx14
2 files changed, 3 insertions, 14 deletions
diff --git a/Help/guide/tutorial/Step8/MathFunctions/CMakeLists.txt b/Help/guide/tutorial/Step8/MathFunctions/CMakeLists.txt
index 3c3a816..9ede4b3 100644
--- a/Help/guide/tutorial/Step8/MathFunctions/CMakeLists.txt
+++ b/Help/guide/tutorial/Step8/MathFunctions/CMakeLists.txt
@@ -21,8 +21,7 @@ add_library(MathFunctions
# state that we depend on our binary dir to find Table.h
target_include_directories(MathFunctions
INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}
- PRIVATE ${Tutorial_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
+ PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
)
# install rules
diff --git a/Help/guide/tutorial/Step8/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Step8/MathFunctions/mysqrt.cxx
index 5b862fb..2ae60c6 100644
--- a/Help/guide/tutorial/Step8/MathFunctions/mysqrt.cxx
+++ b/Help/guide/tutorial/Step8/MathFunctions/mysqrt.cxx
@@ -1,12 +1,9 @@
#include "MathFunctions.h"
-#include "TutorialConfig.h"
#include <iostream>
// include the generated table
#include "Table.h"
-#include <cmath>
-
// a hack square root calculation using simple operations
double mysqrt(double x)
{
@@ -14,20 +11,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"
- << 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) {
@@ -37,6 +27,6 @@ double mysqrt(double x)
result = result + 0.5 * delta / result;
std::cout << "Computing sqrt of " << x << " to be " << result << std::endl;
}
-#endif
+
return result;
}