3 files changed, 42 insertions, 19 deletions
diff --git a/ee1301/wk2/lab2/bmr.cpp b/ee1301/wk2/lab2/bmr.cpp
index ec8af20..26fdbae 100644
--- a/ee1301/wk2/lab2/bmr.cpp
+++ b/ee1301/wk2/lab2/bmr.cpp
@@ -1,31 +1,21 @@
-/*
-Date: 13 Feb 2019
-Name: Matthew Strapp
-Student ID number: 5449340
-Course number: EE1301
-Term: Spring 2019
-Lab/assignment number: Stretch 1
-Short Program Description: Basal Metabolic Rate calculator
-*/
-
 #include <iostream>
 using namespace std;
 
 int main () {
   int age,height,weight,chocolate;
   double BMR;
-  char s;
+  char sex;
   cout << "Enter weight in pounds:"; cin >> weight;
   cout << "Enter height in inches:"; cin >> height;
   cout << "Enter age in years:"; cin >> age;
-  cout << "Enter Sex(M/F)"; cin >> s;
+  cout << "Enter Sex(M/F)"; cin >> sex;
 
-  if (s=='F' || s=='f'){
+  if (sex=='F' || sex=='f'){
     BMR = 655 + (4.3 * weight) + (4.7 * height) - (4.7 * age);
     cout << "Your BMR is: " << BMR;
   }
 
-  if (s=='M' || s=='m'){
+  if (sex=='M' || sex=='m'){
     BMR = 66 + (6.3 * weight) + (12.9 * height) - (6.8 * age);
     cout << "Your BMR is: " << BMR;
   }
diff --git a/ee1301/wk2/lab2/greektax.cpp b/ee1301/wk2/lab2/greektax.cpp
new file mode 100644
index 0000000..7da4aa6
--- /dev/null
+++ b/ee1301/wk2/lab2/greektax.cpp
@@ -0,0 +1,32 @@
+#include <iostream>
+using namespace std;
+int main () {
+  int income;
+  int tax=0;
+  cout << "Εισάγετε το εισόδημά σας: ";
+  cin >> income;
+  if (income>10000) {
+    int k10=income-10000;
+    if (k10<=0){
+    tax+=((income-10000)*.1);
+  }
+    else {
+      tax+=2000;
+    }
+    if (income>30000) {
+      int k30=income-10000;
+      if (k30<=0){
+      tax+=((income-30000)*.2);
+    }
+      else {
+        tax+=8000;
+      }
+      if (income>70000) {
+        tax+=((income-70000)*.3);
+      }
+    }
+  }
+
+  cout << "Χρωστάς " << tax << " δραχμές." << endl;
+
+}
diff --git a/ee1301/wk2/lab2/strap012_lab2_pay_stub.cpp b/ee1301/wk2/lab2/strap012_lab2_pay_stub.cpp
index 2de234c..066d16a 100644
--- a/ee1301/wk2/lab2/strap012_lab2_pay_stub.cpp
+++ b/ee1301/wk2/lab2/strap012_lab2_pay_stub.cpp
@@ -7,22 +7,23 @@ Term: Spring 2019
 Lab/assignment number: Workout
 Short Program Description: Pay Stub Calculator
 */
+
 #include <iostream>
 #include <iomanip>
 using namespace std;
 
 int main () {
-  int dependents, Hours;
-  int OT = 0; int Health = 0; //Set values to zero to prevent problems
+  int Dependents, Hours;
+  int OT = 0; int Health = 0;     //Set values to zero to prevent problems
   double SocSec, State, Fed, GrossPay, NetPay;
   cout << "How many hours did you work this week?: ";
   cin >> Hours;
   cout << "How many dependents do you have?: ";
-  cin >> dependents;
+  cin >> Dependents;
   if (Hours > 40) {
-    OT=Hours-40; //Overtime pay is extra so it needs to be seperate
+    OT=Hours-40;                  //Overtime pay is time-and-a-half
   }
-  if (dependents >= 3) {
+  if (Dependents >= 3) {
     Health=35;
   }
   GrossPay = Hours * 16.78 + OT * 16.78 * 1.5;