From 83a7216ba0ecbdf537d7137c2708aa3c274811eb Mon Sep 17 00:00:00 2001 From: s-buvaka Date: 2022年7月27日 22:57:22 +0300 Subject: [PATCH 1/8] Init commit --- src/main/java/Calculator.java | 22 ----------------- src/main/java/Formatter.java | 17 ------------- src/main/java/Item.java | 10 -------- src/main/java/Main.java | 45 +---------------------------------- 4 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 src/main/java/Calculator.java delete mode 100644 src/main/java/Formatter.java delete mode 100644 src/main/java/Item.java diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java deleted file mode 100644 index 2fbc00d..0000000 --- a/src/main/java/Calculator.java +++ /dev/null @@ -1,22 +0,0 @@ -class Calculator { - - int friendsCount; - - String cart = "Добавленные товары:"; - double totalPrice = 0; - - Calculator(int friendsCount) { - this.friendsCount = friendsCount; - } - - void addItem(Item item) { - totalPrice += item.price; - cart = cart + "\n" + item.name; - - System.out.println(item.name + " в корзине"); - } - - double divideSum() { - return totalPrice / friendsCount; - } -} diff --git a/src/main/java/Formatter.java b/src/main/java/Formatter.java deleted file mode 100644 index 3f915b7..0000000 --- a/src/main/java/Formatter.java +++ /dev/null @@ -1,17 +0,0 @@ -public class Formatter { - - String formatValue(double price) { - double roundedValue = Math.floor(price); - if (roundedValue == 1) { - return "рубль"; - } else if (roundedValue>= 2 && roundedValue <= 4) { - return "рубля"; - } else { - return "рублей"; - } - } - - String roundResult(final double result) { - return String.format("%.2f", result); - } -} diff --git a/src/main/java/Item.java b/src/main/java/Item.java deleted file mode 100644 index fad8a4e..0000000 --- a/src/main/java/Item.java +++ /dev/null @@ -1,10 +0,0 @@ -class Item { - - String name; - double price; - - Item(String name, double price) { - this.name = name; - this.price = price; - } -} diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 11ba5d3..964dbb0 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,49 +1,6 @@ -import java.util.Scanner; - public class Main { public static void main(String[] args) { - Scanner scanner = new Scanner(System.in); - - int friendCount; - while (true) { - System.out.println("На сколько человек необходимо разделить счет?"); - friendCount = scanner.nextInt(); - - if (friendCount> 1) { - break; - } else if (friendCount == 1) { - System.out.println( - "Нет смысла делить сумму на одного человека. Давайте попробуем ввести другое значение, которое будет больше единицы."); - } else { - System.out.println("Неверное количество друзей. Значение должно быть болье единицы, давайте попробуем еще раз."); - } - } - - Calculator calculator = new Calculator(friendCount); - - while (true) { - System.out.println("Введите название товара"); - String name = scanner.next(); - - System.out.println("Введите стоимость товара в формате: 'рубли.копейки' [10.45, 11.40]"); - double price = scanner.nextDouble(); - - calculator.addItem(new Item(name, price)); - - System.out.println( - "Хотите добавить еще один товар? Введите любой символ для продолжения, либо 'Завершить' если больше нет товаров для добавления"); - String answer = scanner.next(); - - if (answer.equalsIgnoreCase("Завершить")) { - break; - } - } - - double result = calculator.divideSum(); - Formatter formatter = new Formatter(); - - System.out.println(calculator.cart); - System.out.println("Каждому человеку к оплате: " + formatter.roundResult(result) + " " + formatter.formatValue(result)); + // ваш код начнется здесь } } From 2616510149442d4a262b444f8c5d8af6b1a47ea7 Mon Sep 17 00:00:00 2001 From: s-buvaka Date: 2022年7月27日 23:13:52 +0300 Subject: [PATCH 2/8] Change project name --- settings.gradle | 2 +- src/main/java/Main.java | 49 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 716abf2..be110bf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,4 +12,4 @@ dependencyResolutionManagement { mavenCentral() } } -rootProject.name = "BillCalculator" +rootProject.name = "Java-Module-Project" diff --git a/src/main/java/Main.java b/src/main/java/Main.java index a9198c4..57706e4 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,8 +1,57 @@ +import java.util.Scanner; + public class Main { public static void main(String[] args) { // ваш код начнется здесь // вы не должны ограничиваться только классом Main и можете создавать свои классы по необходимости System.out.println("Привет Мир"); + + //считываем кол-во гостей + System.out.println ("Введите колличество гостей"); + int visitor = -1; + while (visitor != 0 ) { + visitor = Scanner.nextInt(); + if (visitor <=1) + System.out.println("Некорректное кол-во гостей"); + else + if (visitor> 1) { + break; + } + } + //считываем кол-во товаров + boolean enough = true; + int i = 0 ; + String name = ""; + String receipt = ""; + double price = 0; + + while (enough) { + System.out.println("Введите название "); + name = Scanner.next(); + receipt = String.format("%s/n%s", receipt, name); + System.out.println("Введите цену"); + price = price + Scanner.nextInt(); + System.out.println(price); + System.out.println(receipt); + System.out.println("Хотите ввести ещё товар?"); + System.out.println("Eсли вы хотите ввести ещё товар, введите ДА"); + System.out.println("Eсли вы хотите ввести ещё товар, введите Завершить "); + String answer = Scanner.next(); + + if (String.equalsIgnoreCase(answer, "завершить")){ + enough = false; + break; + + } + } + + if (enough = false){ + System.out.println("Добавленные товары:"); + System.out.println(receipt); + double pay = receipt/visitor; + System.out.println(pay); + } + } } From 544d467ad7d5cbbbf93ca2d63ecd1190584d99e9 Mon Sep 17 00:00:00 2001 From: Appolitta Date: Tue, 4 Oct 2022 02:04:44 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D0=B8=D0=BD=D1=82=202=20?= =?UTF-8?q?.=20=20=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD=D0=B0=D1=8F?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=201.=20=D0=A4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB.=20=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 3 + .idea/.name | 1 + .idea/codeStyles/Project.xml | 123 +++++++++++++++++++++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 ++ .idea/compiler.xml | 6 ++ .idea/gradle.xml | 18 ++++ .idea/misc.xml | 9 ++ .idea/vcs.xml | 6 ++ 8 files changed, 171 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..962e712 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Java-Module-Project \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..6cec569 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..5d10be7 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + +
    + + \ No newline at end of file From 27c3c49d7f666efbc2f22b162adefafadf6b69d7 Mon Sep 17 00:00:00 2001 From: Appolitta Date: Tue, 4 Oct 2022 02:46:33 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D0=B8=D0=BD=D1=82=202=20?= =?UTF-8?q?.=20=20=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD=D0=B0=D1=8F?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=201.=20=D0=A4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB.=20=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Main.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index ca88988..d7bbf49 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -22,7 +22,6 @@ public static void main(String[] args) { if (visitor> 1) { break; } - } //считываем кол-во товаров boolean enough = true; From df34b55684595740da8adfe38f3c4aacf713659b Mon Sep 17 00:00:00 2001 From: Appolitta Date: Tue, 4 Oct 2022 02:59:36 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D0=B8=D0=BD=D1=82=202=20?= =?UTF-8?q?.=20=20=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD=D0=B0=D1=8F?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=201.=20=D0=A4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB.=20=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Main.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index d7bbf49..9a1073e 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -70,7 +70,6 @@ public static void main(String[] args) { System.out.println(String.format(message, pay, rubString)); } - } public static class Calculate{ String receipt = ""; From fab258ed9eb3fcc154f90f10aacf47b12cf50875 Mon Sep 17 00:00:00 2001 From: Appolitta Date: Tue, 4 Oct 2022 03:14:16 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D0=B8=D0=BD=D1=82=202=20?= =?UTF-8?q?.=20=20=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD=D0=B0=D1=8F?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=201.=20=D0=A4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB.=20=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Main.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index d63db98..97d9f98 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,4 +1,3 @@ -<<<<<<< HEAD import java.util.Scanner; public class Main { From 52ba7b8bc0e12f257d3eba1ef484c8c8345cc3a3 Mon Sep 17 00:00:00 2001 From: Appolitta Date: Wed, 5 Oct 2022 22:53:35 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D0=B8=D0=BD=D1=82=202=20?= =?UTF-8?q?.=20=20=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD=D0=B0=D1=8F?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=201.=20=D0=A4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB.=20=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Main.java | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 97d9f98..d423390 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -9,19 +9,21 @@ public static void main(String[] args) { System.out.println("Привет Мир"); Scanner scanner = new Scanner(System.in); //считываем кол-во гостей - int visitor = -1; - + int visitor = 0; System.out.println ("Введите колличество гостей"); - while (visitor != 0 ) { - visitor = scanner.nextInt(); - if (visitor <=1) { - System.out.println("Некорректное кол-во гостей"); + while (true) { + String str = scanner.next(); + while (!isNumeric(str)) { System.out.println("Введите колличество гостей"); + str = scanner.next(); + } + visitor = Integer.parseInt(str); + if ((visitor <= 1) | (visitor == 0)) { + System.out.println("Некорректное кол-во гостей"); + System.out.println("Введите колличество гостей"); + } else if (visitor> 1) { + break; } - else - if (visitor> 1) { - break; - } } //считываем кол-во товаров boolean enough = true; @@ -57,8 +59,8 @@ public static void main(String[] args) { float pay = (float) (menu_list.pay/visitor); String rubString = ""; int rub = (int) (pay % 10); - - if ((rub == 0 ) || (rub == 5) || (rub == 6) || (rub == 7 ) || (rub == 8 ) || (rub == 9)){ + int rubTeen = (int) (pay % 100); + if ((rub == 0 ) || (rub == 5) || (rub == 6) || (rub == 7 ) || (rub == 8 ) || (rub == 9 ) || ((rubTeen>= 11) && (rubTeen <= 14))){ rubString = "рублей"; } else if ((rub == 2) || (rub == 4) || (rub == 3) ){ rubString = "рубля"; From d75519aca53b990f178453b725b5862d85f418ee Mon Sep 17 00:00:00 2001 From: Appolitta Date: Wed, 5 Oct 2022 22:54:12 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D0=B8=D0=BD=D1=82=202=20?= =?UTF-8?q?.=20=20=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD=D0=B0=D1=8F?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=201.=20=D0=A4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB.=20=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Main.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index d423390..6621799 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -69,7 +69,6 @@ public static void main(String[] args) { } String message = "Каждый должен заплатить %.2f %s"; - System.out.println(String.format(message, pay, rubString)); } }

    AltStyle によって変換されたページ (->オリジナル) /