diff options
author | RossTheRoss <msattr@gmail.com> | 2019-02-20 13:56:39 +0000 |
---|---|---|
committer | RossTheRoss <msattr@gmail.com> | 2019-02-20 13:56:39 +0000 |
commit | 4ad08c7433dc804be5cd4e9a0c388158a9f22dde (patch) | |
tree | d9024e7eeefedb9709197e2d8a6a826cbfdca966 /ee1301/wk2 | |
parent | Finish C (diff) | |
download | homework-4ad08c7433dc804be5cd4e9a0c388158a9f22dde.tar homework-4ad08c7433dc804be5cd4e9a0c388158a9f22dde.tar.gz homework-4ad08c7433dc804be5cd4e9a0c388158a9f22dde.tar.bz2 homework-4ad08c7433dc804be5cd4e9a0c388158a9f22dde.tar.lz homework-4ad08c7433dc804be5cd4e9a0c388158a9f22dde.tar.xz homework-4ad08c7433dc804be5cd4e9a0c388158a9f22dde.tar.zst homework-4ad08c7433dc804be5cd4e9a0c388158a9f22dde.zip |
Some optimizing, some commenting, some raging at 2B (still)
Diffstat (limited to 'ee1301/wk2')
-rw-r--r-- | ee1301/wk2/hw2_directory/strap012_HW2A.cpp | 8 | ||||
-rw-r--r-- | ee1301/wk2/hw2_directory/strap012_HW2B.cpp | 6 | ||||
-rw-r--r-- | ee1301/wk2/hw2_directory/strap012_HW2C.cpp | 8 |
3 files changed, 10 insertions, 12 deletions
diff --git a/ee1301/wk2/hw2_directory/strap012_HW2A.cpp b/ee1301/wk2/hw2_directory/strap012_HW2A.cpp index 3129241..34c4d2a 100644 --- a/ee1301/wk2/hw2_directory/strap012_HW2A.cpp +++ b/ee1301/wk2/hw2_directory/strap012_HW2A.cpp @@ -34,12 +34,10 @@ do { } if (countOG > 0) { - count=1; //Sets initial printing of countOG to 1 - for (i=1; i<=countOG; i++) { - for (j=0; j<count; j++) { - cout << i; + for (count=1; count<=countOG; count++) { + for (i=0; i<count; i++) { + cout << count; } - count++; cout << endl; } } diff --git a/ee1301/wk2/hw2_directory/strap012_HW2B.cpp b/ee1301/wk2/hw2_directory/strap012_HW2B.cpp index 158e00e..bd942fb 100644 --- a/ee1301/wk2/hw2_directory/strap012_HW2B.cpp +++ b/ee1301/wk2/hw2_directory/strap012_HW2B.cpp @@ -14,7 +14,7 @@ using namespace std; int main() { - bool change12 = 0, foo = 0, bar = false; //Workaround to prevent unneeded if statements + bool foo = 0, bar = false; //Workaround to prevent unneeded if statements char Time, travel; //"time" is reserved by C++, "Time" is not int hourOG, hourChange, hourNew, intervalChange = 0, timeChange = 0; cout << "Enter current time (A for AM, P for PM): "; @@ -61,13 +61,13 @@ int main() { if (Time == 'A') { - Time += 15; + Time += 15; //15 is the difference in the ASCII table between 'A' and 'P' } else { if (Time == 'P') { - Time -= 15; + Time -= 15; //See line 64 } } } diff --git a/ee1301/wk2/hw2_directory/strap012_HW2C.cpp b/ee1301/wk2/hw2_directory/strap012_HW2C.cpp index d03ea1e..c1daaf3 100644 --- a/ee1301/wk2/hw2_directory/strap012_HW2C.cpp +++ b/ee1301/wk2/hw2_directory/strap012_HW2C.cpp @@ -13,7 +13,7 @@ Short Program Description: One-armed Bandit using namespace std; int main () { - srand (time(NULL)); + srand (time(NULL)); //This seeds the randomness based on the current time bool win=false; int d=0, spin1, spin2, spin3, spin4; do { @@ -21,14 +21,14 @@ int main () { win=false; //Reset win from before, otherwise win will always be true after it is true once cout << "How many values do you want on each wheel? "; cin >> d; - } while (d==0); //Without this failsafe, the program does undefined things at d=0 - spin1= rand () % d + 1; + } while (d==0); //Without this failsafe, the program does undefined things at d=0, usually crashing + spin1= rand () % d + 1; //Spin is set to be a random number between 1 and d spin2= rand () % d + 1; spin3= rand () % d + 1; spin4= rand () % d + 1; cout << "The wheels spin to give: " << spin1 << " " << spin2 << " " << spin3 << " " << spin4 << " "; if (spin1==spin2) { // These nested statements only let the bool "win" be true if all of the spinners match - if (spin2==spin3) { + if (spin2==spin3) { if (spin3==spin4) { win=true; } |