From 8200f7177150b736adfa95653093ee53920453d3 Mon Sep 17 00:00:00 2001
From: Matthew Strapp <msattr@gmail.com>
Date: Wed, 13 Feb 2019 15:59:54 -0600
Subject: Fix problems mk. 200

---
 ee1301/wk2/lab2/greektax.cpp               | 6 +++---
 ee1301/wk2/lab2/strap012_lab2_pay_stub.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'ee1301/wk2/lab2')

diff --git a/ee1301/wk2/lab2/greektax.cpp b/ee1301/wk2/lab2/greektax.cpp
index ccdff7a..3c0a91a 100644
--- a/ee1301/wk2/lab2/greektax.cpp
+++ b/ee1301/wk2/lab2/greektax.cpp
@@ -3,10 +3,10 @@ using namespace std;
 int main () {
   int Income;
   int Tax=0;
-  cout << "Enter your Income: ";
+  cout << "Enter your income: ";
   cin >> Income;
   if (Income>10000) {
-    int k10=Income-10000; //Income under 10000 is not taxed
+    int k10=Income-30000; //Income under 10000 is not taxed
     if (k10<=0){
     Tax+=((Income-10000)*.1); //Income between 10000 and 30000 is taxed at 10%
   }
@@ -14,7 +14,7 @@ int main () {
       Tax+=2000;
     }
     if (Income>30000) {
-      int k30=Income-10000;
+      int k30=Income-70000;
       if (k30<=0){
       Tax+=((Income-30000)*.2); //Income between 30000 and 70000 is taxed at 20%
     }
diff --git a/ee1301/wk2/lab2/strap012_lab2_pay_stub.cpp b/ee1301/wk2/lab2/strap012_lab2_pay_stub.cpp
index 03dccc4..5e3e95c 100644
--- a/ee1301/wk2/lab2/strap012_lab2_pay_stub.cpp
+++ b/ee1301/wk2/lab2/strap012_lab2_pay_stub.cpp
@@ -34,7 +34,7 @@ int main () {
     Union=10;
   }
   NetPay = GrossPay-SocSec-Fed-State-Health-Union; //$10 union dues are constant
-  cout << fixed << setprecision(2) << "Your gross (before withholdings) pay is $" << GrossPay << "." << endl
+  cout << fixed << setprecision(2) << endl << "Your gross (before withholdings) pay is $" << GrossPay << "." << endl
   << "Social Security withholding: $" << SocSec << endl
   << "Federal income tax withholding: $" << Fed << endl
   << "State income tax withholding: $" << State << endl
-- 
cgit v1.2.3