aboutsummaryrefslogtreecommitdiffstats
path: root/ee1301
diff options
context:
space:
mode:
authorMatthew Strapp <msattr@gmail.com>2019-02-13 15:59:54 -0600
committerMatthew Strapp <msattr@gmail.com>2019-02-13 15:59:54 -0600
commit8200f7177150b736adfa95653093ee53920453d3 (patch)
treeabf7f90eea627a093ceb4c9e02a8157f93e019bf /ee1301
parentMORE COMMENTS (diff)
downloadhomework-8200f7177150b736adfa95653093ee53920453d3.tar
homework-8200f7177150b736adfa95653093ee53920453d3.tar.gz
homework-8200f7177150b736adfa95653093ee53920453d3.tar.bz2
homework-8200f7177150b736adfa95653093ee53920453d3.tar.lz
homework-8200f7177150b736adfa95653093ee53920453d3.tar.xz
homework-8200f7177150b736adfa95653093ee53920453d3.tar.zst
homework-8200f7177150b736adfa95653093ee53920453d3.zip
Fix problems mk. 200
Diffstat (limited to 'ee1301')
-rw-r--r--ee1301/wk2/lab2/greektax.cpp6
-rw-r--r--ee1301/wk2/lab2/strap012_lab2_pay_stub.cpp2
2 files changed, 4 insertions, 4 deletions
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