aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRossTheRoss <msattr@gmail.com>2019-04-15 12:21:46 -0500
committerRossTheRoss <msattr@gmail.com>2019-04-15 12:21:46 -0500
commit8bba749cfe398443e028bd14be389647aad0efe7 (patch)
tree34ae9f01452175eb25788c053cee775b030a14c6
parentChange nothing (diff)
downloadhomework-8bba749cfe398443e028bd14be389647aad0efe7.tar
homework-8bba749cfe398443e028bd14be389647aad0efe7.tar.gz
homework-8bba749cfe398443e028bd14be389647aad0efe7.tar.bz2
homework-8bba749cfe398443e028bd14be389647aad0efe7.tar.lz
homework-8bba749cfe398443e028bd14be389647aad0efe7.tar.xz
homework-8bba749cfe398443e028bd14be389647aad0efe7.tar.zst
homework-8bba749cfe398443e028bd14be389647aad0efe7.zip
e
-rw-r--r--ee1301/wk6/hw6_directory/dice.cpp4
-rw-r--r--ee1301/wk6/hw6_directory/strap012_HW6B.cpp10
2 files changed, 13 insertions, 1 deletions
diff --git a/ee1301/wk6/hw6_directory/dice.cpp b/ee1301/wk6/hw6_directory/dice.cpp
index ebdb7d6..7adefe5 100644
--- a/ee1301/wk6/hw6_directory/dice.cpp
+++ b/ee1301/wk6/hw6_directory/dice.cpp
@@ -1,3 +1,7 @@
+//Matthew Strapp
+//EE1301
+//17 April 2019
+//HW 6A: Dice Class
#include <iostream>
#include <cstdlib>
using namespace std;
diff --git a/ee1301/wk6/hw6_directory/strap012_HW6B.cpp b/ee1301/wk6/hw6_directory/strap012_HW6B.cpp
index ac33c79..3426c52 100644
--- a/ee1301/wk6/hw6_directory/strap012_HW6B.cpp
+++ b/ee1301/wk6/hw6_directory/strap012_HW6B.cpp
@@ -1,9 +1,13 @@
+//Matthew Strapp
+//EE1301
+//17 April 2019
+//HW 6B: Recursion and ff(x)
#include <iostream>
int ff(int x);
int main() {
- int value = -1024;
+ int value;
do {
std::cout << "Please enter a value of x: ";
std::cin >> value;
@@ -13,16 +17,20 @@ int main() {
std::cout << "Calcuation complete, ff(x) = " << ffx << 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
std::cout << "Calling ff(" << x/2 << ")\n";
return x*ff(x/2);
} else {
+ // x is odd but not 1
std::cout << "Calling ff(" << x-2 << ")\n";
return x*ff(x-2);
}
} else {
+ // x is 1
//std::cout << "Returning from ff(1) = 1\n";
return 1;
}