forked from Yandex-Practicum/Java-Module-Project-YP
-
Notifications
You must be signed in to change notification settings - Fork 0
1 попытка сдачи проекта #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
7a12b9d
Первый трай
b08e191
Первый трай
ab72d4c
Решил вынести взаимодействие пользователя в отдельный класс. В main в...
25ab98f
Почистил код в меру возможностей
c69c5ad
Update README.md
MiDoRe1 c64d5e2
Update README.md
MiDoRe1 6fb65e6
Сделал валидацию согласно условием сдачи проекта
bff37af
Update README.md
MiDoRe1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
11 changes: 10 additions & 1 deletion
README.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,10 @@ | ||
| # Пустой репозиторий для работы с Java кодом в Android Studio | ||
| # Проектная работа No1 «24 часа Ле-Мана» | ||
| Простое консольное приложение, которое будет вычислять, кто же станет победителем гонки. | ||
| Правила гонки такие: у всех машин есть 24 часа, и кто проедет за них большую дистанцию — тот и победил. | ||
|
|
||
| Критерии успешного выполнения: | ||
| 1. Приложение запрашивает у пользователя все данные: просит ввести названия автомобилей и их скорости. | ||
| 2. Приложение умеет корректно обрабатывать невалидный ввод данных. В случае невалидного ввода (нечисловое значение скорости, дробное значение скорости, скорость вне допустимого диапазона от 0 до 250, пустое название автомобиля и скорость) приложение выводит сообщение об ошибке и запрашивает повторный ввод данных до тех пор, пока не будут введены корректные значения. | ||
| 3. Весь код не написан в одном классе Main. | ||
| 4. Приложение успешно компилируется и выполняется без ошибок. | ||
| 5. Приложение корректно вычисляет и выводит победителя гонки |
15 changes: 15 additions & 0 deletions
src/main/java/Car.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| public class Car { | ||
| String name; | ||
| int speed; | ||
| int serialNumber; | ||
|
Comment on lines
+2
to
+4
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Поля лучше пометить |
||
|
|
||
| Car(String name, int speed, int serialNumber) { | ||
| this.name = name; | ||
| this.speed = speed; | ||
| this.serialNumber = serialNumber; | ||
| } | ||
|
|
||
| public boolean isFaster(Car anotherCar) { | ||
| return this.speed > anotherCar.speed; | ||
| } | ||
| } | ||
64 changes: 64 additions & 0 deletions
src/main/java/InteracterWithUserViaConsole.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import java.util.ArrayList; | ||
| import java.util.Scanner; | ||
|
|
||
| public class InteracterWithUserViaConsole { | ||
| public ArrayList<Car> getCarsForRace( int totalOfCars, int minSpeed, int maxSpeed) { | ||
| ArrayList<Car> carsForRace = new ArrayList<>(totalOfCars); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. От хранения массива машин и лишнего цикла при определении победителя можно избавиться, если при вводе данных сразу вычислять победителя и хранить его в отдельной переменной, тогда программа будет требовать меньше памяти и работать быстрее |
||
| System.out.println(String.format("В гонке участвуют %d машины.", totalOfCars)); | ||
| for (int currentSerialNumber=1; currentSerialNumber<=totalOfCars; currentSerialNumber++) { | ||
| carsForRace.add(getTrueCarInformation(currentSerialNumber, minSpeed, maxSpeed)); | ||
| } | ||
| return carsForRace; | ||
| } | ||
|
|
||
| private Car getTrueCarInformation(int serialNumber, int minSpeed, int maxSpeed) { | ||
| Scanner scanner = new Scanner(System.in); | ||
|
|
||
| System.out.println(String.format("Введите название машины No%d:", serialNumber)); | ||
| String nameOfCar = scanner.nextLine(); | ||
| while ( !isValidNameInformation(nameOfCar) ) { | ||
| System.out.println("Невалидный ввод."); | ||
| System.out.println(String.format("Введите название машины No%d:", serialNumber)); | ||
| nameOfCar = scanner.nextLine(); | ||
| } | ||
|
Comment on lines
+19
to
+23
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Код для считывания непустой строки с ввода лучше вынести в отдельную функцию - код, разделённый на небольшие функции, легче читать, поддерживать и переиспользовать |
||
|
|
||
| System.out.println(String.format("Введите скорость машины (%d, %d]:", | ||
| minSpeed, maxSpeed)); | ||
| String speedOfCarInStringFormat = scanner.nextLine(); | ||
| while ( !isValidSpeedInformation(speedOfCarInStringFormat, minSpeed, maxSpeed) ) { | ||
| System.out.println("Невалидный ввод."); | ||
| System.out.println(String.format("Введите скорость машины (%d, %d]:", | ||
| minSpeed, maxSpeed)); | ||
| speedOfCarInStringFormat = scanner.nextLine(); | ||
| } | ||
|
|
||
| int speedOfCar = Integer.parseInt(speedOfCarInStringFormat); | ||
|
|
||
| Car anotherCar = new Car(nameOfCar, speedOfCar, serialNumber); | ||
| System.out.println(String.format("Машина No%d '%s' со скоростью %d добавлена.", | ||
| anotherCar.serialNumber, anotherCar.name, anotherCar.speed)); | ||
| return anotherCar; | ||
| } | ||
|
|
||
| private boolean isValidNameInformation(String name){ | ||
|
|
||
| return !name.isEmpty(); | ||
| } | ||
|
|
||
| private boolean isValidSpeedInformation(String speedInStringFormat, int minSpeed, int maxSpeed) { | ||
| Scanner scannerForInt = new Scanner(speedInStringFormat); | ||
| boolean speedIsValid = false; | ||
| if ( scannerForInt.hasNextInt() ) { | ||
| int speed = scannerForInt.nextInt(); | ||
| speedIsValid = speed>minSpeed && speed<=maxSpeed; | ||
| } | ||
| return speedIsValid; | ||
| } | ||
|
|
||
| public void printInformationAboutWinCar(Car winCar){ | ||
| System.out.println(String.format("К финишу первой пришла машина No%d '%s'.", | ||
| winCar.serialNumber, winCar.name)); | ||
| } | ||
|
|
||
|
|
||
| } | ||
18 changes: 16 additions & 2 deletions
src/main/java/Main.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,20 @@ | ||
| import java.util.ArrayList; | ||
|
|
||
| public class Main { | ||
|
|
||
| public static int totalOFCars = 3; | ||
| public static int hoursInRace = 24; | ||
| public static int minSpeedOfVehicle = 0; | ||
| public static int maxSpeedOfVehicle = 250; | ||
|
Comment on lines
+5
to
+8
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Молодец, что вынес эти значения в параметры, но лучше их сделать настоящими константами, для этого нужно добавить модификатор |
||
|
|
||
| public static void main(String[] args) { | ||
| System.out.println("Hello world!"); | ||
| InteracterWithUserViaConsole interacter = new InteracterWithUserViaConsole(); | ||
| ArrayList<Car> cars = interacter.getCarsForRace(totalOFCars, minSpeedOfVehicle, maxSpeedOfVehicle); | ||
| Race race = new Race(cars, hoursInRace); | ||
| Car winCar = race.getWinnerCar(); | ||
| interacter.printInformationAboutWinCar(winCar); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
20 changes: 20 additions & 0 deletions
src/main/java/Race.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import java.util.ArrayList; | ||
| public class Race { | ||
| ArrayList<Car> cars; | ||
| int hoursInRace; | ||
|
|
||
|
|
||
| Race(ArrayList<Car> cars, int hoursInRace) { | ||
| this.cars = cars; | ||
| this.hoursInRace = hoursInRace; | ||
| } | ||
|
|
||
|
|
||
| public Car getWinnerCar() { | ||
| Car winnerCar = cars.getFirst(); | ||
| for (int i=1; i<cars.size(); i++){ | ||
| if (!winnerCar.isFaster(cars.get(i))) winnerCar = cars.get(i); | ||
| } | ||
| return winnerCar; | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.