From 6f049c7415f8234669e870ec549936ea8a4264ba Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 00:27:40 +0300 Subject: [PATCH 01/62] implement hw 1 --- 2018/AlexeiRakov/1/piramid.rb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 2018/AlexeiRakov/1/piramid.rb diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb new file mode 100644 index 000000000..85880e702 --- /dev/null +++ b/2018/AlexeiRakov/1/piramid.rb @@ -0,0 +1,28 @@ +def triangle(n, z, c) +(0..n).map do |r| + n = [0] + num = [c] + left = [z] + right = z + c = 1 + k = 1 +(0..r-1).step(1) do |index| + right = right*(r-k+1)/k + left.push right + c += 1 + k += 1 + end + m = "#{num}" + n = "#{left}" + puts "#{n.center(130).green} #{m.rjust(13)}" + end +end +print "enter the vertex of the triangle: " +z = gets.to_i +print "enter the depth of the triangle: " +n = gets.to_i + puts "vertex triangle = #{z} " + puts "depth triangle = #{n} " + print "\n\n" + require 'colorize' +triangle(n, z, c = 0) \ No newline at end of file From 2e7001d70f54f209a39828d89fcc0d041a06045b Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 02:27:59 +0300 Subject: [PATCH 02/62] fix styling issues --- 2018/AlexeiRakov/1/piramid.rb | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 85880e702..b22da8544 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,28 +1,28 @@ def triangle(n, z, c) (0..n).map do |r| - n = [0] - num = [c] - left = [z] - right = z - c = 1 - k = 1 -(0..r-1).step(1) do |index| - right = right*(r-k+1)/k - left.push right - c += 1 - k += 1 - end - m = "#{num}" - n = "#{left}" - puts "#{n.center(130).green} #{m.rjust(13)}" - end +n = [0] +num = [c] +left = [z] +right = z +c = 1 +k = 1 +(0..r - 1).step(1) do +|index| +right = right * (r - k + 1) / k +left.push right +c += 1 +k += 1 end -print "enter the vertex of the triangle: " +num.to_s +left.to_s +puts "#{n.center(130).green} #{m.rjust(13)}" +end +end +print 'enter the vertex of the triangle:' z = gets.to_i -print "enter the depth of the triangle: " +print 'enter the depth of the triangle:' n = gets.to_i - puts "vertex triangle = #{z} " - puts "depth triangle = #{n} " - print "\n\n" - require 'colorize' +puts "vertex triangle = #{z}" +puts "depth triangle = #{n}" +require 'colorize' triangle(n, z, c = 0) \ No newline at end of file From b18b1aa61ebea2df48e90cb9be7e5287bc9c1177 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 16:12:55 +0300 Subject: [PATCH 03/62] fix3 --- 2018/AlexeiRakov/1/piramid.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index b22da8544..82494182e 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -6,19 +6,18 @@ def triangle(n, z, c) right = z c = 1 k = 1 -(0..r - 1).step(1) do -|index| +(0..r - 1).step(1)do|index| right = right * (r - k + 1) / k -left.push right +left.push right c += 1 k += 1 end num.to_s left.to_s -puts "#{n.center(130).green} #{m.rjust(13)}" +puts "#{n.center(130).green} #{m.rjust(13)}" end end -print 'enter the vertex of the triangle:' +print 'enter the vertex of the triangle:' z = gets.to_i print 'enter the depth of the triangle:' n = gets.to_i From 9ba3bd9fd05374d4ebe1ac4be72a4c60581a5cab Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 16:32:32 +0300 Subject: [PATCH 04/62] fix4 --- 2018/AlexeiRakov/1/piramid.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 82494182e..78c2a4ee0 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,12 +1,12 @@ def triangle(n, z, c) -(0..n).map do |r| + (0..n).map do |r| n = [0] num = [c] left = [z] right = z c = 1 k = 1 -(0..r - 1).step(1)do|index| +(0..r - 1).step(1) do right = right * (r - k + 1) / k left.push right c += 1 @@ -15,7 +15,7 @@ def triangle(n, z, c) num.to_s left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" -end + end end print 'enter the vertex of the triangle:' z = gets.to_i @@ -24,4 +24,4 @@ def triangle(n, z, c) puts "vertex triangle = #{z}" puts "depth triangle = #{n}" require 'colorize' -triangle(n, z, c = 0) \ No newline at end of file +triangle(n, z, c) \ No newline at end of file From 82c046518a500e7e99f9374aa8809f4bffacbdae Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 16:41:31 +0300 Subject: [PATCH 05/62] fix5 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 78c2a4ee0..c709d2422 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,5 +1,5 @@ def triangle(n, z, c) - (0..n).map do |r| + (0..n).map do |r| n = [0] num = [c] left = [z] @@ -15,7 +15,7 @@ def triangle(n, z, c) num.to_s left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" - end +end end print 'enter the vertex of the triangle:' z = gets.to_i From 2ed5adceb49f47b8828ac933a62ea2383271351c Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 16:44:57 +0300 Subject: [PATCH 06/62] fix6 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index c709d2422..46ecfbd1b 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -15,7 +15,7 @@ def triangle(n, z, c) num.to_s left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" -end + end end print 'enter the vertex of the triangle:' z = gets.to_i From cc84521e4366c825fdc8142ee0175acafb91282c Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 16:49:04 +0300 Subject: [PATCH 07/62] fix7 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 46ecfbd1b..9dda445be 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,6 +1,6 @@ def triangle(n, z, c) (0..n).map do |r| -n = [0] + n = [0] num = [c] left = [z] right = z From 14097315b096539140af5997bcb68273f340bc5c Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 16:52:34 +0300 Subject: [PATCH 08/62] fix8 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 9dda445be..ac3e1e80b 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,6 +1,6 @@ def triangle(n, z, c) - (0..n).map do |r| - n = [0] + (0..n).map do|r| +n = [0] num = [c] left = [z] right = z From 10e61006cb9e4a906e48dae97476224d8c541e7e Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 16:55:30 +0300 Subject: [PATCH 09/62] fix9 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index ac3e1e80b..46ecfbd1b 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,5 +1,5 @@ def triangle(n, z, c) - (0..n).map do|r| + (0..n).map do |r| n = [0] num = [c] left = [z] From e8f23401bf8718b7b78507edf36d80483178d695 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 16:58:13 +0300 Subject: [PATCH 10/62] fix10 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 46ecfbd1b..a76932752 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -6,12 +6,12 @@ def triangle(n, z, c) right = z c = 1 k = 1 -(0..r - 1).step(1) do + (0..r - 1).step(1) do right = right * (r - k + 1) / k left.push right c += 1 k += 1 -end + end num.to_s left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" From d275ee0b243f9ef8264fadcf30e4c70501677791 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:00:13 +0300 Subject: [PATCH 11/62] fix11 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index a76932752..5b4647f59 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -6,7 +6,7 @@ def triangle(n, z, c) right = z c = 1 k = 1 - (0..r - 1).step(1) do +(0..r - 1).step(1) do right = right * (r - k + 1) / k left.push right c += 1 From 3d1ecd1e7844996a8d48139b40a31537a1cc41fc Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:01:44 +0300 Subject: [PATCH 12/62] fix12 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 5b4647f59..46ecfbd1b 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -11,7 +11,7 @@ def triangle(n, z, c) left.push right c += 1 k += 1 - end +end num.to_s left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" From 30d5bcfff373854f2cfddea4ccf033ce1606fdcc Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:06:55 +0300 Subject: [PATCH 13/62] fix13 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 46ecfbd1b..a425ad24b 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -24,4 +24,4 @@ def triangle(n, z, c) puts "vertex triangle = #{z}" puts "depth triangle = #{n}" require 'colorize' -triangle(n, z, c) \ No newline at end of file +triangle(n, z, c) From 9f4f1d7acc39928bd88f188b6456f496f90c3e88 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:12:56 +0300 Subject: [PATCH 14/62] fix14 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index a425ad24b..d522000d2 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -6,12 +6,12 @@ def triangle(n, z, c) right = z c = 1 k = 1 -(0..r - 1).step(1) do + (0..r - 1).step(1) do right = right * (r - k + 1) / k left.push right c += 1 k += 1 -end + end num.to_s left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" From d5a94531ce580b34270bde408d26daf433bbe356 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:14:25 +0300 Subject: [PATCH 15/62] fix15 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index d522000d2..09f3ac450 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -6,12 +6,12 @@ def triangle(n, z, c) right = z c = 1 k = 1 - (0..r - 1).step(1) do + (0..r - 1).step(1) do right = right * (r - k + 1) / k left.push right c += 1 k += 1 - end + end num.to_s left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" From 36b4e001bacb530b0393ee6ff49d11efe575ae04 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:17:40 +0300 Subject: [PATCH 16/62] fix16 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 09f3ac450..a425ad24b 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -6,12 +6,12 @@ def triangle(n, z, c) right = z c = 1 k = 1 - (0..r - 1).step(1) do +(0..r - 1).step(1) do right = right * (r - k + 1) / k left.push right c += 1 k += 1 - end +end num.to_s left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" From 164758f69c0fb4aad0867d7478119a4ca1709819 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:24:11 +0300 Subject: [PATCH 17/62] fix17 --- 2018/AlexeiRakov/1/piramid.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index a425ad24b..beeac3601 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,20 +1,20 @@ def triangle(n, z, c) (0..n).map do |r| -n = [0] -num = [c] -left = [z] -right = z -c = 1 -k = 1 + n = [0] + num = [c] + left = [z] + right = z + c = 1 + k = 1 (0..r - 1).step(1) do right = right * (r - k + 1) / k left.push right c += 1 k += 1 end -num.to_s -left.to_s -puts "#{n.center(130).green} #{m.rjust(13)}" + num.to_s + left.to_s + puts "#{n.center(130).green} #{m.rjust(13)}" end end print 'enter the vertex of the triangle:' From d571c1806a9ef3df16ee4cf7fb3b942f401c2799 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:31:39 +0300 Subject: [PATCH 18/62] fix18 --- 2018/AlexeiRakov/1/piramid.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index beeac3601..85ec742b4 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,21 +1,21 @@ def triangle(n, z, c) - (0..n).map do |r| - n = [0] - num = [c] - left = [z] - right = z - c = 1 - k = 1 +(0..n).map do |r| +n = [0] +num = [c] +left = [z] +right = z +c = 1 +k = 1 (0..r - 1).step(1) do right = right * (r - k + 1) / k left.push right c += 1 k += 1 end - num.to_s - left.to_s - puts "#{n.center(130).green} #{m.rjust(13)}" - end +num.to_s +left.to_s +puts "#{n.center(130).green} #{m.rjust(13)}" +end end print 'enter the vertex of the triangle:' z = gets.to_i From ee97bb1a2f1bdbfb5d130d20829bfcd3b91c1844 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:39:02 +0300 Subject: [PATCH 19/62] fix19 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 85ec742b4..a425ad24b 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,5 +1,5 @@ def triangle(n, z, c) -(0..n).map do |r| + (0..n).map do |r| n = [0] num = [c] left = [z] @@ -15,7 +15,7 @@ def triangle(n, z, c) num.to_s left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" -end + end end print 'enter the vertex of the triangle:' z = gets.to_i From fa274fa49b520b4d216b9f20d229940ae37f06d3 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:41:11 +0300 Subject: [PATCH 20/62] fix20 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index a425ad24b..09f3ac450 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -6,12 +6,12 @@ def triangle(n, z, c) right = z c = 1 k = 1 -(0..r - 1).step(1) do + (0..r - 1).step(1) do right = right * (r - k + 1) / k left.push right c += 1 k += 1 -end + end num.to_s left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" From 63b1e7222c7699526afa2560aeb6b5488ca48e28 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:42:46 +0300 Subject: [PATCH 21/62] fix21 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 09f3ac450..daeabf16a 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -11,7 +11,7 @@ def triangle(n, z, c) left.push right c += 1 k += 1 - end +end num.to_s left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" From 34166a414c681156a8b63c014a0908471c22c3ba Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:44:25 +0300 Subject: [PATCH 22/62] fix22 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index daeabf16a..a425ad24b 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -6,7 +6,7 @@ def triangle(n, z, c) right = z c = 1 k = 1 - (0..r - 1).step(1) do +(0..r - 1).step(1) do right = right * (r - k + 1) / k left.push right c += 1 From 3e3f87affb7b2909a8ef35469463b5382fcf3150 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:48:31 +0300 Subject: [PATCH 23/62] fix23 --- 2018/AlexeiRakov/1/piramid.rb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index a425ad24b..587d06f97 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,19 +1,19 @@ def triangle(n, z, c) (0..n).map do |r| -n = [0] -num = [c] -left = [z] -right = z -c = 1 -k = 1 -(0..r - 1).step(1) do -right = right * (r - k + 1) / k -left.push right -c += 1 -k += 1 -end -num.to_s -left.to_s + n = [0] + num = [c] + left = [z] + right = z + c = 1 + k = 1 + (0..r - 1).step(1) do + right = right * (r - k + 1) / k + left.push right + c += 1 + k += 1 + end + num.to_s + left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" end end From d7939e3e4f1aab1a7f568f2f2ae9debf791a5194 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:50:11 +0300 Subject: [PATCH 24/62] fix24 --- 2018/AlexeiRakov/1/piramid.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 587d06f97..688ceae95 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -7,10 +7,10 @@ def triangle(n, z, c) c = 1 k = 1 (0..r - 1).step(1) do - right = right * (r - k + 1) / k - left.push right - c += 1 - k += 1 + right = right * (r - k + 1) / k + left.push right + c += 1 + k += 1 end num.to_s left.to_s From 825907a06382b17f1c9b627de8c58e64216ae833 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 17:56:58 +0300 Subject: [PATCH 25/62] fix26 --- 2018/AlexeiRakov/1/piramid.rb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 688ceae95..a425ad24b 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,19 +1,19 @@ def triangle(n, z, c) (0..n).map do |r| - n = [0] - num = [c] - left = [z] - right = z - c = 1 - k = 1 - (0..r - 1).step(1) do - right = right * (r - k + 1) / k - left.push right - c += 1 - k += 1 - end - num.to_s - left.to_s +n = [0] +num = [c] +left = [z] +right = z +c = 1 +k = 1 +(0..r - 1).step(1) do +right = right * (r - k + 1) / k +left.push right +c += 1 +k += 1 +end +num.to_s +left.to_s puts "#{n.center(130).green} #{m.rjust(13)}" end end From 873d583da38d045059a540ac96927618b401e4be Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 18:01:33 +0300 Subject: [PATCH 26/62] fix27 --- 2018/AlexeiRakov/1/piramid.rb | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index a425ad24b..1767ea044 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,20 +1,20 @@ def triangle(n, z, c) (0..n).map do |r| -n = [0] -num = [c] -left = [z] -right = z -c = 1 -k = 1 -(0..r - 1).step(1) do -right = right * (r - k + 1) / k -left.push right -c += 1 -k += 1 -end -num.to_s -left.to_s -puts "#{n.center(130).green} #{m.rjust(13)}" + n = [0] + num = [c] + left = [z] + right = z + c = 1 + k = 1 + (0..r - 1).step(1) do + right = right * (r - k + 1) / k + left.push right + c += 1 + k += 1 + end + num.to_s + left.to_s + puts "#{n.center(130).green} #{m.rjust(13)}" end end print 'enter the vertex of the triangle:' From fd118f5875a437114b2520ad0f3e20bfaf914180 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Tue, 20 Feb 2018 18:13:47 +0300 Subject: [PATCH 27/62] fix28 --- 2018/AlexeiRakov/1/piramid.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 1767ea044..9b2bdc027 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -7,10 +7,10 @@ def triangle(n, z, c) c = 1 k = 1 (0..r - 1).step(1) do - right = right * (r - k + 1) / k - left.push right - c += 1 - k += 1 + right = right * (r - k + 1) / k + left.push right + c += 1 + k += 1 end num.to_s left.to_s From 186e15986d9b2bd97e5b77da58859d523456ab86 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 00:12:23 +0300 Subject: [PATCH 28/62] fix30 --- 2018/AlexeiRakov/1/piramid.rb | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 9b2bdc027..aef875380 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,27 +1,39 @@ -def triangle(n, z, c) +def triangle(n, z, c, q) (0..n).map do |r| + u = [] + mas = [] n = [0] + t = [0] num = [c] left = [z] right = z c = 1 k = 1 - (0..r - 1).step(1) do - right = right * (r - k + 1) / k - left.push right + (0..r-1).step(1) do + o = right + right = right*(r-k+1)/k + u = right + if o + u == q + mas.push o + mas.push right + end + left.push right c += 1 k += 1 end - num.to_s - left.to_s - puts "#{n.center(130).green} #{m.rjust(13)}" + puts "#{left.to_s.center(140).green} #{num.to_s.rjust(3)}" + puts "#{mas.to_s.ljust(10).red}" end end print 'enter the vertex of the triangle:' z = gets.to_i print 'enter the depth of the triangle:' n = gets.to_i +print 'enter a child:' +q = gets.to_i puts "vertex triangle = #{z}" puts "depth triangle = #{n}" +puts 'parents will be selected from the left' +c = 0 require 'colorize' -triangle(n, z, c) +triangle(n, z, c ,q) From 3c2e868583a6379cb193433dbf47055c764d44eb Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 00:30:10 +0300 Subject: [PATCH 29/62] fix31 --- 2018/AlexeiRakov/1/piramid.rb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index aef875380..00c0b6d7f 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,17 +1,19 @@ def triangle(n, z, c, q) (0..n).map do |r| + k = [0] + y = [0] + h = [0] u = [] mas = [] n = [0] - t = [0] num = [c] left = [z] right = z c = 1 k = 1 - (0..r-1).step(1) do + (0..r - 1).step(1) do o = right - right = right*(r-k+1)/k + right = right * (r - k + 1) / k u = right if o + u == q mas.push o @@ -21,8 +23,11 @@ def triangle(n, z, c, q) c += 1 k += 1 end - puts "#{left.to_s.center(140).green} #{num.to_s.rjust(3)}" - puts "#{mas.to_s.ljust(10).red}" + h = left.to_s + y = num.to_s + k = mas.to_s + puts "#{h.center(140).green} #{y.rjust(3)}" + puts "#{k.ljust(10).red}" end end print 'enter the vertex of the triangle:' @@ -36,4 +41,4 @@ def triangle(n, z, c, q) puts 'parents will be selected from the left' c = 0 require 'colorize' -triangle(n, z, c ,q) +triangle(n, z, c, q) From 2f70e50c59586bdf539737503769af08589ae073 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 01:12:17 +0300 Subject: [PATCH 30/62] fix32 --- 2018/AlexeiRakov/1/piramid.rb | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 00c0b6d7f..bc8a567cd 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,9 +1,5 @@ def triangle(n, z, c, q) (0..n).map do |r| - k = [0] - y = [0] - h = [0] - u = [] mas = [] n = [0] num = [c] @@ -19,15 +15,12 @@ def triangle(n, z, c, q) mas.push o mas.push right end - left.push right + left.push right c += 1 k += 1 end - h = left.to_s - y = num.to_s - k = mas.to_s - puts "#{h.center(140).green} #{y.rjust(3)}" - puts "#{k.ljust(10).red}" + puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" + puts "#{mas.to_s.ljust(5).red}" end end print 'enter the vertex of the triangle:' From d9dea00d14dc0e95d62f84c23f92afbff002f0f7 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 01:25:39 +0300 Subject: [PATCH 31/62] fix33 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index bc8a567cd..f1730321c 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -19,7 +19,7 @@ def triangle(n, z, c, q) c += 1 k += 1 end - puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" + puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" puts "#{mas.to_s.ljust(5).red}" end end From e03731edfc0f76cfe00d35b30f78a79d7b755f4a Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 01:38:15 +0300 Subject: [PATCH 32/62] fix35 --- 2018/AlexeiRakov/1/piramid.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index f1730321c..f09338bac 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -11,10 +11,10 @@ def triangle(n, z, c, q) o = right right = right * (r - k + 1) / k u = right - if o + u == q - mas.push o - mas.push right - end + if o + u == q + mas.push o + mas.push right + end left.push right c += 1 k += 1 From ff12845c96ce5a83ef273157258c988ed0e09dc5 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 01:42:15 +0300 Subject: [PATCH 33/62] fix36 --- 2018/AlexeiRakov/1/piramid.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index f09338bac..49fe4ad51 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -11,10 +11,10 @@ def triangle(n, z, c, q) o = right right = right * (r - k + 1) / k u = right - if o + u == q - mas.push o - mas.push right - end + if (o + u == q) + mas.push o + mas.push right + end left.push right c += 1 k += 1 From 2928792d14a7844e5409959d71d94d629248d18a Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 01:43:58 +0300 Subject: [PATCH 34/62] fix37 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 49fe4ad51..f1730321c 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -11,7 +11,7 @@ def triangle(n, z, c, q) o = right right = right * (r - k + 1) / k u = right - if (o + u == q) + if o + u == q mas.push o mas.push right end From 18a8b3e2917f2c0aafaab7bbdc2df2a5fa3f95d8 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 01:56:23 +0300 Subject: [PATCH 35/62] fix38 --- 2018/AlexeiRakov/1/piramid.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index f1730321c..71d2725b6 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -13,7 +13,6 @@ def triangle(n, z, c, q) u = right if o + u == q mas.push o - mas.push right end left.push right c += 1 From 7627b236e016e67ddb35312a0583c659732a1008 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 02:00:31 +0300 Subject: [PATCH 36/62] fix39 --- 2018/AlexeiRakov/1/piramid.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 71d2725b6..bc8a567cd 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -13,12 +13,13 @@ def triangle(n, z, c, q) u = right if o + u == q mas.push o + mas.push right end left.push right c += 1 k += 1 end - puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" + puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" puts "#{mas.to_s.ljust(5).red}" end end From 2a33924d668bf540aa962ac3c86f1cc03d8e27c9 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 02:02:30 +0300 Subject: [PATCH 37/62] fix40 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index bc8a567cd..9045a90c9 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -11,10 +11,10 @@ def triangle(n, z, c, q) o = right right = right * (r - k + 1) / k u = right - if o + u == q + if o + u == q mas.push o mas.push right - end + end left.push right c += 1 k += 1 From 30456043db2d527043fb2eb9a2c83318eda21b47 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 02:05:32 +0300 Subject: [PATCH 38/62] fix41 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 9045a90c9..d69d5ee31 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -12,8 +12,8 @@ def triangle(n, z, c, q) right = right * (r - k + 1) / k u = right if o + u == q - mas.push o - mas.push right + mas.push o + mas.push right end left.push right c += 1 From 34f2356f0350060ee326deba90431e03bef67185 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 02:07:41 +0300 Subject: [PATCH 39/62] fix42 --- 2018/AlexeiRakov/1/piramid.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index d69d5ee31..bc8a567cd 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -11,10 +11,10 @@ def triangle(n, z, c, q) o = right right = right * (r - k + 1) / k u = right - if o + u == q - mas.push o - mas.push right - end + if o + u == q + mas.push o + mas.push right + end left.push right c += 1 k += 1 From d23871f19ac9518538f062a74b83eb7a082af04f Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 02:10:58 +0300 Subject: [PATCH 40/62] fix43 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index bc8a567cd..ece9972c4 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -19,7 +19,7 @@ def triangle(n, z, c, q) c += 1 k += 1 end - puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" + puts "#{left.to_s.center(135).green}#{num.to_s.rjust(8)}" puts "#{mas.to_s.ljust(5).red}" end end From 281bcd3452a908c0151c7460b08e355f325ea8c2 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:02:57 +0300 Subject: [PATCH 41/62] fix44 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index ece9972c4..bd501c23d 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -12,8 +12,8 @@ def triangle(n, z, c, q) right = right * (r - k + 1) / k u = right if o + u == q - mas.push o - mas.push right + mas.push o + mas.push right end left.push right c += 1 From 2541d2fa5ddaa304a30252bda6432e725f7c806a Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:06:46 +0300 Subject: [PATCH 42/62] fix45 --- 2018/AlexeiRakov/1/piramid.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index bd501c23d..15e936854 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -11,10 +11,10 @@ def triangle(n, z, c, q) o = right right = right * (r - k + 1) / k u = right - if o + u == q - mas.push o - mas.push right - end + if o + u == q + mas.push o + mas.push right + end left.push right c += 1 k += 1 From 2ef4e5190980594fea02b684889109b2b863d6ee Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:09:07 +0300 Subject: [PATCH 43/62] fix46 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 15e936854..f09338bac 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -19,7 +19,7 @@ def triangle(n, z, c, q) c += 1 k += 1 end - puts "#{left.to_s.center(135).green}#{num.to_s.rjust(8)}" + puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" puts "#{mas.to_s.ljust(5).red}" end end From 4359fb789fe2eb9d24055d0972cdd63a41f115b1 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:12:04 +0300 Subject: [PATCH 44/62] fix47 --- 2018/AlexeiRakov/1/piramid.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index f09338bac..869a7ae7b 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -11,15 +11,15 @@ def triangle(n, z, c, q) o = right right = right * (r - k + 1) / k u = right - if o + u == q - mas.push o - mas.push right - end + if o + u == q + mas.push o + mas.push right + end left.push right c += 1 k += 1 end - puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" + puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" puts "#{mas.to_s.ljust(5).red}" end end @@ -32,6 +32,5 @@ def triangle(n, z, c, q) puts "vertex triangle = #{z}" puts "depth triangle = #{n}" puts 'parents will be selected from the left' -c = 0 require 'colorize' -triangle(n, z, c, q) +triangle(n, z, c = 0, q) From 2cba762b5ac30c31b4a85a80af2de1b9a73dc4fa Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:13:09 +0300 Subject: [PATCH 45/62] fix48 --- 2018/AlexeiRakov/1/piramid.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 869a7ae7b..bc8a567cd 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -32,5 +32,6 @@ def triangle(n, z, c, q) puts "vertex triangle = #{z}" puts "depth triangle = #{n}" puts 'parents will be selected from the left' +c = 0 require 'colorize' -triangle(n, z, c = 0, q) +triangle(n, z, c, q) From f59d0907071bccffd6ad2e439ac57747a424f76c Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:20:25 +0300 Subject: [PATCH 46/62] fix48 --- 2018/AlexeiRakov/1/piramid.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index bc8a567cd..8a237509c 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,6 +1,6 @@ def triangle(n, z, c, q) (0..n).map do |r| - mas = [] + # mas = [] n = [0] num = [c] left = [z] @@ -19,8 +19,8 @@ def triangle(n, z, c, q) c += 1 k += 1 end - puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" - puts "#{mas.to_s.ljust(5).red}" + puts "#{left.center(135).green} #{num.rjust(8)}" + puts "#{mas.ljust(5).red}" end end print 'enter the vertex of the triangle:' From 97b9ff16f51ddf01c99587c4b761e57cd738ab31 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:28:14 +0300 Subject: [PATCH 47/62] fix50 --- 2018/AlexeiRakov/1/piramid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 8a237509c..80956070e 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,6 +1,6 @@ def triangle(n, z, c, q) (0..n).map do |r| - # mas = [] + mas = [] n = [0] num = [c] left = [z] From baef0187e1599828145e911608df9b6a02fb43bc Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:30:18 +0300 Subject: [PATCH 48/62] fix51 --- 2018/AlexeiRakov/1/piramid.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 80956070e..dc86d7503 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,10 +1,5 @@ def triangle(n, z, c, q) (0..n).map do |r| - mas = [] - n = [0] - num = [c] - left = [z] - right = z c = 1 k = 1 (0..r - 1).step(1) do From b6c5cebcd86a4bf8cc4979de2da7ffe639766bf3 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:34:53 +0300 Subject: [PATCH 49/62] fix52 --- 2018/AlexeiRakov/1/piramid.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index dc86d7503..f51a31c17 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,5 +1,8 @@ def triangle(n, z, c, q) (0..n).map do |r| + num = [c] + left = [z] + right = z c = 1 k = 1 (0..r - 1).step(1) do From 750724769cfc5a805f3de001f0c35324809b0751 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:39:01 +0300 Subject: [PATCH 50/62] fix53 --- 2018/AlexeiRakov/1/piramid.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index f51a31c17..517e4a040 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,5 +1,7 @@ def triangle(n, z, c, q) (0..n).map do |r| + mas = [] + n = [0] num = [c] left = [z] right = z @@ -17,8 +19,8 @@ def triangle(n, z, c, q) c += 1 k += 1 end - puts "#{left.center(135).green} #{num.rjust(8)}" - puts "#{mas.ljust(5).red}" + puts "#{left.chomt.to_s.center(135).green} #{num.chomt.to_s.rjust(8)}" + puts "#{mas.chomt.to_s.ljust(5).red}" end end print 'enter the vertex of the triangle:' From 24896d77b00ee2241fe6256404bba56c02370a79 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:44:36 +0300 Subject: [PATCH 51/62] fix54 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 517e4a040..37efeba30 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -19,8 +19,8 @@ def triangle(n, z, c, q) c += 1 k += 1 end - puts "#{left.chomt.to_s.center(135).green} #{num.chomt.to_s.rjust(8)}" - puts "#{mas.chomt.to_s.ljust(5).red}" + puts "#{left.chomp.to_s.center(135).green} #{num.chomp.to_s.rjust(8)}" + puts "#{mas.chomp.to_s.ljust(5).red}" end end print 'enter the vertex of the triangle:' From ff7486a1a2df53b14d2153e8a1195133ffeb7a63 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:47:10 +0300 Subject: [PATCH 52/62] fix55 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 37efeba30..302504272 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -19,8 +19,8 @@ def triangle(n, z, c, q) c += 1 k += 1 end - puts "#{left.chomp.to_s.center(135).green} #{num.chomp.to_s.rjust(8)}" - puts "#{mas.chomp.to_s.ljust(5).red}" + puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" + puts "#{mas.to_s.ljust(5).red}" end end print 'enter the vertex of the triangle:' From bd602a49dd8f1d19903afed95c9753ad604e2f96 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:52:47 +0300 Subject: [PATCH 53/62] fix57 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 302504272..e49bab4fd 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -3,8 +3,8 @@ def triangle(n, z, c, q) mas = [] n = [0] num = [c] - left = [z] - right = z + left = [3] + right = 3 c = 1 k = 1 (0..r - 1).step(1) do From 6f14fdd0a73674ddb5bdedf25c7748e5fdc8663c Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 03:56:46 +0300 Subject: [PATCH 54/62] fix58 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index e49bab4fd..302504272 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -3,8 +3,8 @@ def triangle(n, z, c, q) mas = [] n = [0] num = [c] - left = [3] - right = 3 + left = [z] + right = z c = 1 k = 1 (0..r - 1).step(1) do From 63080f1e7336414b900e7a4f994edaa6803b9f99 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 04:00:33 +0300 Subject: [PATCH 55/62] fix59 --- 2018/AlexeiRakov/1/piramid.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 302504272..15de55ee9 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -15,9 +15,9 @@ def triangle(n, z, c, q) mas.push o mas.push right end - left.push right - c += 1 - k += 1 + left.push right + c += 1 + k += 1 end puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" puts "#{mas.to_s.ljust(5).red}" From 3cfc6c3939da531778d62c70623465aae2f5a798 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 04:03:01 +0300 Subject: [PATCH 56/62] fix60 --- 2018/AlexeiRakov/1/piramid.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 15de55ee9..302504272 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -15,9 +15,9 @@ def triangle(n, z, c, q) mas.push o mas.push right end - left.push right - c += 1 - k += 1 + left.push right + c += 1 + k += 1 end puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" puts "#{mas.to_s.ljust(5).red}" From 98feca965b0fb13642d8bff7d66cd46a730aeff3 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Wed, 21 Feb 2018 04:14:45 +0300 Subject: [PATCH 57/62] fix60 --- 2018/AlexeiRakov/1/piramid.rb | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 302504272..9b2bdc027 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,6 +1,5 @@ -def triangle(n, z, c, q) +def triangle(n, z, c) (0..n).map do |r| - mas = [] n = [0] num = [c] left = [z] @@ -8,30 +7,21 @@ def triangle(n, z, c, q) c = 1 k = 1 (0..r - 1).step(1) do - o = right right = right * (r - k + 1) / k - u = right - if o + u == q - mas.push o - mas.push right - end left.push right c += 1 k += 1 end - puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" - puts "#{mas.to_s.ljust(5).red}" + num.to_s + left.to_s + puts "#{n.center(130).green} #{m.rjust(13)}" end end print 'enter the vertex of the triangle:' z = gets.to_i print 'enter the depth of the triangle:' n = gets.to_i -print 'enter a child:' -q = gets.to_i puts "vertex triangle = #{z}" puts "depth triangle = #{n}" -puts 'parents will be selected from the left' -c = 0 require 'colorize' -triangle(n, z, c, q) +triangle(n, z, c) From a65f13292a3db7f57863cba365641fe7b5ddb594 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 12 Mar 2018 01:19:47 +0300 Subject: [PATCH 58/62] fix69 --- 2018/AlexeiRakov/1/piramid.rb | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 9b2bdc027..56f1c60b2 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -1,5 +1,6 @@ -def triangle(n, z, c) +def triangle(n, z, c, q) (0..n).map do |r| + mas = [] n = [0] num = [c] left = [z] @@ -7,21 +8,31 @@ def triangle(n, z, c) c = 1 k = 1 (0..r - 1).step(1) do + o = right right = right * (r - k + 1) / k + u = right + if o + u == q + mas.push o + mas.push right + end left.push right c += 1 k += 1 end - num.to_s - left.to_s - puts "#{n.center(130).green} #{m.rjust(13)}" + puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" + puts "#{mas.to_s.ljust(5).red}" end end print 'enter the vertex of the triangle:' z = gets.to_i print 'enter the depth of the triangle:' n = gets.to_i +print 'enter a child:' +q = gets.to_i puts "vertex triangle = #{z}" puts "depth triangle = #{n}" +puts 'parents will be selected from the left' +c = 0 require 'colorize' -triangle(n, z, c) +triangle(n, z, c, q) + \ No newline at end of file From 0a8116260b21b5379f3a56dde963a7d545eb6b6d Mon Sep 17 00:00:00 2001 From: root Date: Mon, 12 Mar 2018 01:23:54 +0300 Subject: [PATCH 59/62] fix70 --- 2018/AlexeiRakov/1/piramid.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 56f1c60b2..302504272 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -35,4 +35,3 @@ def triangle(n, z, c, q) c = 0 require 'colorize' triangle(n, z, c, q) - \ No newline at end of file From fe78f96e72c8c3fd632e6b9ffc3b65be31a14db0 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Fri, 23 Mar 2018 16:10:40 +0300 Subject: [PATCH 60/62] fix61 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 302504272..794729c33 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -28,9 +28,9 @@ def triangle(n, z, c, q) print 'enter the depth of the triangle:' n = gets.to_i print 'enter a child:' -q = gets.to_i +q = gets.to_i puts "vertex triangle = #{z}" -puts "depth triangle = #{n}" +puts "depth triangle = #{n}" puts 'parents will be selected from the left' c = 0 require 'colorize' From 1dae54e6e51567eed1ecad0bc458c86fed0e1525 Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Fri, 23 Mar 2018 16:14:30 +0300 Subject: [PATCH 61/62] fix62 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 794729c33..302504272 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -28,9 +28,9 @@ def triangle(n, z, c, q) print 'enter the depth of the triangle:' n = gets.to_i print 'enter a child:' -q = gets.to_i +q = gets.to_i puts "vertex triangle = #{z}" -puts "depth triangle = #{n}" +puts "depth triangle = #{n}" puts 'parents will be selected from the left' c = 0 require 'colorize' From c40c44b4e7592c452f40e248dd45a9deeabf7cac Mon Sep 17 00:00:00 2001 From: Rakovvv Date: Fri, 23 Mar 2018 16:17:55 +0300 Subject: [PATCH 62/62] fix63 --- 2018/AlexeiRakov/1/piramid.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/AlexeiRakov/1/piramid.rb b/2018/AlexeiRakov/1/piramid.rb index 302504272..a9683fa57 100644 --- a/2018/AlexeiRakov/1/piramid.rb +++ b/2018/AlexeiRakov/1/piramid.rb @@ -19,8 +19,8 @@ def triangle(n, z, c, q) c += 1 k += 1 end - puts "#{left.to_s.center(135).green} #{num.to_s.rjust(8)}" - puts "#{mas.to_s.ljust(5).red}" + puts "#{left} #{num}" + puts "#{mas}" end end print 'enter the vertex of the triangle:'