From 5d000c69fe166e1333d80a63fec54eadeff2b61b Mon Sep 17 00:00:00 2001 From: Nguyen Thu Trang Date: Wed, 16 Sep 2020 10:25:00 +0000 Subject: [PATCH 1/7] add test file --- test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..bdf08de --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +test file \ No newline at end of file From b9c4e7fd073bd5d6fb5020fc7a1d3122b846477a Mon Sep 17 00:00:00 2001 From: Nguyen Thu Trang Date: Tue, 22 Sep 2020 03:36:04 +0000 Subject: [PATCH 2/7] add kadai1 --- kadai1.rb | 14 +++++++------- practice.rb | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 practice.rb diff --git a/kadai1.rb b/kadai1.rb index c804b1b..9c54c0e 100644 --- a/kadai1.rb +++ b/kadai1.rb @@ -2,12 +2,12 @@ year = gets.to_i #gets(標準入力) # 以下の条件分岐に、新しい条件を追加してください -if - puts "#年にオリンピックはまだありません" -elsif - -elsif - puts "#年は夏季オリンピックが開催されました" +if year < 1896 + puts "#{year}年にオリンピックはまだありません" +elsif year==1916||year==1940||year==1944 + puts "#{year}年は夏季オリンピックイヤーではありません" +elsif year%4==0 + puts "#{year}年は夏季オリンピックが開催されました" else - puts "#年は夏季オリンピックイヤーではありません" + puts "#{year}年は夏季オリンピックイヤーではありません" end diff --git a/practice.rb b/practice.rb new file mode 100644 index 0000000..94044a3 --- /dev/null +++ b/practice.rb @@ -0,0 +1,24 @@ + +=begin + print "text \n" +=end +puts "text2" +puts "hello" + +name = "conan" +age = 20 +puts "name#{name}age#{age}" + +if age > 50 + puts "age >50" +elsif > 30 + puts "age >30" +else + puts "age is 20" +end + + + + + + From c1274a4f497cb55441e045bfe5048ebf0d0bf3ef Mon Sep 17 00:00:00 2001 From: Nguyen Thu Trang Date: Tue, 22 Sep 2020 04:04:34 +0000 Subject: [PATCH 3/7] add kadai2 --- kadai2.rb | 12 ++++++++++-- practice.rb | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/kadai2.rb b/kadai2.rb index 0d8bcdf..2a3cce5 100644 --- a/kadai2.rb +++ b/kadai2.rb @@ -8,13 +8,21 @@ {year: 1920, city: "アントワープ"}, {year: 1924, city: "パリ", note: "同じ都市での2回目の開催は初"}, {year: 1928, city: "アムステルダム"}, - {year: 1932, city: "ロサンゼルス"} + {year: 1932, city: "ロサンゼルス"}, + {year: 2020, city: "東京", note: "コロナウイルスで2021年に延期"} ] puts "第1~10回大会のオリンピック一覧" # each文を用いて、オリンピックの情報を出力してください - + olympics.each do |olympic| + puts "-------------------" + puts "#{olympic[:year]}年#{olympic[:city]}大会" # 豆知識がある場合のみ豆知識について出力してください + if olympic[:note] != nil + puts"豆知識:#{olympic[:note]}" + end + + end \ No newline at end of file diff --git a/practice.rb b/practice.rb index 94044a3..11fd114 100644 --- a/practice.rb +++ b/practice.rb @@ -16,6 +16,8 @@ else puts "age is 20" end + + From b703e73720b356a6f7ed330af43305d73e8c0989 Mon Sep 17 00:00:00 2001 From: Nguyen Thu Trang Date: Tue, 29 Sep 2020 02:55:02 +0000 Subject: [PATCH 4/7] add kadai3 --- kadai3.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kadai3.rb b/kadai3.rb index 1a5fd6f..4779edc 100644 --- a/kadai3.rb +++ b/kadai3.rb @@ -3,9 +3,12 @@ class Menu attr_accessor :price # get_total_priceメソッドを定義してください - - - + def get_total_price(count) + if count >= 3 + total_price = count * 30000 - 10000 + else + total_price = count * 30000 + end return "#{self.name} #{total_price}vnd" end @@ -15,4 +18,5 @@ class Menu menu1.name = "Phở" menu1.price = 30000 -# menu1に対してget_total_priceメソッドを呼び出してください \ No newline at end of file +# menu1に対してget_total_priceメソッドを呼び出してください +puts menu1.get_total_price(5) \ No newline at end of file From 17fcc0b592dd169a460559633b5fe2bc1a3e50a6 Mon Sep 17 00:00:00 2001 From: Nguyen Thu Trang Date: Tue, 29 Sep 2020 03:02:04 +0000 Subject: [PATCH 5/7] add kadai3 --- kadai3.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kadai3.rb b/kadai3.rb index 4779edc..5bce8a7 100644 --- a/kadai3.rb +++ b/kadai3.rb @@ -5,9 +5,9 @@ class Menu # get_total_priceメソッドを定義してください def get_total_price(count) if count >= 3 - total_price = count * 30000 - 10000 + total_price = count * self.price - 10000 else - total_price = count * 30000 + total_price = count * self.price end return "#{self.name} #{total_price}vnd" From f4e627218364966bf6f74516fc72fbda0869ae89 Mon Sep 17 00:00:00 2001 From: Nguyen Thu Trang Date: Tue, 29 Sep 2020 03:40:13 +0000 Subject: [PATCH 6/7] add kadai5 --- kadai4.rb | 13 ++++++++----- kadai5.rb | 9 +++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/kadai4.rb b/kadai4.rb index 3812441..5eb40b2 100644 --- a/kadai4.rb +++ b/kadai4.rb @@ -13,11 +13,14 @@ def info end #メニューの変数を定義してください -menu1 = -menu2 = -menu3 = +menu1 = Menu.new(name:"Phở", price:30000) +menu2 = Menu.new(name:"Bún chả", price:40000) +menu3 = Menu.new(name:"Bánh mì", price:20000) # 変数menusを定義して配列を代入してください +menus = [menu1, menu2, menu3] - -# menusに対して繰り返し処理を実行してください \ No newline at end of file +# menusに対して繰り返し処理を実行してください +menus.each do |menu| + puts "#{menu.name} #{menu.price}vnd" +end \ No newline at end of file diff --git a/kadai5.rb b/kadai5.rb index bc6d258..93b7aab 100644 --- a/kadai5.rb +++ b/kadai5.rb @@ -17,6 +17,10 @@ class Drink < Menu # initializeメソッドをオーバーライドする # nameとpriceはsuperとする + def initialize(name:, price:, size:) + super(name:name, price:price) + self.size = size + end def info return "#{self.name} #{self.price}vnd (#{self.size}サイズ)" @@ -28,10 +32,11 @@ def info menu3 = Menu.new(name: "bánh mì", price: 20000) # Drinkの変数を定義してください - +drink1 = Drink.new(name: "Trà", price: 5000, size:"S") +drink2 = Drink.new(name: "Trà", price: 10000, size:"M") # 変数menusを定義して配列を代入してください - +menus = [menu1, menu2, menu3, drink1, drink2] menus.each do |menu| puts "#{menu.info}" From 2863d6742097636e172ce8bb38dc7d205f334591 Mon Sep 17 00:00:00 2001 From: Nguyen Thu Trang Date: Tue, 29 Sep 2020 04:15:15 +0000 Subject: [PATCH 7/7] add kadai5 --- kadai5.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kadai5.rb b/kadai5.rb index 93b7aab..07388a5 100644 --- a/kadai5.rb +++ b/kadai5.rb @@ -40,4 +40,12 @@ def info menus.each do |menu| puts "#{menu.info}" -end \ No newline at end of file +end + +puts "-----------------------------" + +puts "メニューの番号を選択してください" +order = gets.to_i +selected_menu = menus[order] +puts "選択されたメニューは: #{selected_menu.name}" +puts "お合計は: #{selected_menu.price}vndです"