From cd96cf782a631348b51bf9f2b36ff4e86935166c Mon Sep 17 00:00:00 2001 From: KatNya Date: Mon, 2 Oct 2023 08:54:58 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- src/main/java/Calculator.java | 30 ++++++++++++++++++++++ src/main/java/Main.java | 48 +++++++++++++++++++++++++++++++++-- src/main/java/People.java | 23 +++++++++++++++++ 4 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 src/main/java/Calculator.java create mode 100644 src/main/java/People.java diff --git a/README.md b/README.md index 63be1bfe0..50f7d1b5f 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# Пустой репозиторий для работы с Java кодом в Android Studio +# Проектная работа №1 Нянькина diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java new file mode 100644 index 000000000..df0ad036f --- /dev/null +++ b/src/main/java/Calculator.java @@ -0,0 +1,30 @@ +public class Calculator { + + public static String cutResult(double allMoneyCalculator, int guestCalculator) { + + double guestMoney = allMoneyCalculator / guestCalculator; + + String resultCalculator = String.format("%.2f", guestMoney); + + return resultCalculator; + } + + + public static String rubles(double allMoneyCalculator, int guestCalculator) { + double guestPrice = allMoneyCalculator / guestCalculator; + double result2 = Math.floor(guestPrice); + String rubCalculator; + if (result2 == 1) { + rubCalculator = "рубль."; + } else if (result2 == 2) { + rubCalculator = "рубля."; + } else if (result2 == 3) { + rubCalculator = "рубля."; + } else if (result2 == 4) { + rubCalculator = "рубля."; + } else { + rubCalculator = "рублей."; + } + return rubCalculator; + } +} diff --git a/src/main/java/Main.java b/src/main/java/Main.java index db9356a08..abd78ec33 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,6 +1,50 @@ +import java.util.Scanner; + public class Main { public static void main(String[] args) { - System.out.println("Hello world!"); + Scanner scanner = new Scanner(System.in); + + int guest = People.peopleCount(); + + String food; + String allFood = ""; + double money; + double allMoney = 0.00; + + while (true) { + + System.out.println("Введите блюдо или Завершить для подсчета итога"); + food = scanner.next(); + if(food.equalsIgnoreCase("ЗАВЕРШИТЬ")){ + break; + } + allFood = allFood + "\n " + food; + System.out.println("Введите стоимость блюда"); + money = scanner.nextDouble(); + if (money > 0) { + allMoney = allMoney + money; + } + else { + System.out.println("Отрицательной цены за блюдо быть не может"); + } + } + + System.out.println("Добавленные товары:" + allFood); + + + + String result = Calculator.cutResult(allMoney, guest); + + String rub = Calculator.rubles(allMoney, guest); + + + + System.out.println("Каждый гость должен заплатить " + result + " " + rub); + } + + + } -} \ No newline at end of file + + diff --git a/src/main/java/People.java b/src/main/java/People.java new file mode 100644 index 000000000..f9838e379 --- /dev/null +++ b/src/main/java/People.java @@ -0,0 +1,23 @@ +import java.util.Scanner; + +public class People { + public static int peopleCount(){ + Scanner scannerPeople = new Scanner(System.in); + System.out.println("Сколько человек участвовало в банкете? Введите количество гостей."); + + int guestPeople = 0; + while (guestPeople <= 1) { // Цикл выполняется, пока guest меньше или равно 1 + + guestPeople = scannerPeople.nextInt(); // Считываем из консоли число и присваиваем переменной guest + if (guestPeople <= 1) { + System.out.println("Некорректное количество гостей: " + guestPeople); + System.out.println("Введите количество гостей более одного"); + + + } + } + return guestPeople; + } + + +} From 9a956080212a4e0003fe362d91b700a15d68d054 Mon Sep 17 00:00:00 2001 From: KatNya Date: Mon, 2 Oct 2023 19:18:51 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 16 ++++++++-------- src/main/java/Main.java | 28 ++++++++++++++++------------ src/main/java/People.java | 24 +++++++++++++++++------- 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index df0ad036f..7fe81d8f1 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -13,16 +13,16 @@ public static String cutResult(double allMoneyCalculator, int guestCalculator) { public static String rubles(double allMoneyCalculator, int guestCalculator) { double guestPrice = allMoneyCalculator / guestCalculator; double result2 = Math.floor(guestPrice); + double result3 = result2 % 10; String rubCalculator; - if (result2 == 1) { - rubCalculator = "рубль."; - } else if (result2 == 2) { - rubCalculator = "рубля."; - } else if (result2 == 3) { - rubCalculator = "рубля."; - } else if (result2 == 4) { + if (result2 >= 10 && result2 <= 20) { + rubCalculator = "рублей."; + } else if (result3 >= 2 && result3 <= 4) { rubCalculator = "рубля."; - } else { + } else if (result3 >= 5 && result3 <= 9) { + rubCalculator = "рублей."; + } + else { rubCalculator = "рублей."; } return rubCalculator; diff --git a/src/main/java/Main.java b/src/main/java/Main.java index abd78ec33..bdf741991 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -16,35 +16,39 @@ public static void main(String[] args) { System.out.println("Введите блюдо или Завершить для подсчета итога"); food = scanner.next(); - if(food.equalsIgnoreCase("ЗАВЕРШИТЬ")){ + if (food.equalsIgnoreCase("ЗАВЕРШИТЬ")) { break; } allFood = allFood + "\n " + food; + + System.out.println("Введите стоимость блюда"); - money = scanner.nextDouble(); - if (money > 0) { - allMoney = allMoney + money; - } - else { - System.out.println("Отрицательной цены за блюдо быть не может"); + + if (scanner.hasNextDouble()) { + money = scanner.nextDouble(); + if (money < 0) { + System.out.println("Отрицательной цены за блюдо быть не может, введите положительное значение!"); + } else { + allMoney = allMoney + money; + } + } else { + System.out.println("Вы ввели не число!"); + break; } } System.out.println("Добавленные товары:" + allFood); - String result = Calculator.cutResult(allMoney, guest); String rub = Calculator.rubles(allMoney, guest); - System.out.println("Каждый гость должен заплатить " + result + " " + rub); - } - + } - } +} diff --git a/src/main/java/People.java b/src/main/java/People.java index f9838e379..3cdb6817c 100644 --- a/src/main/java/People.java +++ b/src/main/java/People.java @@ -1,21 +1,31 @@ import java.util.Scanner; public class People { - public static int peopleCount(){ + public static int peopleCount() { Scanner scannerPeople = new Scanner(System.in); System.out.println("Сколько человек участвовало в банкете? Введите количество гостей."); int guestPeople = 0; - while (guestPeople <= 1) { // Цикл выполняется, пока guest меньше или равно 1 + if (scannerPeople.hasNextInt()) { - guestPeople = scannerPeople.nextInt(); // Считываем из консоли число и присваиваем переменной guest - if (guestPeople <= 1) { - System.out.println("Некорректное количество гостей: " + guestPeople); - System.out.println("Введите количество гостей более одного"); + while (guestPeople <= 1) { // Цикл выполняется, пока guest меньше или равно 1 + + + guestPeople = scannerPeople.nextInt(); // Считываем из консоли число и присваиваем переменной guest + + if (guestPeople <= 1) { + System.out.println("Некорректное количество гостей: " + guestPeople); + System.out.println("Введите количество гостей более одного"); + + + } - } + + } else { + System.out.println("Вы ввели не число!"); } + return guestPeople; } From 8ef433dfcbc00c5224b3e51d651c9c5595c0add6 Mon Sep 17 00:00:00 2001 From: KatNya Date: Tue, 3 Oct 2023 08:30:33 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 6 ++++++ src/main/java/People.java | 1 + 2 files changed, 7 insertions(+) diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index 7fe81d8f1..1cb6fa017 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -14,13 +14,19 @@ public static String rubles(double allMoneyCalculator, int guestCalculator) { double guestPrice = allMoneyCalculator / guestCalculator; double result2 = Math.floor(guestPrice); double result3 = result2 % 10; + double result4 = result2 % 100; String rubCalculator; + if (result2 >= 10 && result2 <= 20) { rubCalculator = "рублей."; + } else if (result4 >= 10 && result4 <= 20) { + rubCalculator = "рублей."; } else if (result3 >= 2 && result3 <= 4) { rubCalculator = "рубля."; } else if (result3 >= 5 && result3 <= 9) { rubCalculator = "рублей."; + } else if (result3 == 1) { + rubCalculator = "рубль."; } else { rubCalculator = "рублей."; diff --git a/src/main/java/People.java b/src/main/java/People.java index 3cdb6817c..023cb6491 100644 --- a/src/main/java/People.java +++ b/src/main/java/People.java @@ -24,6 +24,7 @@ public static int peopleCount() { } else { System.out.println("Вы ввели не число!"); + peopleCount(); } return guestPeople; From 088bd9937d31e25ad0a4edb6925344aeb31cc7a5 Mon Sep 17 00:00:00 2001 From: KatNya Date: Tue, 3 Oct 2023 18:31:52 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Main.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index bdf741991..4d8c94964 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -12,6 +12,7 @@ public static void main(String[] args) { double money; double allMoney = 0.00; + while (true) { System.out.println("Введите блюдо или Завершить для подсчета итога"); @@ -33,7 +34,7 @@ public static void main(String[] args) { } } else { System.out.println("Вы ввели не число!"); - break; + return; } }