From 8268aba4221dcc76bd78828d1b3a09331a6f8f62 Mon Sep 17 00:00:00 2001 From: ayamasaki2011 Date: Fri, 15 Sep 2017 11:08:33 -0400 Subject: [PATCH 01/13] AEY: add list of three favorite movies --- movie.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 movie.txt diff --git a/movie.txt b/movie.txt new file mode 100644 index 0000000..9616df0 --- /dev/null +++ b/movie.txt @@ -0,0 +1,3 @@ +The Princess Bride +Spirited Away +Star Wars IV: A New Hope From a6b7e2dbb3591ecd20383dd3701f5130038a3edc Mon Sep 17 00:00:00 2001 From: Balaji Sampathkumar Date: Fri, 15 Sep 2017 11:11:06 -0400 Subject: [PATCH 02/13] added my favs balaji --- movie.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/movie.txt b/movie.txt index 9616df0..daadf76 100644 --- a/movie.txt +++ b/movie.txt @@ -1,3 +1,8 @@ The Princess Bride Spirited Away Star Wars IV: A New Hope +interstellar +shawshank redemption +godfather 2 + + From c1d9e761478bcf1c2c5bc886d3479137545ddb72 Mon Sep 17 00:00:00 2001 From: ayamasaki2011 Date: Fri, 15 Sep 2017 11:15:02 -0400 Subject: [PATCH 03/13] AEY: Rank list of 6 movies by preference --- movie.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/movie.txt b/movie.txt index daadf76..d7613b8 100644 --- a/movie.txt +++ b/movie.txt @@ -1,8 +1,8 @@ The Princess Bride +Shawshank Redemption Spirited Away Star Wars IV: A New Hope -interstellar -shawshank redemption -godfather 2 +Interstellar +Godfather 2 From 411a4694f09ca28d46264e1085a49e373cd46783 Mon Sep 17 00:00:00 2001 From: Balaji Sampathkumar Date: Fri, 15 Sep 2017 11:15:53 -0400 Subject: [PATCH 04/13] ranked my favs balaji --- movie.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/movie.txt b/movie.txt index daadf76..3bd544f 100644 --- a/movie.txt +++ b/movie.txt @@ -1,8 +1,7 @@ -The Princess Bride -Spirited Away -Star Wars IV: A New Hope -interstellar shawshank redemption +interstellar godfather 2 - +The Princess Bride +Spirited Away +Star Wars IV: A New Hope From d34395da97d9e7aed685a2d4b5895a927fcc5676 Mon Sep 17 00:00:00 2001 From: ayamasaki2011 Date: Thu, 21 Sep 2017 11:25:55 -0400 Subject: [PATCH 05/13] AEY: Add shell script to repo - script makes the file space-delimited and sorts by wages --- earnings.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 earnings.sh diff --git a/earnings.sh b/earnings.sh new file mode 100644 index 0000000..d509940 --- /dev/null +++ b/earnings.sh @@ -0,0 +1,10 @@ +#! + +#Script prints the following information for a given dataset: +#Gender, years of Experience, wage for highest earner +#Gender, years of experience, wage for lowest earner +#Number of women in top 10 earners + +#Usage: earnings.sh filename.csv + +cat $1 | sed 's/","/" "/g" | sort -n -k5 From dbb4846e094f055ad34ea635a905d08f67a10280 Mon Sep 17 00:00:00 2001 From: ayamasaki2011 Date: Thu, 21 Sep 2017 11:32:15 -0400 Subject: [PATCH 06/13] AEY: Modified shell script to print gender, yearsExperience, and wages of highest earner --- earnings.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 earnings.sh diff --git a/earnings.sh b/earnings.sh old mode 100644 new mode 100755 index d509940..d4a69c4 --- a/earnings.sh +++ b/earnings.sh @@ -1,5 +1,3 @@ -#! - #Script prints the following information for a given dataset: #Gender, years of Experience, wage for highest earner #Gender, years of experience, wage for lowest earner @@ -7,4 +5,7 @@ #Usage: earnings.sh filename.csv -cat $1 | sed 's/","/" "/g" | sort -n -k5 +echo "Highest Earner:" + +cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 1 | cut -d ' ' -f 1,2,4 + From 88b657a8743d0b090c44c1d7fb300ad7e503de1d Mon Sep 17 00:00:00 2001 From: ayamasaki2011 Date: Thu, 21 Sep 2017 11:34:22 -0400 Subject: [PATCH 07/13] AEY: Modified shell scrip to print gender, yearsExperience, and wages of lowest earner --- earnings.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/earnings.sh b/earnings.sh index d4a69c4..7ed21d4 100755 --- a/earnings.sh +++ b/earnings.sh @@ -9,3 +9,7 @@ echo "Highest Earner:" cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 1 | cut -d ' ' -f 1,2,4 +echo "Lowest Earner:" + +cat $1 | sed s/","/" "/g | sort -n -k4 | head -n 2 | tail -n 1 | cut -d ' ' -f 1,2,4 + From 6c978ff28951cf8aa9eb5b5cd4877fb6b601845c Mon Sep 17 00:00:00 2001 From: ayamasaki2011 Date: Thu, 21 Sep 2017 11:39:57 -0400 Subject: [PATCH 08/13] AEY: Modified shell script to print # of women in top 10 earners --- earnings.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/earnings.sh b/earnings.sh index 7ed21d4..0f3a9e3 100755 --- a/earnings.sh +++ b/earnings.sh @@ -3,7 +3,7 @@ #Gender, years of experience, wage for lowest earner #Number of women in top 10 earners -#Usage: earnings.sh filename.csv +#Usage: bash earnings.sh filename.csv echo "Highest Earner:" @@ -13,3 +13,7 @@ echo "Lowest Earner:" cat $1 | sed s/","/" "/g | sort -n -k4 | head -n 2 | tail -n 1 | cut -d ' ' -f 1,2,4 +echo "Women in Top 10 Earners:" + +cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 10 | grep -c "female" + From 4c8e48fdc0382ada1ee6cf2a05328c43927d9ca5 Mon Sep 17 00:00:00 2001 From: ayamasaki2011 Date: Thu, 21 Sep 2017 12:03:42 -0400 Subject: [PATCH 09/13] AEY: Modified shell script to obtain minimum wage for earners NOT graduating college --- earnings.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/earnings.sh b/earnings.sh index 0f3a9e3..8ccf3f4 100755 --- a/earnings.sh +++ b/earnings.sh @@ -2,6 +2,7 @@ #Gender, years of Experience, wage for highest earner #Gender, years of experience, wage for lowest earner #Number of women in top 10 earners +#Effect of graduating college on the minumum wage of earners #Usage: bash earnings.sh filename.csv @@ -17,3 +18,6 @@ echo "Women in Top 10 Earners:" cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 10 | grep -c "female" +val1=$(cat $1 | sed s/","/" "/g | awk '$3=="12"' | sort -n -k4 | head -n 1 | cut -d ' ' -f 4) + + From 4fdd7c77f0fbe6f2851ea1bd054e6407f92e9461 Mon Sep 17 00:00:00 2001 From: ayamasaki2011 Date: Thu, 21 Sep 2017 12:06:26 -0400 Subject: [PATCH 10/13] AEY: Modified shell script to obtain minimum wage for earners graduating college --- earnings.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/earnings.sh b/earnings.sh index 8ccf3f4..614c86c 100755 --- a/earnings.sh +++ b/earnings.sh @@ -20,4 +20,6 @@ cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 10 | grep -c "female" val1=$(cat $1 | sed s/","/" "/g | awk '$3=="12"' | sort -n -k4 | head -n 1 | cut -d ' ' -f 4) +val2=$(cat $1 | sed s/","/" "/g | awk '$3=="16"' | sort -n -k4 | head -n 1 | cut -d ' ' -f 4) + From 289288e45841197204baa480bba4bb6be392d6a1 Mon Sep 17 00:00:00 2001 From: ayamasaki2011 Date: Thu, 21 Sep 2017 12:08:45 -0400 Subject: [PATCH 11/13] AEY: Modified shell script to calculate effect of graduating college on minimum wage --- earnings.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/earnings.sh b/earnings.sh index 614c86c..588dae2 100755 --- a/earnings.sh +++ b/earnings.sh @@ -22,4 +22,6 @@ val1=$(cat $1 | sed s/","/" "/g | awk '$3=="12"' | sort -n -k4 | head -n 1 | cut val2=$(cat $1 | sed s/","/" "/g | awk '$3=="16"' | sort -n -k4 | head -n 1 | cut -d ' ' -f 4) +echo "Effect of Graduating College on Minimum Wage:" +echo "$val2-$val1" | bc From a886e13f5602d7939fd3ab5efe6c92c7ac3774cb Mon Sep 17 00:00:00 2001 From: Balaji Sampathkumar Date: Thu, 21 Sep 2017 15:33:04 -0400 Subject: [PATCH 12/13] Modified with #1 and stdout on 2 and 3 --- earnings.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/earnings.sh b/earnings.sh index 588dae2..cfdf6fc 100755 --- a/earnings.sh +++ b/earnings.sh @@ -1,27 +1,32 @@ #Script prints the following information for a given dataset: +#Unique gender-yearsExperience combinations #Gender, years of Experience, wage for highest earner #Gender, years of experience, wage for lowest earner #Number of women in top 10 earners #Effect of graduating college on the minumum wage of earners #Usage: bash earnings.sh filename.csv +#1: +cat $1 | sed 's/,/ /g' | cut -d ' ' -f 1,2 | uniq | sort -n -k 1 | sort -n -k 2 | uniq > output_ex4.txt -echo "Highest Earner:" +#2: +echo "Highest Earner:" >> output_ex4.txt -cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 1 | cut -d ' ' -f 1,2,4 +cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 1 | cut -d ' ' -f 1,2,4 >> output_ex4.txt -echo "Lowest Earner:" +echo "Lowest Earner:" >> output_ex4.txt -cat $1 | sed s/","/" "/g | sort -n -k4 | head -n 2 | tail -n 1 | cut -d ' ' -f 1,2,4 +cat $1 | sed s/","/" "/g | sort -n -k4 | head -n 2 | tail -n 1 | cut -d ' ' -f 1,2,4 >> output_ex4.txt -echo "Women in Top 10 Earners:" +echo "Women in Top 10 Earners:" >> output_ex4.txt -cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 10 | grep -c "female" +cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 10 | grep -c "female" >> output_ex4.txt val1=$(cat $1 | sed s/","/" "/g | awk '$3=="12"' | sort -n -k4 | head -n 1 | cut -d ' ' -f 4) val2=$(cat $1 | sed s/","/" "/g | awk '$3=="16"' | sort -n -k4 | head -n 1 | cut -d ' ' -f 4) -echo "Effect of Graduating College on Minimum Wage:" +#3: +echo "Effect of Graduating College on Minimum Wage:" >> output_ex4.txt -echo "$val2-$val1" | bc +echo "$val2-$val1" | bc >> output_ex4.txt From 20f020250d798ff374c6776b48f7cbac469db2e8 Mon Sep 17 00:00:00 2001 From: ayamasaki2011 Date: Thu, 21 Sep 2017 15:57:11 -0400 Subject: [PATCH 13/13] AEY: Alter script to remove writing results from Part 2 and Part 3 to file --- earnings.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/earnings.sh b/earnings.sh index cfdf6fc..59e00cf 100755 --- a/earnings.sh +++ b/earnings.sh @@ -10,23 +10,23 @@ cat $1 | sed 's/,/ /g' | cut -d ' ' -f 1,2 | uniq | sort -n -k 1 | sort -n -k 2 | uniq > output_ex4.txt #2: -echo "Highest Earner:" >> output_ex4.txt +echo "Highest Earner:" -cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 1 | cut -d ' ' -f 1,2,4 >> output_ex4.txt +cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 1 | cut -d ' ' -f 1,2,4 -echo "Lowest Earner:" >> output_ex4.txt +echo "Lowest Earner:" -cat $1 | sed s/","/" "/g | sort -n -k4 | head -n 2 | tail -n 1 | cut -d ' ' -f 1,2,4 >> output_ex4.txt +cat $1 | sed s/","/" "/g | sort -n -k4 | head -n 2 | tail -n 1 | cut -d ' ' -f 1,2,4 -echo "Women in Top 10 Earners:" >> output_ex4.txt +echo "Women in Top 10 Earners:" -cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 10 | grep -c "female" >> output_ex4.txt +cat $1 | sed s/","/" "/g | sort -n -k4 | tail -n 10 | grep -c "female" +#3: val1=$(cat $1 | sed s/","/" "/g | awk '$3=="12"' | sort -n -k4 | head -n 1 | cut -d ' ' -f 4) val2=$(cat $1 | sed s/","/" "/g | awk '$3=="16"' | sort -n -k4 | head -n 1 | cut -d ' ' -f 4) -#3: -echo "Effect of Graduating College on Minimum Wage:" >> output_ex4.txt +echo "Effect of Graduating College on Minimum Wage:" -echo "$val2-$val1" | bc >> output_ex4.txt +echo "$val2-$val1" | bc