Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
0e2cdacf
Commit
0e2cdacf
authored
Jan 11, 2019
by
Zack Galbreath
Committed by
Betsy McPhail
Jan 27, 2019
Browse files
Tests: Update style of c++ code snippets in Tutorial directions
parent
f2ddedfa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Tests/Tutorial/Step1/directions.txt
View file @
0e2cdacf
...
...
@@ -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]);
...
...
Tests/Tutorial/Step6/directions.txt
View file @
0e2cdacf
...
...
@@ -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
...
...
Brad King
@brad.king
mentioned in commit
5134e11e
·
Jan 29, 2019
mentioned in commit
5134e11e
mentioned in commit 5134e11ee4291c1eb53aa5014af2af75a2e33f3b
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment