- * Слова следующие: - *
- * 99 bottles of beer on the wall, 99 bottles of beer - * Take one down, pass it around, 98 bottles of beer - * 98 bottles of beer on the wall, 98 bottles of beer - * Take one down, pass it around, 97 bottles of beer - * 97 bottles of beer on the wall, 97 bottles of beer - * Take one down, pass it around, 96 bottles of beer - * 96 bottles of beer on the wall, 96 bottles of beer - * Take one down, pass it around, 95 bottles of beer - * 95 bottles of beer on the wall, 95 bottles of beer - * ... - *
- * 3 bottles of beer on the wall, 3 bottles of beer - * Take one down, pass it around, 2 bottles of beer - * 2 bottles of beer on the wall, 2 bottles of beer - * Take one down, pass it around, 1 bottles of beer - * 1 bottle of beer on the wall, 1 bottle of beer - * Take one down, pass it around, no more bottles of beer on the wall - * No more bottles of beer on the wall, no more bottles of beer - * Go to the store and buy some more, 99 bottles of beer on the wall - *
- * Дело усложняется тем, что текст песни переменный:
- * За раз может быть взято несколько бутылок.
- * Значение передается в качестве параметра конструктора
- * Нужно ограничить возможность взятия бутылок натуральным число не более 99 бутылок за раз.
- */
- private final int drunk;
-
- private final String[] numbersUpTo19 = {
- "",
- "one",
- "two",
- "three",
- "four",
- "five",
- "six",
- "seven",
- "eight",
- "nine",
- "ten",
- "eleven",
- "twelve",
- "thirteen",
- "fourteen",
- "fifteen",
- "sixteen",
- "seventeen",
- "eighteen",
- "nineteen"
- };
-
- private final String[] tensNumbers = {
- "",
- "ten",
- "twenty",
- "thirty",
- "forty",
- "fifty",
- "sixty",
- "seventy",
- "eighty",
- "ninety"
- };
-
- private String transform(int number) {
- if (number < 20) {
- return numbersUpTo19[number];
+ private int bottle = 99;
+ private int bottleTakenAtOnce;
+ private String bottleTaken;
+ public BottleSong(int bottleTakenAtOnce) {
+ //TODO
+ if ( bottleTakenAtOnce <= 0 || bottleTakenAtOnce > 99) {
+ throw new IllegalArgumentException();
}
- else if (number % 10 == 0) {
- return tensNumbers[number / 10];
+ this.bottleTakenAtOnce = bottleTakenAtOnce;
+ bottleTaken = numToString(bottleTakenAtOnce);
+ }
+ public String getBottleSongLyrics(){
+ StringBuilder sb = new StringBuilder();
+ while (bottle >= bottleTakenAtOnce) {
+ sb.append(bottle + " bottles of beer on the wall, " + bottle + " bottles of beer.\n");
+ sb.append("Take " + bottleTaken + " down and pass around, ");
+ bottle -= bottleTakenAtOnce;
+ if (bottle == 1) {
+ sb.append(bottle + " bottle of beer on the wall.\n");
+ sb.append(bottle + " bottle of beer on the wall, " + bottle + " bottle of beer.\n");
+ sb.append("Take " + numToString(bottle) + " down and pass around, no more bottles of beer on the wall.\n");
+ bottle = 0;
+ } else if(bottle == 0) {
+ sb.append("no more bottles of beer on the wall.\n");
+ } else {
+ sb.append(bottle + " bottles of beer on the wall.\n");
+ }
}
- else {
- return tensNumbers[number / 10] + " " + numbersUpTo19[number % 10];
+ if (bottle < bottleTakenAtOnce && bottle > 0) {
+ sb.append(bottle + " bottles of beer on the wall, " + bottle + " bottles of beer.\n");
+ sb.append("Take " + numToString(bottle) + " down and pass around, no more bottles of beer on the wall.\n");
+ bottle = 0;
}
+ sb.append("No more bottles of beer on the wall, no more bottles of beer.\n");
+ sb.append("Go to the store and buy some more, 99 bottles of beer on the wall.\n");
+ return sb.toString();
}
-
- private String checkIfOne(int number){
- return number == 1 ? " bottle": " bottles";
- }
-
- public BottleSong(int bottleTakenAtOnce) {
- //TODO
- drunk = bottleTakenAtOnce;
- }
-
- public String getBottleSongLyrics() {
- //TODO
- throw new UnsupportedOperationException();
- if (drunk > 99 || drunk <= 0) {
- throw new IllegalArgumentException();
+ private String numToString(int num) {
+ String[] array = new String[100];
+ array[0] = "";
+ array[1] = "one";
+ array[2] = "two";
+ array[3] = "three";
+ array[4] = "four";
+ array[5] = "five";
+ array[6] = "six";
+ array[7] = "seven";
+ array[8] = "eight";
+ array[9] = "nine";
+ array[10] = "ten";
+ array[11] = "eleven";
+ array[12] = "twelve";
+ array[13] = "thirteen";
+ array[14] = "fourteen";
+ array[15] = "fifteen";
+ array[16] = "sixteen";
+ array[17] = "seventeen";
+ array[18] = "eighteen";
+ array[19] = "nineteen";
+ array[20] = "twenty";
+ array[30] = "thirty";
+ array[40] = "forty";
+ array[50] = "fifty";
+ array[60] = "sixty";
+ array[70] = "seventy";
+ array[80] = "eighty";
+ array[90] = "ninety";
+ StringBuilder sb = new StringBuilder();
+ if (num / 10 > 1 && num % 10 != 0) {
+ sb.append(array[(num / 10) * 10]).append(" ").append(array[num % 10]);
}
-
- int counter;
- StringBuilder res = new StringBuilder();
- for (counter = 99; counter > drunk; counter -= drunk) {
- res.append(counter + " bottles of beer on the wall, " + counter + " bottles of beer.\n");
- res.append("Take " + transform(drunk) + " down and pass around, " + (counter - drunk) + checkIfOne(counter - drunk) + " of beer on the wall.\n");
+ if (num / 10 > 1 && num % 10 == 0) {
+ sb.append(array[(num / 10) * 10]);
}
-
- res.append(counter + checkIfOne(counter) + " of beer on the wall, " + counter + checkIfOne(counter) + " of beer.\n");
- res.append("Take " + transform(counter) + " down and pass around, no more bottles of beer on the wall.\n");
- res.append("No more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n");
-
- return res.toString();
+ if (num / 10 == 1) {
+ sb.append(array[num]);
+ }
+ if (num / 10 == 0) {
+ sb.append(array[num]);
+ }
+ return sb.toString();
}
-
-}
+}
From cfa0a98cc7699fc5bfbfc9e599d391df79301489 Mon Sep 17 00:00:00 2001
From: asvarish <42956531+asvarish@users.noreply.github.com>
Date: Fri, 31 May 2019 21:10:35 +0300
Subject: [PATCH 4/4] Update BottleSong.java
---
.../ru/ifmo/cet/javabasics/BottleSong.java | 148 ++++++++----------
1 file changed, 69 insertions(+), 79 deletions(-)
diff --git a/src/main/java/ru/ifmo/cet/javabasics/BottleSong.java b/src/main/java/ru/ifmo/cet/javabasics/BottleSong.java
index 5a66efd..eb368fb 100644
--- a/src/main/java/ru/ifmo/cet/javabasics/BottleSong.java
+++ b/src/main/java/ru/ifmo/cet/javabasics/BottleSong.java
@@ -1,85 +1,75 @@
-public class BottleSong {
+package ru.ifmo.cet.javabasics;
+
+import java.util.HashMap;
+import java.util.Map;
- private int bottle = 99;
- private int bottleTakenAtOnce;
- private String bottleTaken;
+public class BottleSong {
+ private int bottlesTakenAtOnce;
public BottleSong(int bottleTakenAtOnce) {
- //TODO
- if ( bottleTakenAtOnce <= 0 || bottleTakenAtOnce > 99) {
- throw new IllegalArgumentException();
- }
- this.bottleTakenAtOnce = bottleTakenAtOnce;
- bottleTaken = numToString(bottleTakenAtOnce);
+ this.bottlesTakenAtOnce = bottleTakenAtOnce;
}
- public String getBottleSongLyrics(){
- StringBuilder sb = new StringBuilder();
- while (bottle >= bottleTakenAtOnce) {
- sb.append(bottle + " bottles of beer on the wall, " + bottle + " bottles of beer.\n");
- sb.append("Take " + bottleTaken + " down and pass around, ");
- bottle -= bottleTakenAtOnce;
- if (bottle == 1) {
- sb.append(bottle + " bottle of beer on the wall.\n");
- sb.append(bottle + " bottle of beer on the wall, " + bottle + " bottle of beer.\n");
- sb.append("Take " + numToString(bottle) + " down and pass around, no more bottles of beer on the wall.\n");
- bottle = 0;
- } else if(bottle == 0) {
- sb.append("no more bottles of beer on the wall.\n");
- } else {
- sb.append(bottle + " bottles of beer on the wall.\n");
+
+ public String getBottleSongLyrics() {
+ int bottles = 99;
+ String SUNum = "";
+ String BottleSongLyrics = "";
+ String BottlesBottle = "bottles";
+
+ Map