From fa1a77fed511d6f08777c34d0c314530f3418e44 Mon Sep 17 00:00:00 2001 From: KuikoIhar Date: Wed, 21 Feb 2018 17:19:01 +0300 Subject: [PATCH 01/10] implement hw 1 --- 2018/KuikoIhar/1/pas_tri.rb | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 2018/KuikoIhar/1/pas_tri.rb diff --git a/2018/KuikoIhar/1/pas_tri.rb b/2018/KuikoIhar/1/pas_tri.rb new file mode 100644 index 000000000..28482233d --- /dev/null +++ b/2018/KuikoIhar/1/pas_tri.rb @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby + +def pas_tri (h, n) + l = [n] + [l] + (1..h).map do + l = [n] + l[1..-1].map.with_index{|x, i| x+l[i]} + [n] + end +end + +def pad (s, n) + l = n - s.size + ' '*(l/2) + s + ' '*(l-l/2) +end + +def lines (rows) + n = "#{rows[-1].max}".size + rows.map do |row| + row.map{|x| pad("#{x}", n)}.join(' ') + end +end + +def center (l) + n = l[-1].size + l.map{|s| pad(s, n)} +end + + +puts "Введите глубину дерева: " +h = gets.chomp.to_i +puts "Введите базовый номер: " +n = gets.chomp.to_i +puts center lines pas_tri(h, n) + From ea46a75916e8b0bc88454f0687bd016bf761e94b Mon Sep 17 00:00:00 2001 From: KuikoIhar Date: Wed, 21 Feb 2018 20:54:46 +0300 Subject: [PATCH 02/10] fix styling issues --- 2018/KuikoIhar/1/pas_tri.rb | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) mode change 100644 => 100755 2018/KuikoIhar/1/pas_tri.rb diff --git a/2018/KuikoIhar/1/pas_tri.rb b/2018/KuikoIhar/1/pas_tri.rb old mode 100644 new mode 100755 index 28482233d..714ab498f --- a/2018/KuikoIhar/1/pas_tri.rb +++ b/2018/KuikoIhar/1/pas_tri.rb @@ -1,33 +1,31 @@ #!/usr/bin/env ruby -def pas_tri (h, n) +def pas_tri(h, n) l = [n] [l] + (1..h).map do - l = [n] + l[1..-1].map.with_index{|x, i| x+l[i]} + [n] + l = [n] + l[1..-1].map.with_index { |x, i| x + l[i] } + [n] end end -def pad (s, n) +def pad(s, n) l = n - s.size - ' '*(l/2) + s + ' '*(l-l/2) + ' ' * (l / 2) + s + ' ' * (l - l / 2) end -def lines (rows) +def lines(rows) n = "#{rows[-1].max}".size rows.map do |row| row.map{|x| pad("#{x}", n)}.join(' ') end end -def center (l) +def center(l) n = l[-1].size - l.map{|s| pad(s, n)} + l.map { |s| pad(s, n) } end - -puts "Введите глубину дерева: " +puts 'Введите глубину дерева: ' h = gets.chomp.to_i -puts "Введите базовый номер: " +puts 'Введите базовый номер: ' n = gets.chomp.to_i puts center lines pas_tri(h, n) - From 447dd13354ebfb8416224de5a5a4f5697c409323 Mon Sep 17 00:00:00 2001 From: KuikoIhar Date: Wed, 21 Feb 2018 21:20:09 +0300 Subject: [PATCH 03/10] fix styling issues_1 --- 2018/KuikoIhar/1/pas_tri.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/KuikoIhar/1/pas_tri.rb b/2018/KuikoIhar/1/pas_tri.rb index 714ab498f..8717a1c5d 100755 --- a/2018/KuikoIhar/1/pas_tri.rb +++ b/2018/KuikoIhar/1/pas_tri.rb @@ -15,7 +15,7 @@ def pad(s, n) def lines(rows) n = "#{rows[-1].max}".size rows.map do |row| - row.map{|x| pad("#{x}", n)}.join(' ') + row.map { |x| pad("#{x}", n) }.join(' ') end end From 6589545a1b46a7fc766da7afad1d6b5923576b81 Mon Sep 17 00:00:00 2001 From: KuikoIhar Date: Wed, 21 Feb 2018 21:21:03 +0300 Subject: [PATCH 04/10] fix styling issues_1 --- 2018/KuikoIhar/1/pas_tri.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/KuikoIhar/1/pas_tri.rb b/2018/KuikoIhar/1/pas_tri.rb index 8717a1c5d..9c468c2f9 100755 --- a/2018/KuikoIhar/1/pas_tri.rb +++ b/2018/KuikoIhar/1/pas_tri.rb @@ -15,7 +15,7 @@ def pad(s, n) def lines(rows) n = "#{rows[-1].max}".size rows.map do |row| - row.map { |x| pad("#{x}", n) }.join(' ') + row.map { |x| pad(x.to_s, n) }.join(' ') end end From c89888667f0f73bdb32fa20bfc496746ad5b3460 Mon Sep 17 00:00:00 2001 From: KuikoIhar Date: Wed, 21 Feb 2018 21:28:38 +0300 Subject: [PATCH 05/10] fix styling issues_2 --- 2018/KuikoIhar/1/pas_tri.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/KuikoIhar/1/pas_tri.rb b/2018/KuikoIhar/1/pas_tri.rb index 9c468c2f9..33840d23b 100755 --- a/2018/KuikoIhar/1/pas_tri.rb +++ b/2018/KuikoIhar/1/pas_tri.rb @@ -13,7 +13,7 @@ def pad(s, n) end def lines(rows) - n = "#{rows[-1].max}".size + n = rows[-1].max.to_s.size rows.map do |row| row.map { |x| pad(x.to_s, n) }.join(' ') end From 18492366c5243a352bc510b8e5e215b41b036606 Mon Sep 17 00:00:00 2001 From: KuikoIhar Date: Wed, 21 Feb 2018 21:47:54 +0300 Subject: [PATCH 06/10] fix styling issues_3 --- 2018/KuikoIhar/1/pas_tri.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2018/KuikoIhar/1/pas_tri.rb b/2018/KuikoIhar/1/pas_tri.rb index 33840d23b..53a37ab3e 100755 --- a/2018/KuikoIhar/1/pas_tri.rb +++ b/2018/KuikoIhar/1/pas_tri.rb @@ -14,8 +14,8 @@ def pad(s, n) def lines(rows) n = rows[-1].max.to_s.size - rows.map do |row| - row.map { |x| pad(x.to_s, n) }.join(' ') + rows.map do + |row| row.map { |x| pad(x.to_s, n) }.join(' ') end end From 297b0e13c95823a9abbfd4371b9f5fb44e69255e Mon Sep 17 00:00:00 2001 From: KuikoIhar Date: Wed, 21 Feb 2018 21:52:15 +0300 Subject: [PATCH 07/10] fix styling issues_4 --- 2018/KuikoIhar/1/pas_tri.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2018/KuikoIhar/1/pas_tri.rb b/2018/KuikoIhar/1/pas_tri.rb index 53a37ab3e..9a23e5ba6 100755 --- a/2018/KuikoIhar/1/pas_tri.rb +++ b/2018/KuikoIhar/1/pas_tri.rb @@ -14,7 +14,7 @@ def pad(s, n) def lines(rows) n = rows[-1].max.to_s.size - rows.map do + rows.map do |row| row.map { |x| pad(x.to_s, n) }.join(' ') end end From 0abfb6f4be6e88fdac87d0cb444dd3b8724d362d Mon Sep 17 00:00:00 2001 From: KuikoIhar Date: Wed, 21 Feb 2018 22:01:54 +0300 Subject: [PATCH 08/10] fix styling issues_5 --- 2018/KuikoIhar/1/pas_tri.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/2018/KuikoIhar/1/pas_tri.rb b/2018/KuikoIhar/1/pas_tri.rb index 9a23e5ba6..1db345574 100755 --- a/2018/KuikoIhar/1/pas_tri.rb +++ b/2018/KuikoIhar/1/pas_tri.rb @@ -14,9 +14,7 @@ def pad(s, n) def lines(rows) n = rows[-1].max.to_s.size - rows.map do - |row| row.map { |x| pad(x.to_s, n) }.join(' ') - end + rows.map { |row| row.map { |x| pad(x.to_s, n) }.join(' ') } end def center(l) From d30fa58b9db8c1c38496f63159b1348243ece781 Mon Sep 17 00:00:00 2001 From: KuikoIhar Date: Wed, 21 Feb 2018 22:22:41 +0300 Subject: [PATCH 09/10] fix styling issues_6 --- 2018/KuikoIhar/1/pas_tri.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/2018/KuikoIhar/1/pas_tri.rb b/2018/KuikoIhar/1/pas_tri.rb index 1db345574..05a44a38a 100755 --- a/2018/KuikoIhar/1/pas_tri.rb +++ b/2018/KuikoIhar/1/pas_tri.rb @@ -17,9 +17,9 @@ def lines(rows) rows.map { |row| row.map { |x| pad(x.to_s, n) }.join(' ') } end -def center(l) - n = l[-1].size - l.map { |s| pad(s, n) } +def center(line) + n = line[-1].size + line.map { |s| pad(s, n) } end puts 'Введите глубину дерева: ' From 7df7fd235a819b7c81d319afebc099a7e5536002 Mon Sep 17 00:00:00 2001 From: KuikoIhar Date: Wed, 21 Feb 2018 23:41:24 +0300 Subject: [PATCH 10/10] fix styling issues_7 --- 2018/KuikoIhar/1/pas_tri.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/2018/KuikoIhar/1/pas_tri.rb b/2018/KuikoIhar/1/pas_tri.rb index 05a44a38a..160918528 100755 --- a/2018/KuikoIhar/1/pas_tri.rb +++ b/2018/KuikoIhar/1/pas_tri.rb @@ -1,5 +1,3 @@ -#!/usr/bin/env ruby - def pas_tri(h, n) l = [n] [l] + (1..h).map do