aboutsummaryrefslogtreecommitdiffstats
path: root/ee1301/wk6/hw6_directory/strap012_HW6B.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ee1301/wk6/hw6_directory/strap012_HW6B.cpp')
-rw-r--r--ee1301/wk6/hw6_directory/strap012_HW6B.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/ee1301/wk6/hw6_directory/strap012_HW6B.cpp b/ee1301/wk6/hw6_directory/strap012_HW6B.cpp
index 3426c52..d53ea08 100644
--- a/ee1301/wk6/hw6_directory/strap012_HW6B.cpp
+++ b/ee1301/wk6/hw6_directory/strap012_HW6B.cpp
@@ -5,23 +5,21 @@
#include <iostream>
int ff(int x);
-
int main() {
- int value;
+ int x;
do {
std::cout << "Please enter a value of x: ";
- std::cin >> value;
- } while (value<0);
+ std::cin >> x;
+ } while (x<0);
std::cout << "Beginning calculation of ff(x)...\n";
- int ffx = ff(value);
- std::cout << "Calcuation complete, ff(x) = " << ffx << std::endl;
+ std::cout << "Calcuation complete, ff(x) = " << ff(x) << std::endl;
}
// This function either returns 1 when x is one of two recrusive conditions depending on if x is even or odd.
int ff(int x) {
if (x > 1) {
if (x%2 == 0) {
- //x is even
+ // x is even
std::cout << "Calling ff(" << x/2 << ")\n";
return x*ff(x/2);
} else {