первый ПР #1
There are no files selected for viewing
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,2 @@ | ||
| # Пустой репозиторий для работы с Java кодом в Android Studio | ||
| Курсовая работа Шаймарданов Марсель |
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,54 @@ | ||
| import java.util.Scanner; | ||
|
|
||
| public class Calculator { | ||
| static int persons = 0; | ||
| static String menuSum = ""; | ||
| static double priceSum = 0; | ||
| public static void calculator() { | ||
|
There was a problem hiding this comment. Имена функций должны содержать в себе действие. Функция делает что-либо. Хорошо помогает практика переводить имена функций дословно, если после перевода понятно чем занимается функция, то название хорошее |
||
| Scanner scanner = new Scanner(System.in); | ||
| System.out.println("Введите количество человек:"); | ||
| while (true) { | ||
| if (scanner.hasNextInt()) { | ||
| persons = scanner.nextInt(); | ||
| if (persons < 2) { | ||
| System.out.println("Введите число больше 1"); | ||
| } else { | ||
| break; | ||
| } | ||
| } else { | ||
| System.out.println("Введите целое число "); | ||
| scanner.next(); | ||
| } | ||
| } | ||
| while (true) { | ||
| System.out.println("Введите название товара или введите 'Завершить', что бы выйти"); | ||
| scanner.nextLine(); | ||
| String menu = scanner.nextLine(); | ||
| if (menu.equalsIgnoreCase("Завершить")) { | ||
| System.out.println("Товар успешно добавлен."); | ||
| break; | ||
| } | ||
| menuSum += menu + "\n"; | ||
| while (true) { | ||
| System.out.println("Введите цену товара:"); | ||
| if (scanner.hasNextDouble()) { | ||
| double price = scanner.nextDouble(); | ||
| if (price > 0) { | ||
| priceSum += price; | ||
| break; | ||
| } else { | ||
| System.out.println("Введите число больше 0"); | ||
| } | ||
| } else { | ||
| System.out.println("Введите число"); | ||
| scanner.next(); | ||
|
There was a problem hiding this comment. Рекомендация: - хорошей практикой является делать вызов scanner.close() после того, как сканнер больше не используется. Это необходимо для того, что бы этот объект не потреблял ресурсы, тогда когда это уже не требуется. |
||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
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,19 @@ | ||
| public class FormatRub { | ||
|
|
||
| static double rubAverage = Calculator.priceSum / Calculator.persons; | ||
|
|
||
| public static String formatRub(){ | ||
| int priceRemainder = (int)Math.floor(rubAverage); | ||
| if (priceRemainder % 10==1) | ||
|
There was a problem hiding this comment. В ситуациях, когда у тебя есть более 2-3 условий лучше использовать оператор switch-case - это улучшит читабельность кода и его легче будет расширить или изменить в дальнейшем |
||
| return " рубль"; | ||
| else if (priceRemainder % 10==2 || priceRemainder % 10==3 || priceRemainder % 10==4) | ||
| return " рубля"; | ||
| else | ||
| return " рублей"; | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| } | ||
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,9 @@ | ||
| import java.util.Scanner; | ||
| public class Main { | ||
| public static void main(String[] args) { | ||
| Calculator.calculator(); | ||
| String formatText = "Добавленные товары:\n%sКаждый человек должен заплатить: %.2f %s\n"; | ||
| System.out.printf(formatText, Calculator.menuSum, FormatRub.rubAverage, FormatRub.formatRub()); | ||
|
|
||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
старайся по возможности не использовать статические переменные, они живут столько же, сколько живет само приложение. В этом месте можно вполне использовать без модификатора static