From e1f6893023e1e00e765909b127129a7ab6ece3d6 Mon Sep 17 00:00:00 2001 From: s-buvaka Date: Wed, 27 Jul 2022 23:03:27 +0300 Subject: [PATCH 1/4] 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: Wed, 27 Jul 2022 23:13:52 +0300 Subject: [PATCH 2/4] 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 c852d6427d2bf4c90ffa317fa515a98a371a2491 Mon Sep 17 00:00:00 2001 From: nnovikov Date: Mon, 22 Jul 2024 17:37:12 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9B=D0=B5=D0=9C=D0=B0=D0=BD=2024=20?= =?UTF-8?q?=D1=87=D0=B0=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 3 + .idea/codeStyles/Project.xml | 123 +++++++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/compiler.xml | 6 + .idea/gradle.xml | 17 ++ .idea/migrations.xml | 10 + .idea/misc.xml | 10 + .idea/other.xml | 263 +++++++++++++++++++++++++++ .idea/vcs.xml | 6 + src/main/java/LeMan.java | 64 +++++++ src/main/java/Main.java | 8 - 11 files changed, 507 insertions(+), 8 deletions(-) create mode 100644 .idea/.gitignore 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/migrations.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/other.xml create mode 100644 .idea/vcs.xml create mode 100644 src/main/java/LeMan.java delete mode 100644 src/main/java/Main.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..7643783a --- /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 00000000..79ee123c --- /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 00000000..61a9130c --- /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 00000000..425ecea2 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 00000000..f8051a6f --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..0ad17cbd --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/other.xml b/.idea/other.xml new file mode 100644 index 00000000..0d3a1fbb --- /dev/null +++ b/.idea/other.xml @@ -0,0 +1,263 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/LeMan.java b/src/main/java/LeMan.java new file mode 100644 index 00000000..f35a352f --- /dev/null +++ b/src/main/java/LeMan.java @@ -0,0 +1,64 @@ +import java.util.ArrayList; +import java.util.Scanner; + + + +public class LeMan { + + public static void main(String[] args) { + Racing racing = new Racing(); + racing.start(); + + } +} + +class Racing{ + + ArrayList cars = new ArrayList<>(); + Scanner scanner = new Scanner(System.in); + + public void start(){ + for (int i = 0; i<3; i++){ + System.out.println("Введите название машины №" + (i+1)); + String name = scanner.nextLine(); + + + int speed; + while (true) { + System.out.println("Введите скорость машины № " + (i+1)); + speed = scanner.nextInt(); + if (speed > 0 && speed <= 250) { + break; + } else { + System.out.println("Некорректная скорость. Попробуйте еще раз. Диапозон скорости от 0 до 250 км/ч"); + } + } + scanner.nextLine(); + cars.add(new Car(name, speed)); + } + int fullDistance = 0; + String fastestCar = ""; + + for(Car car : cars){ + int distance = car.speed * 24; + if(distance > fullDistance){ + fullDistance = distance; + fastestCar = car.name; + } + } + System.out.println("Самая быстрая машина: " + fastestCar); + } + +} + + +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 deleted file mode 100644 index a9198c43..00000000 --- a/src/main/java/Main.java +++ /dev/null @@ -1,8 +0,0 @@ -public class Main { - - public static void main(String[] args) { - // ваш код начнется здесь - // вы не должны ограничиваться только классом Main и можете создавать свои классы по необходимости - System.out.println("Привет Мир"); - } -} From 8eaa4b5a4868be44fde24d33a5fda2ee07dce6a2 Mon Sep 17 00:00:00 2001 From: nnovikov Date: Tue, 23 Jul 2024 18:31:41 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=B1=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20=D0=BD=D0=B0=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B7=D0=BD=D1=8B=D0=B5=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B?= =?UTF-8?q?,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=83=D1=81=D1=82=D0=BE=D0=B9=20=D0=B2=D0=B2=D0=BE=D0=B4,=20?= =?UTF-8?q?=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20?= =?UTF-8?q?=D0=B2=D0=B2=D0=BE=D0=B4,=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D0=BE=D0=B4=D0=B8=D0=BD?= =?UTF-8?q?=D0=B0=D0=BA=D0=BE=D0=B2=D1=83=D1=8E=20=D1=81=D0=BA=D0=BE=D1=80?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D1=83=20=D0=B2=D1=81=D0=B5=D1=85=20?= =?UTF-8?q?=D0=BC=D0=B0=D1=88=D0=B8=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Car.java | 10 +++++++ src/main/java/LeMan.java | 50 --------------------------------- src/main/java/Racing.java | 59 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 50 deletions(-) create mode 100644 src/main/java/Car.java create mode 100644 src/main/java/Racing.java diff --git a/src/main/java/Car.java b/src/main/java/Car.java new file mode 100644 index 00000000..281e132a --- /dev/null +++ b/src/main/java/Car.java @@ -0,0 +1,10 @@ +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/LeMan.java b/src/main/java/LeMan.java index f35a352f..a99b3220 100644 --- a/src/main/java/LeMan.java +++ b/src/main/java/LeMan.java @@ -1,7 +1,3 @@ -import java.util.ArrayList; -import java.util.Scanner; - - public class LeMan { @@ -12,53 +8,7 @@ public static void main(String[] args) { } } -class Racing{ - - ArrayList cars = new ArrayList<>(); - Scanner scanner = new Scanner(System.in); - - public void start(){ - for (int i = 0; i<3; i++){ - System.out.println("Введите название машины №" + (i+1)); - String name = scanner.nextLine(); - - - int speed; - while (true) { - System.out.println("Введите скорость машины № " + (i+1)); - speed = scanner.nextInt(); - if (speed > 0 && speed <= 250) { - break; - } else { - System.out.println("Некорректная скорость. Попробуйте еще раз. Диапозон скорости от 0 до 250 км/ч"); - } - } - scanner.nextLine(); - cars.add(new Car(name, speed)); - } - int fullDistance = 0; - String fastestCar = ""; - for(Car car : cars){ - int distance = car.speed * 24; - if(distance > fullDistance){ - fullDistance = distance; - fastestCar = car.name; - } - } - System.out.println("Самая быстрая машина: " + fastestCar); - } - -} -class Car { - String name; - int speed; - - public Car(String name, int speed) { - this.name = name; - this.speed = speed; - } -} diff --git a/src/main/java/Racing.java b/src/main/java/Racing.java new file mode 100644 index 00000000..1d3069d6 --- /dev/null +++ b/src/main/java/Racing.java @@ -0,0 +1,59 @@ +import java.util.ArrayList; +import java.util.InputMismatchException; +import java.util.Scanner; + +public class Racing { + + ArrayList cars = new ArrayList<>(); + Scanner scanner = new Scanner(System.in); + + public void start() { + for (int i = 0; i < 3; i++) { + String name = ""; + while (true) { + System.out.println("Введите название машины №" + (i + 1)); + name = scanner.nextLine(); + if (!name.trim().isEmpty()) { + break; + } else { + System.out.println("Название автомобиля не может быть короче 1 символа"); + } + } + + + int speed; + while (true) { + System.out.println("Введите скорость машины № " + (i + 1)); + try { + speed = scanner.nextInt(); + if (speed > 0 && speed <= 250) { + break; + } else { + System.out.println("Некорректная скорость. Попробуйте еще раз. Диапозон скорости от 0 до 250 км/ч"); + } + } catch (InputMismatchException e) { + System.out.println("Некорректная скорость. Попробуйте еще раз. Введите число"); + scanner.nextLine(); + } + } + scanner.nextLine(); + cars.add(new Car(name, speed)); + } + if (cars.get(0).speed == cars.get(1).speed && cars.get(1).speed == cars.get(2).speed) { + System.out.println("Никто не выйграл, все машины оказались равны"); + } else { + int fullDistance = 0; + String fastestCar = ""; + + for (Car car : cars) { + int distance = car.speed * 24; + if (distance > fullDistance) { + fullDistance = distance; + fastestCar = car.name; + } + } + System.out.println("Самая быстрая машина: " + fastestCar); + } + + } +} \ No newline at end of file