From ba41b7b5c70caba2c5f40dd63b494aefef2aced9 Mon Sep 17 00:00:00 2001 From: sorenh25 Date: Fri, 15 Sep 2017 10:56:11 -0400 Subject: [PATCH 1/8] Soren Favorite movies --- movies.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 movies.txt diff --git a/movies.txt b/movies.txt new file mode 100644 index 0000000..6a47b46 --- /dev/null +++ b/movies.txt @@ -0,0 +1,3 @@ +Harry Potter 1 +Harry Potter 2 +Harry potter 3 From f6927719ed898036e5eac948c99c78651dbe6487 Mon Sep 17 00:00:00 2001 From: Zoe Loh Date: Fri, 15 Sep 2017 11:00:21 -0400 Subject: [PATCH 2/8] zoes movies --- movies.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/movies.txt b/movies.txt index 6a47b46..1ea3f22 100644 --- a/movies.txt +++ b/movies.txt @@ -1,3 +1,6 @@ Harry Potter 1 Harry Potter 2 Harry potter 3 +the notebook +younger +wild From a811ebee6709362aceda21a87de615e0bec57724 Mon Sep 17 00:00:00 2001 From: Zoe Loh Date: Fri, 15 Sep 2017 11:02:57 -0400 Subject: [PATCH 3/8] new movie zoes list --- movies.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/movies.txt b/movies.txt index 1ea3f22..22110ad 100644 --- a/movies.txt +++ b/movies.txt @@ -1,6 +1,6 @@ Harry Potter 1 -Harry Potter 2 -Harry potter 3 the notebook +Harry potter 2 +harry potter 3 younger wild From 63f5d616110a0c39292d5e2aee558854ffa4d3cf Mon Sep 17 00:00:00 2001 From: sorenh25 Date: Fri, 15 Sep 2017 11:03:06 -0400 Subject: [PATCH 4/8] Revised order of movies Soren --- movies.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/movies.txt b/movies.txt index 1ea3f22..3ec18ba 100644 --- a/movies.txt +++ b/movies.txt @@ -1,6 +1,7 @@ +Harry Potter 3 Harry Potter 1 -Harry Potter 2 -Harry potter 3 +Harry potter 2 the notebook +wild younger -wild + From 623facb887bc29808a7f4bc361e5eca26362e5e6 Mon Sep 17 00:00:00 2001 From: Zoe Loh Date: Wed, 20 Sep 2017 21:28:05 -0400 Subject: [PATCH 5/8] problem 1 --- pickle.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 pickle.sh diff --git a/pickle.sh b/pickle.sh new file mode 100755 index 0000000..98c0bbb --- /dev/null +++ b/pickle.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +#unique gender and years experience combinations +#Usage wages.csv + +for file in wages.csv +do +cat $file | tr -s "," | cut -d "," -f 1,2 | sed 's/,/ /' | sort -b -k1,1 -k2,2n | uniq >>problem.txt +done From 241ca764cd3fa95cc7e0aa74775da1eac6360530 Mon Sep 17 00:00:00 2001 From: sorenh25 Date: Thu, 21 Sep 2017 11:35:58 -0400 Subject: [PATCH 6/8] Part 2 of challenge complete --- pickle.sh | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 pickle.sh diff --git a/pickle.sh b/pickle.sh new file mode 100755 index 0000000..4dd41bc --- /dev/null +++ b/pickle.sh @@ -0,0 +1,38 @@ +!#/bin/bash + +HEADLINE=$(head -n 1 wages.csv | awk -F ',' '{printf("%s %s %s\n",$1, $2, $4)}') +#echo $HEADLINE + +#tail wages.csv -n +2 | sort -k 4 -t ',' -n >> result.txt +#SORTED=$(tail wages.csv -n +2 | sort -k 4 -t ',' -n) +HIGHEST=$(tail wages.csv -n +2 | sort -k 4 -t ',' -n | tail -n 1 | awk -F ',' '{printf("%s %s %s\n",$1, $2, $4)}') +LOWEST=$(tail wages.csv -n +2 | sort -k 4 -t ',' -n | head -n 1 | awk -F ',' '{printf("%s %s %s\n",$1, $2, $4)}') + +echo "-------------" +echo "Highets earner" +echo $HEADLINE +echo $HIGHEST +echo "-------------" +echo "Lowest earner" +echo $HEADLINE +echo $LOWEST +echo "-------------" + +TOP10=$(tail wages.csv -n +2 | sort -k 4 -t ',' -n | tail -n 10 | awk -F ',' '{printf("%s \n",$1)}') +#echo $TOP10 +COUNTER=$((0)) +#echo $COUNTER +for GENDER in $TOP10 +do + #echo $GENDER + if [ $GENDER == "female" ] + then + ((COUNTER++)) + fi + #echo $COUNTER +done + + +echo "Number of women in top 10 earners:" +echo $COUNTER +echo "-------------" From 6bf79afbabca098dbc9690ec81fa713cda591f6c Mon Sep 17 00:00:00 2001 From: sorenh25 Date: Thu, 21 Sep 2017 14:19:09 -0400 Subject: [PATCH 7/8] Part 3 by Soren and Zoe --- pickle.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/pickle.sh b/pickle.sh index a0ca5e8..dd97492 100755 --- a/pickle.sh +++ b/pickle.sh @@ -1,5 +1,4 @@ - -!#/bin/bash +#!/usr/bin/env bash ################################################################################ # Part 1 by Zoe @@ -51,3 +50,47 @@ done echo "Number of women in top 10 earners:" echo $COUNTER echo "-------------" + +################################################################################ +#Part 3 by Soren and Zoe + +COUNTERHIGHSCHOOL=$((0)) +HIGHSCHOOLTOTALWAGES=$((0)) +COUNTERCOLLEGE=$((0)) +COLLEGETOTALWAGES=$((0)) +for LINE in $(cat wages.csv) +do + #echo $LINE + SCHOOLYEARS=$(echo $LINE | awk -F ',' '{printf("%d",$3)}') + if [ $SCHOOLYEARS == 12 ] + then + ((COUNTERHIGHSCHOOL++)) + WAGE=$(echo $LINE | awk -F ',' '{printf("%f",$4)}') + HIGHSCHOOLTOTALWAGES=$(echo "$HIGHSCHOOLTOTALWAGES + $WAGE" | bc) + #echo $HIGHSCHOOLTOTALWAGES + fi + if [ $SCHOOLYEARS == 16 ] + then + ((COUNTERCOLLEGE++)) + WAGE=$(echo $LINE | awk -F ',' '{printf("%f",$4)}') + COLLEGETOTALWAGES=$(echo "$COLLEGETOTALWAGES + $WAGE" | bc) + #echo $COLLEGETOTALWAGES + fi + + #echo $SCHOOLYEARS + #WAGE=$(echo $LINE | awk -F ',' '{printf("%f",$4)}') + #echo $WAGE +done +#echo $(awk '{printf("%s %s","Hello", "World")}') +#echo $COUNTERHIGHSCHOOL +#echo $HIGHSCHOOLTOTALWAGES +AVGEHIGHSCHOOLWAGES=$(echo "$HIGHSCHOOLTOTALWAGES / $COUNTERHIGHSCHOOL" | bc -l) +#echo $COUNTERCOLLEGE +#echo $COLLEGETOTALWAGES +AVGCOLLEGEWAGES=$(echo "$COLLEGETOTALWAGES / $COUNTERCOLLEGE" | bc -l) + +echo $AVGEHIGHSCHOOLWAGES +echo $AVGCOLLEGEWAGES +echo "$COUNTERHIGHSCHOOL high school graduates (12 years) earned an average of $AVGEHIGHSCHOOLWAGES USD/h" +echo "$COUNTERCOLLEGE college graduates (16 years) earned an average of $AVGCOLLEGEWAGES USD/h" +echo "-------------" From 7956b94e2390d36673f058f14b42941f63688a22 Mon Sep 17 00:00:00 2001 From: Zoe Loh Date: Thu, 21 Sep 2017 20:38:26 -0400 Subject: [PATCH 8/8] Final submission of solution --- pickle.sh | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/pickle.sh b/pickle.sh index dd97492..138dbf6 100755 --- a/pickle.sh +++ b/pickle.sh @@ -6,24 +6,17 @@ #unique gender and years experience combinations #Usage wages.csv -for file in wages.csv -do -cat $file | tr -s "," | cut -d "," -f 1,2 | sed 's/,/ /' | sort -b -k1,1 -k2,2n | uniq >>problem.txt -done +cat wages.csv | tail -n +2 | tr -s "," | cut -d "," -f 1,2 | sed 's/,/ /' | sort -b -k1,1 -k2,2n | uniq >>problem.txt ################################################################################ #Part 2 by Soren HEADLINE=$(head -n 1 wages.csv | awk -F ',' '{printf("%s %s %s\n",$1, $2, $4)}') -#echo $HEADLINE - -#tail wages.csv -n +2 | sort -k 4 -t ',' -n >> result.txt -#SORTED=$(tail wages.csv -n +2 | sort -k 4 -t ',' -n) -HIGHEST=$(tail wages.csv -n +2 | sort -k 4 -t ',' -n | tail -n 1 | awk -F ',' '{printf("%s %s %s\n",$1, $2, $4)}') -LOWEST=$(tail wages.csv -n +2 | sort -k 4 -t ',' -n | head -n 1 | awk -F ',' '{printf("%s %s %s\n",$1, $2, $4)}') +HIGHEST=$(tail -n +2 wages.csv | sort -k 4 -t ',' -n | tail -n 1 | awk -F ',' '{printf("%s %s %s\n",$1, $2, $4)}') +LOWEST=$(tail -n +2 wages.csv | sort -k 4 -t ',' -n | head -n 1 | awk -F ',' '{printf("%s %s %s\n",$1, $2, $4)}') echo "-------------" -echo "Highets earner" +echo "Highest earner" echo $HEADLINE echo $HIGHEST echo "-------------" @@ -32,22 +25,18 @@ echo $HEADLINE echo $LOWEST echo "-------------" -TOP10=$(tail wages.csv -n +2 | sort -k 4 -t ',' -n | tail -n 10 | awk -F ',' '{printf("%s \n",$1)}') -#echo $TOP10 +TOP10=$(tail -n +2 wages.csv | sort -k 4 -t ',' -n | tail -n 10 | awk -F ',' '{printf("%s \n",$1)}') COUNTER=$((0)) -#echo $COUNTER for GENDER in $TOP10 do - #echo $GENDER if [ $GENDER == "female" ] then ((COUNTER++)) fi - #echo $COUNTER done -echo "Number of women in top 10 earners:" +echo "Number of women among top 10 earners:" echo $COUNTER echo "-------------" @@ -58,39 +47,32 @@ COUNTERHIGHSCHOOL=$((0)) HIGHSCHOOLTOTALWAGES=$((0)) COUNTERCOLLEGE=$((0)) COLLEGETOTALWAGES=$((0)) + for LINE in $(cat wages.csv) do - #echo $LINE + SCHOOLYEARS=$(echo $LINE | awk -F ',' '{printf("%d",$3)}') if [ $SCHOOLYEARS == 12 ] then ((COUNTERHIGHSCHOOL++)) WAGE=$(echo $LINE | awk -F ',' '{printf("%f",$4)}') HIGHSCHOOLTOTALWAGES=$(echo "$HIGHSCHOOLTOTALWAGES + $WAGE" | bc) - #echo $HIGHSCHOOLTOTALWAGES fi + if [ $SCHOOLYEARS == 16 ] then ((COUNTERCOLLEGE++)) WAGE=$(echo $LINE | awk -F ',' '{printf("%f",$4)}') COLLEGETOTALWAGES=$(echo "$COLLEGETOTALWAGES + $WAGE" | bc) - #echo $COLLEGETOTALWAGES fi - #echo $SCHOOLYEARS - #WAGE=$(echo $LINE | awk -F ',' '{printf("%f",$4)}') - #echo $WAGE done -#echo $(awk '{printf("%s %s","Hello", "World")}') -#echo $COUNTERHIGHSCHOOL -#echo $HIGHSCHOOLTOTALWAGES -AVGEHIGHSCHOOLWAGES=$(echo "$HIGHSCHOOLTOTALWAGES / $COUNTERHIGHSCHOOL" | bc -l) -#echo $COUNTERCOLLEGE -#echo $COLLEGETOTALWAGES + +AVGHIGHSCHOOLWAGES=$(echo "$HIGHSCHOOLTOTALWAGES / $COUNTERHIGHSCHOOL" | bc -l) AVGCOLLEGEWAGES=$(echo "$COLLEGETOTALWAGES / $COUNTERCOLLEGE" | bc -l) +WAGEDIFFERENCE=$(echo "$AVGCOLLEGEWAGES - $AVGHIGHSCHOOLWAGES" | bc -l) -echo $AVGEHIGHSCHOOLWAGES -echo $AVGCOLLEGEWAGES -echo "$COUNTERHIGHSCHOOL high school graduates (12 years) earned an average of $AVGEHIGHSCHOOLWAGES USD/h" +echo "$COUNTERHIGHSCHOOL high school graduates (12 years) earned an average of $AVGHIGHSCHOOLWAGES USD/h" echo "$COUNTERCOLLEGE college graduates (16 years) earned an average of $AVGCOLLEGEWAGES USD/h" +echo "Wage difference: $WAGEDIFFERENCE" echo "-------------"