summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZack Galbreath <zack.galbreath@kitware.com>2019-01-11 16:31:12 (GMT)
committerBetsy McPhail <betsy.mcphail@kitware.com>2019-01-27 21:03:00 (GMT)
commit0e2cdacf7b51c915acd1a2a9e58a080d2667b4cb (patch)
tree09b370ba9b7933a3a1c7d0df0690791fa7dccea6
parentf2ddedfa5802c8aece994bb643b5139212d87777 (diff)
downloadCMake-0e2cdacf7b51c915acd1a2a9e58a080d2667b4cb.zip
CMake-0e2cdacf7b51c915acd1a2a9e58a080d2667b4cb.tar.gz
CMake-0e2cdacf7b51c915acd1a2a9e58a080d2667b4cb.tar.bz2
Tests: Update style of c++ code snippets in Tutorial directions
-rw-r--r--Tests/Tutorial/Step1/directions.txt5
-rw-r--r--Tests/Tutorial/Step6/directions.txt37
2 files changed, 17 insertions, 25 deletions
diff --git a/Tests/Tutorial/Step1/directions.txt b/Tests/Tutorial/Step1/directions.txt
index 10f2583..827d775 100644
--- a/Tests/Tutorial/Step1/directions.txt
+++ b/Tests/Tutorial/Step1/directions.txt
@@ -52,14 +52,13 @@ make use of the version numbers. The resulting source code is listed below.
int main (int argc, char *argv[])
{
- if (argc < 2)
- {
+ if (argc < 2) {
std::cout << argv[0] << " Version "
<< Tutorial_VERSION_MAJOR << "." << Tutorial_VERSION_MINOR
<< std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
- }
+ }
double inputValue = atof(argv[1]);
diff --git a/Tests/Tutorial/Step6/directions.txt b/Tests/Tutorial/Step6/directions.txt
index d3e7b05..42b9f06 100644
--- a/Tests/Tutorial/Step6/directions.txt
+++ b/Tests/Tutorial/Step6/directions.txt
@@ -16,24 +16,21 @@ MathFunctions subdirectory a new source file named MakeTable.cxx will do just th
int main (int argc, char *argv[])
{
// make sure we have enough arguments
- if (argc < 2)
- {
+ if (argc < 2) {
return 1;
- }
+ }
std::ofstream fout(argv[1],std::ios_base::out);
const bool fileOpen = fout.is_open();
- if(fileOpen)
- {
+ if(fileOpen) {
fout << "double sqrtTable[] = {" << std::endl;
- for (int i = 0; i < 10; ++i)
- {
+ for (int i = 0; i < 10; ++i) {
fout << sqrt(static_cast<double>(i)) << "," << std::endl;
- }
+ }
// close the table with a zero
fout << "0};" << std::endl;
fout.close();
- }
+ }
return fileOpen ? 0 : 1; // return 0 if wrote the file
}
@@ -81,29 +78,25 @@ found and included by mysqrt.cxx.
Now let's use the generated table. First, modify mysqrt.cxx to include Table.h.
Next, we can rewrite the mysqrt function to use the table:
- if (x <= 0)
- {
- return 0;
- }
+ if (x <= 0) {
+ return 0;
+ }
// use the table to help find an initial value
double result = x;
- if (x >= 1 && x < 10)
- {
+ if (x >= 1 && x < 10) {
result = sqrtTable[static_cast<int>(x)];
- }
+ }
// do ten iterations
- for (int i = 0; i < 10; ++i)
- {
- if (result <= 0)
- {
+ for (int i = 0; i < 10; ++i) {
+ if (result <= 0) {
result = 0.1;
- }
+ }
double delta = x - (result*result);
result = result + 0.5*delta/result;
std::cout << "Computing sqrt of " << x << " to be " << result << std::endl;
- }
+ }
Run cmake or cmake-gui to configure the project and then build it with your
chosen build tool. When this project is built it will first build the MakeTable