From 5bb33bcc5da7ebedde54fca7b2e5a4f9d03634ce Mon Sep 17 00:00:00 2001 From: Chloe Spurgat Date: Fri, 15 Sep 2017 10:53:57 -0400 Subject: [PATCH 1/8] initial commit --- favemovies.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 favemovies.txt diff --git a/favemovies.txt b/favemovies.txt new file mode 100644 index 0000000..90844cd --- /dev/null +++ b/favemovies.txt @@ -0,0 +1,3 @@ +The Great Gatsby +The Princess Bride +Interstellar From 398b15ce015e67967d365c6613af9a4c6a507145 Mon Sep 17 00:00:00 2001 From: Brittni Bertolet Date: Fri, 15 Sep 2017 10:56:17 -0400 Subject: [PATCH 2/8] Brittni: Add lines of favorite movie --- favemovies.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/favemovies.txt b/favemovies.txt index 90844cd..6471cf1 100644 --- a/favemovies.txt +++ b/favemovies.txt @@ -1,3 +1,6 @@ The Great Gatsby The Princess Bride Interstellar +Garden State +Across the Universe +LaLa Land From f4ec6acf0c8d8f8998dc9c8657cbe1a60ffd672d Mon Sep 17 00:00:00 2001 From: Chloe Spurgat Date: Fri, 15 Sep 2017 10:59:27 -0400 Subject: [PATCH 3/8] ranked 6 movies --- favemovies.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/favemovies.txt b/favemovies.txt index 6471cf1..67b2708 100644 --- a/favemovies.txt +++ b/favemovies.txt @@ -1,6 +1,6 @@ -The Great Gatsby The Princess Bride +Lala Land +The Great Gatsby Interstellar -Garden State Across the Universe -LaLa Land +Garden State From 15a2819f3beb7de8b3a83740b3a9c42eb01024e7 Mon Sep 17 00:00:00 2001 From: Brittni Bertolet Date: Fri, 15 Sep 2017 10:59:50 -0400 Subject: [PATCH 4/8] Brittni: Changed order of movies --- favemovies.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/favemovies.txt b/favemovies.txt index 6471cf1..72ce270 100644 --- a/favemovies.txt +++ b/favemovies.txt @@ -1,6 +1,6 @@ -The Great Gatsby -The Princess Bride -Interstellar Garden State -Across the Universe +The Princess Bride LaLa Land +Across the Universe +The Great Gatsby +Interstellar From fb1a8a7f6ac195ef824136a1ab004bd41abe3837 Mon Sep 17 00:00:00 2001 From: Brittni Bertolet Date: Fri, 15 Sep 2017 12:14:28 -0400 Subject: [PATCH 5/8] Brittni: Created script for Challenge 2 --- wagesAnalysis.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 wagesAnalysis.sh diff --git a/wagesAnalysis.sh b/wagesAnalysis.sh new file mode 100644 index 0000000..9b5c128 --- /dev/null +++ b/wagesAnalysis.sh @@ -0,0 +1,13 @@ +### Script for getting information about highest and lowest earning people +### Usage: bash wagesAnalysis.sh + +echo "Highest earner:" +### Gets the gender, yearsExperience, and wages of the highest earner +cat wages.csv | sed 's/,/ /g' | sort -k 4 -n | tail -1 | cut -d " " -f1,2,4 + +echo "Lowest earner:" +### Gets the gender, yearsExperience, and wages of the lowest earner +cat wages.csv | sed 's/,/ /g' | sort -k 4 -n | head -2 | grep -v "gender" | cut -d " " -f1,2,4 + +echo "Number of females in the top 10 earners:" +cat wages.csv | sed 's/,/ /g' | sort -k 4 -n | grep -v "gender" | head -10 | cut -d " " -f1,2,4 | grep "female"| wc -l From b6eadee35499eedcc6bb77c7b3fcf3ca6600a6f1 Mon Sep 17 00:00:00 2001 From: Brittni Bertolet Date: Mon, 18 Sep 2017 10:29:29 -0400 Subject: [PATCH 6/8] Brittni: Added code to wagesAnalysis.sh to do part 3 of exercise --- wagesAnalysis.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/wagesAnalysis.sh b/wagesAnalysis.sh index 9b5c128..091b3c8 100644 --- a/wagesAnalysis.sh +++ b/wagesAnalysis.sh @@ -1,13 +1,31 @@ ### Script for getting information about highest and lowest earning people ### Usage: bash wagesAnalysis.sh +# echo "Highest earner:" ### Gets the gender, yearsExperience, and wages of the highest earner cat wages.csv | sed 's/,/ /g' | sort -k 4 -n | tail -1 | cut -d " " -f1,2,4 +# echo "Lowest earner:" ### Gets the gender, yearsExperience, and wages of the lowest earner cat wages.csv | sed 's/,/ /g' | sort -k 4 -n | head -2 | grep -v "gender" | cut -d " " -f1,2,4 +# echo "Number of females in the top 10 earners:" cat wages.csv | sed 's/,/ /g' | sort -k 4 -n | grep -v "gender" | head -10 | cut -d " " -f1,2,4 | grep "female"| wc -l + +# +echo "Average wage of those with 12 years school:" +cat wages.csv | cut -d "," -f 3,4 | grep "12," | sed 's/,/ /g' | awk '{ sum += $2; n++ } END { if (n > 0) print sum / n; }' + +# +echo "Average wage of those with 16 years school:" +cat wages.csv | cut -d "," -f 3,4 | grep "16," | sed 's/,/ /g' | awk '{ sum += $2; n++ } END { if (n > 0) print sum / n; }' + +# +echo "Difference in wage:" +VAR1="$(cat wages.csv | cut -d "," -f 3,4 | grep "16," | sed 's/,/ /g' | awk '{ sum += $2; n++ } END { if (n > 0) print sum / n; }')" +VAR2="$(cat wages.csv | cut -d "," -f 3,4 | grep "12," | sed 's/,/ /g' | awk '{ sum += $2; n++ } END { if (n > 0) print sum / n; }')" + +echo "$VAR1 - $VAR2" | bc From 180ac6b879ab7db86c7aaf6ad3b75e243dfca8f1 Mon Sep 17 00:00:00 2001 From: Chloe Spurgat Date: Thu, 21 Sep 2017 15:19:18 -0400 Subject: [PATCH 7/8] initial commit --- gender-yearsExperience.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 gender-yearsExperience.sh diff --git a/gender-yearsExperience.sh b/gender-yearsExperience.sh new file mode 100644 index 0000000..650a71e --- /dev/null +++ b/gender-yearsExperience.sh @@ -0,0 +1,6 @@ +#sort wages.csv by gender then years experience +for file in wages.csv +do + cat $file | cut -f 1,2 -d "," | sed 's/,/ /g' | sort -k 1,1d -k 2,2n +done + From 8dc898d97962f2dbaf432daecf3a846e295af30a Mon Sep 17 00:00:00 2001 From: Chloe Spurgat Date: Thu, 21 Sep 2017 15:41:29 -0400 Subject: [PATCH 8/8] code for part 1 --- gender-yearsExperience.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gender-yearsExperience.sh b/gender-yearsExperience.sh index 650a71e..619acbe 100644 --- a/gender-yearsExperience.sh +++ b/gender-yearsExperience.sh @@ -1,6 +1,5 @@ #sort wages.csv by gender then years experience -for file in wages.csv -do - cat $file | cut -f 1,2 -d "," | sed 's/,/ /g' | sort -k 1,1d -k 2,2n -done +#usage bash gender-yearsExperience + +cat wages.csv | cut -f 1,2 -d "," | sed 's/,/ /g' | sort -k 1,1d -k 2,2n