From f4b20030caf5a5eedc7ef5a9b4bda2f8eed5e8ca Mon Sep 17 00:00:00 2001 From: Lovinder Pnag Date: Thu, 28 May 2015 22:26:51 -0400 Subject: [PATCH 1/9] added space --- parser.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/parser.rb b/parser.rb index 9396117..98c0b70 100644 --- a/parser.rb +++ b/parser.rb @@ -1,6 +1,7 @@ require 'pry' def kinda_like?(fuzzy_word, exact_word) + # implement with your code here # breaking the method up into pieces is encouraged end From ea4bf85cd19f002644eb17863fded33a3458be41 Mon Sep 17 00:00:00 2001 From: Lovinder Pnag Date: Thu, 28 May 2015 22:51:46 -0400 Subject: [PATCH 2/9] working solution with one test failing --- parser.rb | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 5 deletions(-) diff --git a/parser.rb b/parser.rb index 98c0b70..d4db1ed 100644 --- a/parser.rb +++ b/parser.rb @@ -1,11 +1,61 @@ require 'pry' -def kinda_like?(fuzzy_word, exact_word) - - # implement with your code here - # breaking the method up into pieces is encouraged -end +# class Advparser + def kinda_like?(fuzzy_word, exact_word) + if fuzzy_word == exact_word + return true + elsif fouls(fuzzy_word, exact_word) < 2 + return true + else + return false + end + end + + # private + + def fouls(w1,w2) + array_w1 = w1.split("") + array_w2 = w2.split("") + array_w1.each do |x| + # if array_w2.include?(x) + # array_w1.delete(x) + # end + array_w2.delete(x) + + end + # arrxay_w2 + # array_w1 - array_w2 + + array_w2.count + jumbled(w1,w2) + + end + + def jumbled(w1,w2) + if w1.split("").last == w2.split("").last + 0 + elsif w1.split("").first != w2.split("").first + 2 + else + 1 + end + end +# end + + +p fouls("cawffee", "coffee") # 1 +p fouls("doge", "dog") +# p kinda_like?("doge", "dog") +# p kinda_like?("flow", "wolf") + +# test = Advparser.new +# p test.fouls("bog", "dog") + +# p kinda_like?("fish", "fish") + +# p kinda_like?("fish", "dog") + +# p test.kinda_like?("bog", "dog") #def another_private_method #end From 8b81f18e886aaf5a5d52433df1356ac47e9acfd3 Mon Sep 17 00:00:00 2001 From: Lovinder Pnag Date: Thu, 28 May 2015 23:39:16 -0400 Subject: [PATCH 3/9] working solution with all tests passing but needs significant refactoring --- parser.rb | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/parser.rb b/parser.rb index d4db1ed..ce84a34 100644 --- a/parser.rb +++ b/parser.rb @@ -15,26 +15,35 @@ def kinda_like?(fuzzy_word, exact_word) # private def fouls(w1,w2) - array_w1 = w1.split("") - array_w2 = w2.split("") + array_w1 = w1.chars + array_w2 = w2.chars array_w1.each do |x| # if array_w2.include?(x) # array_w1.delete(x) # end array_w2.delete(x) + # array_w1.delete(x) end - # arrxay_w2 - # array_w1 - array_w2 + z = 0 + # z = 1 if jumbled(w1,w2) != 0 && w1.size != w2.size + # z = 1 if array_w2.count >= 1 - array_w2.count + jumbled(w1,w2) + wd1 = w1.chars + wd2 = w2.chars + + z = 1 if wd1.last == wd2.last && wd1.first == wd2.first && w1.size != w2.size + + # p z + # p array_w2 + array_w2.count + jumbled(w1,w2) + z end def jumbled(w1,w2) - if w1.split("").last == w2.split("").last + if w1.chars.last == w2.chars.last 0 - elsif w1.split("").first != w2.split("").first + elsif w1.chars.first != w2.chars.first 2 else 1 @@ -43,10 +52,12 @@ def jumbled(w1,w2) # end -p fouls("cawffee", "coffee") # 1 -p fouls("doge", "dog") -# p kinda_like?("doge", "dog") -# p kinda_like?("flow", "wolf") +# p fouls("cawffee", "coffee") # 1 +# p fouls("bog", "dog") +p kinda_like?("doge", "dog") == true +p kinda_like?("bog", "dog") == true +p kinda_like?("flow", "wolf") == false +p kinda_like?("cawffee", "coffee") == false # test = Advparser.new # p test.fouls("bog", "dog") From ce31f719f6b776a8f0a6edd0ad6ae4958c0e618b Mon Sep 17 00:00:00 2001 From: Lovinder Pnag Date: Thu, 28 May 2015 23:43:25 -0400 Subject: [PATCH 4/9] cleaned up spacing --- parser.rb | 90 ++++++++++++++++++------------------------------------- 1 file changed, 29 insertions(+), 61 deletions(-) diff --git a/parser.rb b/parser.rb index ce84a34..75939a9 100644 --- a/parser.rb +++ b/parser.rb @@ -1,75 +1,43 @@ require 'pry' -# class Advparser - - def kinda_like?(fuzzy_word, exact_word) - if fuzzy_word == exact_word - return true - elsif fouls(fuzzy_word, exact_word) < 2 - return true - else - return false - end +def kinda_like?(fuzzy_word, exact_word) + if fuzzy_word == exact_word + return true + elsif fouls(fuzzy_word, exact_word) < 2 + return true + else + return false end +end - # private - - def fouls(w1,w2) - array_w1 = w1.chars - array_w2 = w2.chars - array_w1.each do |x| - # if array_w2.include?(x) - # array_w1.delete(x) - # end - array_w2.delete(x) - # array_w1.delete(x) - - end - z = 0 - # z = 1 if jumbled(w1,w2) != 0 && w1.size != w2.size - # z = 1 if array_w2.count >= 1 - - wd1 = w1.chars - wd2 = w2.chars - - z = 1 if wd1.last == wd2.last && wd1.first == wd2.first && w1.size != w2.size - - # p z - # p array_w2 - array_w2.count + jumbled(w1,w2) + z - +def fouls(w1,w2) + array_w1 = w1.chars + array_w2 = w2.chars + array_w1.each do |x| + array_w2.delete(x) end - - def jumbled(w1,w2) - if w1.chars.last == w2.chars.last - 0 - elsif w1.chars.first != w2.chars.first - 2 - else - 1 - end + z = 0 + wd1 = w1.chars + wd2 = w2.chars + z = 1 if wd1.last == wd2.last && wd1.first == wd2.first && w1.size != w2.size + array_w2.count + jumbled(w1,w2) + z +end + +def jumbled(w1,w2) + if w1.chars.last == w2.chars.last + 0 + elsif w1.chars.first != w2.chars.first + 2 + else + 1 end -# end +end -# p fouls("cawffee", "coffee") # 1 +# p fouls("cawffee", "coffee") # p fouls("bog", "dog") p kinda_like?("doge", "dog") == true p kinda_like?("bog", "dog") == true p kinda_like?("flow", "wolf") == false p kinda_like?("cawffee", "coffee") == false -# test = Advparser.new -# p test.fouls("bog", "dog") - -# p kinda_like?("fish", "fish") - -# p kinda_like?("fish", "dog") - -# p test.kinda_like?("bog", "dog") -#def another_private_method -#end - -#def some_private_method -#end - From 58f65c3dee2d45687be6ed3047f38ec486d1054d Mon Sep 17 00:00:00 2001 From: LoRyder1 Date: Fri, 29 May 2015 13:11:41 -0400 Subject: [PATCH 5/9] fixed spaces --- parser.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/parser.rb b/parser.rb index 75939a9..88bd112 100644 --- a/parser.rb +++ b/parser.rb @@ -34,6 +34,7 @@ def jumbled(w1,w2) end + # p fouls("cawffee", "coffee") # p fouls("bog", "dog") p kinda_like?("doge", "dog") == true From dfc75dc6b4676bdbfb6871433db056187d18a53f Mon Sep 17 00:00:00 2001 From: LoRyder1 Date: Fri, 29 May 2015 13:13:22 -0400 Subject: [PATCH 6/9] fixed spacing ? --- parser.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/parser.rb b/parser.rb index 88bd112..221d58f 100644 --- a/parser.rb +++ b/parser.rb @@ -33,8 +33,6 @@ def jumbled(w1,w2) end end - - # p fouls("cawffee", "coffee") # p fouls("bog", "dog") p kinda_like?("doge", "dog") == true From 6947a1d0aad6015a4f1141caba32b90bd9abbd8c Mon Sep 17 00:00:00 2001 From: LoRyder1 Date: Fri, 29 May 2015 13:15:20 -0400 Subject: [PATCH 7/9] added spacing2? --- parser.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parser.rb b/parser.rb index 221d58f..a0c2f22 100644 --- a/parser.rb +++ b/parser.rb @@ -33,10 +33,10 @@ def jumbled(w1,w2) end end + # p fouls("cawffee", "coffee") # p fouls("bog", "dog") p kinda_like?("doge", "dog") == true p kinda_like?("bog", "dog") == true p kinda_like?("flow", "wolf") == false -p kinda_like?("cawffee", "coffee") == false - +p kinda_like?("cawffee", "coffee") == false \ No newline at end of file From 84717509c6e81aa24612b28c039aca6f1f7f0460 Mon Sep 17 00:00:00 2001 From: LoRyder1 Date: Fri, 29 May 2015 13:18:03 -0400 Subject: [PATCH 8/9] maybe --- parser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser.rb b/parser.rb index a0c2f22..d4fe09f 100644 --- a/parser.rb +++ b/parser.rb @@ -39,4 +39,4 @@ def jumbled(w1,w2) p kinda_like?("doge", "dog") == true p kinda_like?("bog", "dog") == true p kinda_like?("flow", "wolf") == false -p kinda_like?("cawffee", "coffee") == false \ No newline at end of file +p kinda_like?("cawffee", "coffee") == false From a207c8eda164abafea941eb3ae7b9be76f226608 Mon Sep 17 00:00:00 2001 From: LoRyder1 Date: Fri, 29 May 2015 13:35:41 -0400 Subject: [PATCH 9/9] this should work --- parser.rb | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/parser.rb b/parser.rb index d4fe09f..2f6e074 100644 --- a/parser.rb +++ b/parser.rb @@ -1,42 +1,41 @@ require 'pry' def kinda_like?(fuzzy_word, exact_word) - if fuzzy_word == exact_word - return true - elsif fouls(fuzzy_word, exact_word) < 2 - return true - else - return false - end + if fuzzy_word == exact_word + return true + elsif fouls(fuzzy_word, exact_word) < 2 + return true + else + return false + end end def fouls(w1,w2) - array_w1 = w1.chars - array_w2 = w2.chars - array_w1.each do |x| - array_w2.delete(x) - end - z = 0 - wd1 = w1.chars - wd2 = w2.chars - z = 1 if wd1.last == wd2.last && wd1.first == wd2.first && w1.size != w2.size - array_w2.count + jumbled(w1,w2) + z + array_w2 = w2.chars + array_w1.each do |x| + array_w2.delete(x) + end + z = 0 + wd1 = w1.chars + wd2 = w2.chars + z = 1 if wd1.last == wd2.last && wd1.first == wd2.first && w1.size != w2.size + array_w2.count + jumbled(w1,w2) + z end def jumbled(w1,w2) - if w1.chars.last == w2.chars.last - 0 - elsif w1.chars.first != w2.chars.first - 2 - else - 1 - end + if w1.chars.last == w2.chars.last + 0 + elsif w1.chars.first != w2.chars.first + 2 + else + 1 + end end - # p fouls("cawffee", "coffee") # p fouls("bog", "dog") p kinda_like?("doge", "dog") == true p kinda_like?("bog", "dog") == true p kinda_like?("flow", "wolf") == false p kinda_like?("cawffee", "coffee") == false +