From 7c4dfd85abeba0eb5c0a0a78cf967db7931f033d Mon Sep 17 00:00:00 2001 From: Katherine Date: Fri, 15 Sep 2017 10:54:40 -0400 Subject: [PATCH 01/15] created file for Exercise 4 --- 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..b040422 --- /dev/null +++ b/movie.txt @@ -0,0 +1,3 @@ +Pride and Prejudice +Pan's Labyrinth +The Devil Wears Prada From cbc84ec22131981daf6e75542422f35f5da54e4c Mon Sep 17 00:00:00 2001 From: Mati Nemera Date: Fri, 15 Sep 2017 11:00:06 -0400 Subject: [PATCH 02/15] Three more movies --- movie.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/movie.txt b/movie.txt index b040422..370870f 100644 --- a/movie.txt +++ b/movie.txt @@ -1,3 +1,6 @@ Pride and Prejudice Pan's Labyrinth The Devil Wears Prada +Revenge of the Sith +The Dark Knight +The Lorax From dcc7ea0797b0d9ebfa47c196864a24f3bce0842d Mon Sep 17 00:00:00 2001 From: omegadan01 Date: Fri, 15 Sep 2017 11:03:07 -0400 Subject: [PATCH 03/15] dan's movies --- movie.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/movie.txt b/movie.txt index 370870f..f2d1502 100644 --- a/movie.txt +++ b/movie.txt @@ -4,3 +4,6 @@ The Devil Wears Prada Revenge of the Sith The Dark Knight The Lorax +National Treasure +The Room +Lord of the Rings From 27c3a6ce2d1c1c5313b4d7ea7efd9a253a6b7332 Mon Sep 17 00:00:00 2001 From: Katherine Date: Fri, 15 Sep 2017 11:05:41 -0400 Subject: [PATCH 04/15] Ranked movies by favorite --- movie.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/movie.txt b/movie.txt index f2d1502..e94f2ed 100644 --- a/movie.txt +++ b/movie.txt @@ -1,9 +1,9 @@ Pride and Prejudice -Pan's Labyrinth The Devil Wears Prada +National Treasure +Pan's Labyrinth +The Lorax +Lord of the Rings Revenge of the Sith The Dark Knight -The Lorax -National Treasure The Room -Lord of the Rings From a448d124dbabd19326a554287db31903fddbdcbc Mon Sep 17 00:00:00 2001 From: Mati Nemera Date: Fri, 15 Sep 2017 11:05:51 -0400 Subject: [PATCH 05/15] Ranking --- movie.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/movie.txt b/movie.txt index f2d1502..893b0a2 100644 --- a/movie.txt +++ b/movie.txt @@ -1,9 +1,9 @@ +The Lorax +The Dark Knight +Revenge of the Sith Pride and Prejudice Pan's Labyrinth The Devil Wears Prada -Revenge of the Sith -The Dark Knight -The Lorax National Treasure The Room Lord of the Rings From 8de9783fccb2e9f2c4946c4409ecfbfd0e4a1b48 Mon Sep 17 00:00:00 2001 From: omegadan01 Date: Fri, 15 Sep 2017 11:08:13 -0400 Subject: [PATCH 06/15] dan's list of the best --- movie.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/movie.txt b/movie.txt index f2d1502..0e0a780 100644 --- a/movie.txt +++ b/movie.txt @@ -1,9 +1,10 @@ -Pride and Prejudice +The Room +National Treasure Pan's Labyrinth +Lord of the Rings +The Dark Knight +Pride and Prejudice The Devil Wears Prada Revenge of the Sith -The Dark Knight The Lorax -National Treasure -The Room -Lord of the Rings + From c9258d12986f432ab3fa4f6728784075de74b84a Mon Sep 17 00:00:00 2001 From: Katherine Date: Wed, 20 Sep 2017 12:53:08 -0400 Subject: [PATCH 07/15] Parts 1 and 2 of Q2 --- Exercise4.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Exercise4.sh diff --git a/Exercise4.sh b/Exercise4.sh new file mode 100644 index 0000000..459bf8d --- /dev/null +++ b/Exercise4.sh @@ -0,0 +1,12 @@ + + + +#Q2 +#Print gender, yearsExperience, and wage for highest earner +echo "Highest Earner" +cat wages.csv | sed 's/,/ /g' | cut -d ' ' -f 1,2,4 | sort -n -k 3 | head -2 | tail +-1 +#Print gender, yearsExperience, and wage for lowest earner +echo "Lowest Earner" +cat wages.csv | sed 's/,/ /g' | cut -d ' ' -f 1,2,4 | sort -n -k 3 | tail -1 + From fd21ce2a24b5d954e3bc2df58c5d7d457143a5ac Mon Sep 17 00:00:00 2001 From: Katherine Date: Wed, 20 Sep 2017 13:13:04 -0400 Subject: [PATCH 08/15] Part 3 Question 2 added --- Exercise4.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Exercise4.sh b/Exercise4.sh index 459bf8d..adbd23f 100644 --- a/Exercise4.sh +++ b/Exercise4.sh @@ -4,9 +4,12 @@ #Q2 #Print gender, yearsExperience, and wage for highest earner echo "Highest Earner" -cat wages.csv | sed 's/,/ /g' | cut -d ' ' -f 1,2,4 | sort -n -k 3 | head -2 | tail --1 +cat wages.csv | sed 's/,/ /g' | cut -d ' ' -f 1,2,4 | sort -n -k 3 | tail -1 + #Print gender, yearsExperience, and wage for lowest earner echo "Lowest Earner" -cat wages.csv | sed 's/,/ /g' | cut -d ' ' -f 1,2,4 | sort -n -k 3 | tail -1 +cat wages.csv | sed 's/,/ /g' | cut -d ' ' -f 1,2,4 | sort -n -k 3 | head -2 | tail -1 +#Number of females in top 10 earners +echo "Number of Females in Top 10 Earners" +cat wages.csv | sed 's/,/ /g' | sort -n -k 4 | tail -10 | grep "female" | wc -l From 06c90aa6fb6f8ff40fb49e7aada89404e2b62831 Mon Sep 17 00:00:00 2001 From: Mati Nemera Date: Wed, 20 Sep 2017 13:52:59 -0400 Subject: [PATCH 09/15] Minimum wage 12 vs 16 with variables 1 and 2 --- Exercise4.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Exercise4.sh b/Exercise4.sh index adbd23f..22e7496 100644 --- a/Exercise4.sh +++ b/Exercise4.sh @@ -13,3 +13,7 @@ cat wages.csv | sed 's/,/ /g' | cut -d ' ' -f 1,2,4 | sort -n -k 3 | head -2 | t #Number of females in top 10 earners echo "Number of Females in Top 10 Earners" cat wages.csv | sed 's/,/ /g' | sort -n -k 4 | tail -10 | grep "female" | wc -l + +#Minimum wages of 12 vs 16 years school +$ cat wages.csv | awk -F, '$3 = "12"' | sort -n -k "4" | head -2 | tail -1 + From 7f4ed70d428432dd5624637c8d02951e1170e4d8 Mon Sep 17 00:00:00 2001 From: Katherine Date: Wed, 20 Sep 2017 13:54:37 -0400 Subject: [PATCH 10/15] Fixing error --- Exercise4.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Exercise4.sh b/Exercise4.sh index adbd23f..6fe173a 100644 --- a/Exercise4.sh +++ b/Exercise4.sh @@ -1,6 +1,5 @@ - #Q2 #Print gender, yearsExperience, and wage for highest earner echo "Highest Earner" From ccb2e397dcb415a2775f809007a9c622d393b062 Mon Sep 17 00:00:00 2001 From: Mati Nemera Date: Wed, 20 Sep 2017 13:57:37 -0400 Subject: [PATCH 11/15] Stop screwing around, you screw around too much --- Exercise4.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Exercise4.sh b/Exercise4.sh index 22e7496..7bb903b 100644 --- a/Exercise4.sh +++ b/Exercise4.sh @@ -1,6 +1,5 @@ - #Q2 #Print gender, yearsExperience, and wage for highest earner echo "Highest Earner" @@ -15,5 +14,12 @@ echo "Number of Females in Top 10 Earners" cat wages.csv | sed 's/,/ /g' | sort -n -k 4 | tail -10 | grep "female" | wc -l #Minimum wages of 12 vs 16 years school -$ cat wages.csv | awk -F, '$3 = "12"' | sort -n -k "4" | head -2 | tail -1 +val1=$(cat wages.csv | awk -F, '$3 = "12"' | sort -n -k "4" | head -2 | tail -1) +val2=$(cat wages.csv | awk -F, '$3 = "16"' | sort -n -k "4" | head -2 | tail -1) +echo $val1 +echo $val2 + + + + From eafebdc2c7a63651da0705483e6de1ec2cde83bd Mon Sep 17 00:00:00 2001 From: Katherine Date: Wed, 20 Sep 2017 14:06:13 -0400 Subject: [PATCH 12/15] Question 3 complete --- Exercise4.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Exercise4.sh b/Exercise4.sh index 7bb903b..613f75a 100644 --- a/Exercise4.sh +++ b/Exercise4.sh @@ -14,12 +14,14 @@ echo "Number of Females in Top 10 Earners" cat wages.csv | sed 's/,/ /g' | sort -n -k 4 | tail -10 | grep "female" | wc -l #Minimum wages of 12 vs 16 years school -val1=$(cat wages.csv | awk -F, '$3 = "12"' | sort -n -k "4" | head -2 | tail -1) -val2=$(cat wages.csv | awk -F, '$3 = "16"' | sort -n -k "4" | head -2 | tail -1) +val1=$(cat wages.csv | sed 's/,/ /g' | awk -F, '$3 = "12"' | sort -n -k "4" | cut -d ' ' -f 4 | head -2 | tail -1) +val2=$(cat wages.csv | sed 's/,/ /g' | awk -F, '$3 = "16"' | sort -n -k "4" | cut -d ' ' -f 4 | head -2 | tail -1) +echo "Min wage 12 years school" echo $val1 +echo "Min wage 16 years school" echo $val2 - - +#Difference in wages based on school years +echo "$val2 - $val1" | bc From b1b7281a88421759560c33f001dd2540959d0702 Mon Sep 17 00:00:00 2001 From: omegadan01 Date: Thu, 21 Sep 2017 03:12:04 -0400 Subject: [PATCH 13/15] added question 1 --- Exercise4.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Exercise4.sh b/Exercise4.sh index 613f75a..2d5aa33 100644 --- a/Exercise4.sh +++ b/Exercise4.sh @@ -1,4 +1,11 @@ - +#Q1 +#write a file containing unique gender and years experience in two space deliminated columns +#input = wages.csv +#output uni.gen.exp.csv +cat wages.csv | cut -d ',' -f1,2 | sed 's/\<[0-9]\>/0&/' | sed 's/,/ /g' > a.tmp.csv +head -1 a.tmp.csv > u.gender.year.csv +sed '1d' a.tmp.csv | sort -n | uniq >> u.gender.year.csvhead -1 a.tmp.csv > uni.gen.exp.csv +echo "unique gender and experience .csv complete" #Q2 #Print gender, yearsExperience, and wage for highest earner @@ -13,6 +20,7 @@ cat wages.csv | sed 's/,/ /g' | cut -d ' ' -f 1,2,4 | sort -n -k 3 | head -2 | t echo "Number of Females in Top 10 Earners" cat wages.csv | sed 's/,/ /g' | sort -n -k 4 | tail -10 | grep "female" | wc -l +#Q3 #Minimum wages of 12 vs 16 years school val1=$(cat wages.csv | sed 's/,/ /g' | awk -F, '$3 = "12"' | sort -n -k "4" | cut -d ' ' -f 4 | head -2 | tail -1) val2=$(cat wages.csv | sed 's/,/ /g' | awk -F, '$3 = "16"' | sort -n -k "4" | cut -d ' ' -f 4 | head -2 | tail -1) From 40ee888cf369d33d53ff1fc06608efa8957a5177 Mon Sep 17 00:00:00 2001 From: omegadan01 Date: Thu, 21 Sep 2017 03:18:26 -0400 Subject: [PATCH 14/15] fixed .csv filename error in q1 --- Exercise4.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise4.sh b/Exercise4.sh index 2d5aa33..ce4a4de 100644 --- a/Exercise4.sh +++ b/Exercise4.sh @@ -4,7 +4,7 @@ #output uni.gen.exp.csv cat wages.csv | cut -d ',' -f1,2 | sed 's/\<[0-9]\>/0&/' | sed 's/,/ /g' > a.tmp.csv head -1 a.tmp.csv > u.gender.year.csv -sed '1d' a.tmp.csv | sort -n | uniq >> u.gender.year.csvhead -1 a.tmp.csv > uni.gen.exp.csv +sed '1d' a.tmp.csv | sort -n | uniq >>u.gender.year.csv echo "unique gender and experience .csv complete" #Q2 From a2e222730e3db312fbd85c915dfbb7ab187e00f4 Mon Sep 17 00:00:00 2001 From: omegadan01 Date: Thu, 21 Sep 2017 09:57:04 -0400 Subject: [PATCH 15/15] added line to remove tmp file in q1 --- Exercise4.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Exercise4.sh b/Exercise4.sh index ce4a4de..90fbac6 100644 --- a/Exercise4.sh +++ b/Exercise4.sh @@ -5,6 +5,7 @@ cat wages.csv | cut -d ',' -f1,2 | sed 's/\<[0-9]\>/0&/' | sed 's/,/ /g' > a.tmp.csv head -1 a.tmp.csv > u.gender.year.csv sed '1d' a.tmp.csv | sort -n | uniq >>u.gender.year.csv +rm a.tmp.csv echo "unique gender and experience .csv complete" #Q2