diff options
Diffstat (limited to 'Tests/Tutorial/Step5/MathFunctions')
-rw-r--r-- | Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx | 25 | ||||
-rw-r--r-- | Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx | 24 |
2 files changed, 21 insertions, 28 deletions
diff --git a/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx index a23feeb620..cebd50fcc1 100644 --- a/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx +++ b/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx @@ -2,34 +2,31 @@ #include <math.h> #include <stdio.h> -int main (int argc, char *argv[]) +int main(int argc, char* argv[]) { int i; double result; // make sure we have enough arguments - if (argc < 2) - { + if (argc < 2) { return 1; - } + } // open the output file - FILE *fout = fopen(argv[1],"w"); - if (!fout) - { + FILE* fout = fopen(argv[1], "w"); + if (!fout) { return 1; - } + } // create a source file with a table of square roots - fprintf(fout,"double sqrtTable[] = {\n"); - for (i = 0; i < 10; ++i) - { + fprintf(fout, "double sqrtTable[] = {\n"); + for (i = 0; i < 10; ++i) { result = sqrt(static_cast<double>(i)); - fprintf(fout,"%g,\n",result); - } + fprintf(fout, "%g,\n", result); + } // close the table with a zero - fprintf(fout,"0};\n"); + fprintf(fout, "0};\n"); fclose(fout); return 0; } diff --git a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx index a488af6a3d..458ed63a15 100644 --- a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx @@ -10,10 +10,9 @@ // a hack square root calculation using simple operations double mysqrt(double x) { - if (x <= 0) - { + if (x <= 0) { return 0; - } + } double result; @@ -22,23 +21,20 @@ double mysqrt(double x) // use the table to help find an initial value result = x; - if (x >= 1 && x < 10) - { + if (x >= 1 && x < 10) { result = sqrtTable[static_cast<int>(x)]; - } + } // do ten iterations int i; - for (i = 0; i < 10; ++i) - { - if (result <= 0) - { + for (i = 0; i < 10; ++i) { + if (result <= 0) { result = 0.1; - } - delta = x - (result*result); - result = result + 0.5*delta/result; - fprintf(stdout,"Computing sqrt of %g to be %g\n",x,result); } + delta = x - (result * result); + result = result + 0.5 * delta / result; + fprintf(stdout, "Computing sqrt of %g to be %g\n", x, result); + } return result; } |