aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ee1301/wk2/hw2_directory/strap012_2B.cpp45
-rw-r--r--ee1301/wk2/hw2_directory/strap012_2C.cpp4
2 files changed, 45 insertions, 4 deletions
diff --git a/ee1301/wk2/hw2_directory/strap012_2B.cpp b/ee1301/wk2/hw2_directory/strap012_2B.cpp
index f300a04..e72b96d 100644
--- a/ee1301/wk2/hw2_directory/strap012_2B.cpp
+++ b/ee1301/wk2/hw2_directory/strap012_2B.cpp
@@ -4,12 +4,53 @@ Name: Matthew Strapp
Student ID number: 5449340
Course number: EE1301
Term: Spring 2019
-Lab/assignment number: Homework 2B
-Short Program Description: Time Calculator
+Lab/assignment number: Homework 2C
+Short Program Description: Pay Stub Calculator
*/
+//15
#include <iostream>
using namespace std;
int main () {
+ bool change12=0; //Workaround to prevent unneeded if statements
+ char Time, travel; //"time" is reserved
+ int hourOG, hourChange, hourNew, timeChange=0;
+ cout << "Enter current time (A for AM, P for PM): ";
+ cin >> hourOG >> Time;
+ cout << "How many hours forward or backward do you want to move the clock (F for forwards, B for backward): ";
+ cin >> hourChange >> travel;
+
+ if (hourOG+hourChange>=12 || hourOG-hourChange<=0) {
+ if (hourOG!=0 ^ hourOG!=12) {
+ hourOG-=12;
+ }
+ if (hourChange>12) {
+ do {
+ hourChange-=12;
+ timeChange+=1;
+ } while (hourChange >=11);
+ }
+ change12=1;
+ }
+ for (timeChange; timeChange>0; timeChange--) {
+ if (change12) {
+ if (Time=='A') {
+ Time+=15;
+ }
+ if (Time=='P') {
+ Time-=15;
+ }
+ }
+ }
+ if (travel=='F') {
+ hourNew=hourOG+hourChange;
+ }
+ if (travel=='B'){
+ hourNew=hourOG-hourChange;
+ }
+
+ cout << "The new time is: " << hourNew << " " << Time << "M" << endl;
+ return 0;
+
} \ No newline at end of file
diff --git a/ee1301/wk2/hw2_directory/strap012_2C.cpp b/ee1301/wk2/hw2_directory/strap012_2C.cpp
index 6cfcb5a..f300a04 100644
--- a/ee1301/wk2/hw2_directory/strap012_2C.cpp
+++ b/ee1301/wk2/hw2_directory/strap012_2C.cpp
@@ -4,8 +4,8 @@ Name: Matthew Strapp
Student ID number: 5449340
Course number: EE1301
Term: Spring 2019
-Lab/assignment number: Homework 2C
-Short Program Description: Pay Stub Calculator
+Lab/assignment number: Homework 2B
+Short Program Description: Time Calculator
*/
#include <iostream>