From 9cc495b3bded8f56fa30ec3feca8a495f0434f28 Mon Sep 17 00:00:00 2001 From: Linnea Johnson Date: Tue, 3 Sep 2019 09:06:06 -0700 Subject: [PATCH 1/4] works but has puts statements --- lib/array_equals.rb | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/array_equals.rb b/lib/array_equals.rb index 58e8369..51a2201 100644 --- a/lib/array_equals.rb +++ b/lib/array_equals.rb @@ -1,5 +1,22 @@ # Determines if the two input arrays have the same count of elements # and the same integer values in the same exact order -def array_equals(array1, array2) - raise NotImplementedError + +def arraysAreEqual?(input_array1, input_array2) + if input_array1.length == input_array2.length + input_array1.each_with_index do |char, i| + if input_array1[i] == input_array2[i] + puts char + else + puts "false" + end + end + else + puts "the arrays are different lengths" + end + end + +array1 = %w[l i n z e a] +array2 = %w[l i n n e a] + +arraysAreEqual?(array1, array2) From fd0fe3c460352c8ff3a4f89f11b03f951876b1b7 Mon Sep 17 00:00:00 2001 From: Linnea Johnson Date: Tue, 3 Sep 2019 09:41:41 -0700 Subject: [PATCH 2/4] cleaned up code, changed boolean logic --- lib/array_equals.rb | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/lib/array_equals.rb b/lib/array_equals.rb index 51a2201..c741201 100644 --- a/lib/array_equals.rb +++ b/lib/array_equals.rb @@ -1,22 +1,20 @@ # Determines if the two input arrays have the same count of elements # and the same integer values in the same exact order -def arraysAreEqual?(input_array1, input_array2) - if input_array1.length == input_array2.length - input_array1.each_with_index do |char, i| - if input_array1[i] == input_array2[i] - puts char - else - puts "false" - end +def array_equals(array1, array2) + if array1.length != array2.length + return false + end + array1.each_with_index do |char, i| + if array1[i] != array2[i] + return false end - else - puts "the arrays are different lengths" - end - + end + return true end array1 = %w[l i n z e a] array2 = %w[l i n n e a] -arraysAreEqual?(array1, array2) +array_equals(array1, array2) + From c47b6230925afa934671deaf0efc45f24d5982e6 Mon Sep 17 00:00:00 2001 From: Linnea Johnson Date: Tue, 3 Sep 2019 09:42:11 -0700 Subject: [PATCH 3/4] deleted arrays from code --- lib/array_equals.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/array_equals.rb b/lib/array_equals.rb index c741201..9d08b17 100644 --- a/lib/array_equals.rb +++ b/lib/array_equals.rb @@ -13,8 +13,5 @@ def array_equals(array1, array2) return true end -array1 = %w[l i n z e a] -array2 = %w[l i n n e a] - array_equals(array1, array2) From 187483b1f771ace1b487c69d4114fe814a877adb Mon Sep 17 00:00:00 2001 From: Linnea Johnson Date: Tue, 3 Sep 2019 14:05:05 -0700 Subject: [PATCH 4/4] made code compatible with tests --- lib/array_equals.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/array_equals.rb b/lib/array_equals.rb index 9d08b17..fe649d4 100644 --- a/lib/array_equals.rb +++ b/lib/array_equals.rb @@ -2,6 +2,14 @@ # and the same integer values in the same exact order def array_equals(array1, array2) + if array1 == nil && array2 == nil + return true + elsif array1 == nil && array2 != nil + return false + elsif array1 != nil && array2 == nil + return false + end + if array1.length != array2.length return false end @@ -13,5 +21,3 @@ def array_equals(array1, array2) return true end -array_equals(array1, array2) -