From e1f6893023e1e00e765909b127129a7ab6ece3d6 Mon Sep 17 00:00:00 2001 From: s-buvaka Date: 2022年7月27日 23:03:27 +0300 Subject: [PATCH 1/6] Remove classes --- src/main/java/Calculator.java | 22 ---------------- src/main/java/Formatter.java | 17 ------------- src/main/java/Item.java | 10 -------- src/main/java/Main.java | 47 +++-------------------------------- 4 files changed, 3 insertions(+), 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 2fbc00dd..00000000 --- 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 3f915b75..00000000 --- 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 fad8a4e9..00000000 --- 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 11ba5d36..a9198c43 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,49 +1,8 @@ -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)); + // ваш код начнется здесь + // вы не должны ограничиваться только классом Main и можете создавать свои классы по необходимости + System.out.println("Привет Мир"); } } From c521234c876be18b465b2fd45ef8a71d814fb7a9 Mon Sep 17 00:00:00 2001 From: s-buvaka Date: 2022年7月27日 23:13:52 +0300 Subject: [PATCH 2/6] Change project name --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 716abf25..be110bf6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,4 +12,4 @@ dependencyResolutionManagement { mavenCentral() } } -rootProject.name = "BillCalculator" +rootProject.name = "Java-Module-Project" From 648161c1233f7f88c915f429056dc1f34a02ff69 Mon Sep 17 00:00:00 2001 From: Bulat Date: 2024年6月29日 00:45:59 +0300 Subject: [PATCH 3/6] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=BA=D1=82=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Car.java | 9 +++++++++ src/main/java/Main.java | 34 +++++++++++++++++++++++++++++++--- src/main/java/Race.java | 15 +++++++++++++++ 3 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 src/main/java/Car.java create mode 100644 src/main/java/Race.java diff --git a/src/main/java/Car.java b/src/main/java/Car.java new file mode 100644 index 00000000..755930a8 --- /dev/null +++ b/src/main/java/Car.java @@ -0,0 +1,9 @@ +public class Car { + String name; + int speed; + + public Car(String name, int speed){ + this.name = name; + this.speed = speed; + } +} diff --git a/src/main/java/Main.java b/src/main/java/Main.java index a9198c43..46a73a4c 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,8 +1,36 @@ +import java.util.ArrayList; +import java.util.Scanner; + public class Main { public static void main(String[] args) { - // ваш код начнется здесь - // вы не должны ограничиваться только классом Main и можете создавать свои классы по необходимости - System.out.println("Привет Мир"); + ArrayList cars = new ArrayList(); + Scanner sc = new Scanner(System.in); + Race race = new Race(); + + String carName; + int carSpeed; + + while(cars.size() < 3) { + System.out.println("Введите название машины под номером " + (cars.size() + 1) + ":"); + carName = sc.next(); + System.out.println("Введите скорость машины под номером " + (cars.size() + 1) + ":"); + carSpeed = sc.nextInt(); + if(carSpeed < 0 || carSpeed> 250) { + System.out.println("Введена некорректная скорость. Введите заново:"); + carSpeed = sc.nextInt(); + } + + Car car = new Car(carName, carSpeed); + cars.add(car); + race.selectWinner(car); + } + + System.out.println("Участники гонки:"); + for (Car car : cars) { + System.out.println("Первая машина: " + car.name + "\nСкорость:" + car.speed); + } + + System.out.println("Самая быстрая машина(-ы): " + race.raceWinner); } } diff --git a/src/main/java/Race.java b/src/main/java/Race.java new file mode 100644 index 00000000..b7d7f286 --- /dev/null +++ b/src/main/java/Race.java @@ -0,0 +1,15 @@ +public class Race { + int time = 24; + String raceWinner = ""; + int topSpeed = 0; + + + public void selectWinner(Car car) { + if(car.speed * time == topSpeed) { + raceWinner = raceWinner + " " + car.name; + } else if(car.speed * time> topSpeed) { + topSpeed = car.speed * time; + raceWinner = car.name; + } + } +} From 722ac2002b0312d8ae7cd22de72613e9cd074820 Mon Sep 17 00:00:00 2001 From: Bulat Date: Mon, 1 Jul 2024 15:56:30 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=BA=D1=82=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BA=D0=B8=20=D0=B2=D1=85=D0=BE=D0=B4=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Main.java | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 46a73a4c..3c864167 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -7,23 +7,29 @@ public static void main(String[] args) { ArrayList cars = new ArrayList(); Scanner sc = new Scanner(System.in); Race race = new Race(); - - String carName; int carSpeed; while(cars.size() < 3) { System.out.println("Введите название машины под номером " + (cars.size() + 1) + ":"); - carName = sc.next(); + String carName = sc.next(); System.out.println("Введите скорость машины под номером " + (cars.size() + 1) + ":"); - carSpeed = sc.nextInt(); - if(carSpeed < 0 || carSpeed> 250) { - System.out.println("Введена некорректная скорость. Введите заново:"); - carSpeed = sc.nextInt(); + while (true) { + if (sc.hasNextInt()) { + carSpeed = sc.nextInt(); + if (carSpeed>= 0 && carSpeed <= 250) { + Car car = new Car(carName, carSpeed); + cars.add(car); + race.selectWinner(car); + } else { + System.out.println("Введена некорректная скорость. Введите заново: "); + continue; + } + break; + } else { + System.out.println("Введена некорректная скорость. Введите заново: "); + sc.next(); + } } - - Car car = new Car(carName, carSpeed); - cars.add(car); - race.selectWinner(car); } System.out.println("Участники гонки:"); @@ -33,4 +39,4 @@ public static void main(String[] args) { System.out.println("Самая быстрая машина(-ы): " + race.raceWinner); } -} +} \ No newline at end of file From 9a1b9d74a70a5dceaac20ae911086da0bce4af5f Mon Sep 17 00:00:00 2001 From: Bulat Date: Mon, 1 Jul 2024 19:17:52 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=BA=D1=82=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BA=D0=B8=20=D0=B2=D1=85=D0=BE=D0=B4=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Car.java | 2 +- src/main/java/Main.java | 4 ++-- src/main/java/Race.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/Car.java b/src/main/java/Car.java index 755930a8..1ec479c7 100644 --- a/src/main/java/Car.java +++ b/src/main/java/Car.java @@ -2,7 +2,7 @@ public class Car { String name; int speed; - public Car(String name, int speed){ + public Car(String name, int speed) { this.name = name; this.speed = speed; } diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 3c864167..e5c0d518 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -9,7 +9,7 @@ public static void main(String[] args) { Race race = new Race(); int carSpeed; - while(cars.size() < 3) { + while (cars.size() < 3) { System.out.println("Введите название машины под номером " + (cars.size() + 1) + ":"); String carName = sc.next(); System.out.println("Введите скорость машины под номером " + (cars.size() + 1) + ":"); @@ -39,4 +39,4 @@ public static void main(String[] args) { System.out.println("Самая быстрая машина(-ы): " + race.raceWinner); } -} \ No newline at end of file +} diff --git a/src/main/java/Race.java b/src/main/java/Race.java index b7d7f286..448cc1ef 100644 --- a/src/main/java/Race.java +++ b/src/main/java/Race.java @@ -5,9 +5,9 @@ public class Race { public void selectWinner(Car car) { - if(car.speed * time == topSpeed) { + if (car.speed * time == topSpeed) { raceWinner = raceWinner + " " + car.name; - } else if(car.speed * time> topSpeed) { + } else if (car.speed * time> topSpeed) { topSpeed = car.speed * time; raceWinner = car.name; } From 16d5cb7b563ea359085437c1fa521d9473f42a0f Mon Sep 17 00:00:00 2001 From: Bulat Date: Tue, 2 Jul 2024 17:01:43 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=BA=D1=82=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BA=D0=B8=20=D0=B2=D1=85=D0=BE=D0=B4=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=92=D1=8B=D0=BD?= =?UTF-8?q?=D0=BE=D1=81=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BC?= =?UTF-8?q?=D0=B0=D0=BA=D1=81=20=D0=B8=20=D0=BC=D0=B8=D0=BD=20=D1=81=D0=BA?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D1=81=D1=82=D0=B8=20=D0=B2=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Main.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index e5c0d518..1e8da2c6 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -8,15 +8,18 @@ public static void main(String[] args) { Scanner sc = new Scanner(System.in); Race race = new Race(); int carSpeed; + int minCarSpeed = 0; + int maxCarSpeed = 250; + int countCar = 3; - while (cars.size() < 3) { + while (cars.size() < countCar) { System.out.println("Введите название машины под номером " + (cars.size() + 1) + ":"); String carName = sc.next(); System.out.println("Введите скорость машины под номером " + (cars.size() + 1) + ":"); while (true) { if (sc.hasNextInt()) { carSpeed = sc.nextInt(); - if (carSpeed>= 0 && carSpeed <= 250) { + if (carSpeed>= minCarSpeed && carSpeed <= maxCarSpeed) { Car car = new Car(carName, carSpeed); cars.add(car); race.selectWinner(car);

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