diff options
Diffstat (limited to 'Tests/Tutorial/Step4')
-rw-r--r-- | Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx | 27 | ||||
-rw-r--r-- | Tests/Tutorial/Step4/tutorial.cxx | 21 |
2 files changed, 20 insertions, 28 deletions
diff --git a/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx index bbd08fa..6ca264f 100644 --- a/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx @@ -7,33 +7,30 @@ // a hack square root calculation using simple operations double mysqrt(double x) { - if (x <= 0) - { + if (x <= 0) { return 0; - } + } double result; - // if we have both log and exp then use them -#if defined(HAVE_LOG) && defined (HAVE_EXP) - result = exp(log(x)*0.5); - fprintf(stdout,"Computing sqrt of %g to be %g using log\n",x,result); +// if we have both log and exp then use them +#if defined(HAVE_LOG) && defined(HAVE_EXP) + result = exp(log(x) * 0.5); + fprintf(stdout, "Computing sqrt of %g to be %g using log\n", x, result); #else double delta; result = 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); + } #endif return result; } diff --git a/Tests/Tutorial/Step4/tutorial.cxx b/Tests/Tutorial/Step4/tutorial.cxx index af88dad..2fae364 100644 --- a/Tests/Tutorial/Step4/tutorial.cxx +++ b/Tests/Tutorial/Step4/tutorial.cxx @@ -8,31 +8,26 @@ #include "MathFunctions.h" #endif -int main (int argc, char *argv[]) +int main(int argc, char* argv[]) { - if (argc < 2) - { - fprintf(stdout,"%s Version %d.%d\n", - argv[0], - Tutorial_VERSION_MAJOR, + if (argc < 2) { + fprintf(stdout, "%s Version %d.%d\n", argv[0], Tutorial_VERSION_MAJOR, Tutorial_VERSION_MINOR); - fprintf(stdout,"Usage: %s number\n",argv[0]); + fprintf(stdout, "Usage: %s number\n", argv[0]); return 1; - } + } double inputValue = atof(argv[1]); double outputValue = 0; - if(inputValue >= 0) - { + if (inputValue >= 0) { #ifdef USE_MYMATH outputValue = mysqrt(inputValue); #else outputValue = sqrt(inputValue); #endif - } + } - fprintf(stdout,"The square root of %g is %g\n", - inputValue, outputValue); + fprintf(stdout, "The square root of %g is %g\n", inputValue, outputValue); return 0; } |