Repository navigation
ПР для проверки задания по Спринту 2 Егор Табаев #1
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
lodrean
wants to merge
2
commits into
main
Choose a base branch
from
dev
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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,5 @@ | ||
| public class Calculator { | ||
| static double aveSumm (double summ, int countOfPerson){ | ||
| return summ / countOfPerson; | ||
| } | ||
| } |
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 Formatting { | ||
|
|
||
|
|
||
| static String round(double ruble){ | ||
| return String.format("%.2f", ruble); | ||
| } | ||
| public static String declination(double rubles){ | ||
| var deci = (int) rubles % 100 / 10; | ||
| if (deci == 1) | ||
| { | ||
| return "рублей"; | ||
| } | ||
| return switch ((int) rubles % 10) { | ||
| case 1 -> "рубль"; | ||
| case 2, 3, 4 -> "рубля"; | ||
| default -> "рублей"; | ||
| }; | ||
| } | ||
| } | ||
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,5 @@ | ||
| public class Good { | ||
| String name; | ||
| double value; | ||
| } | ||
|
|
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,45 @@ | ||
|
|
||
| import java.util.Scanner; | ||
| public class Main { | ||
| public static void main(String[] args) { | ||
| System.out.println("Hello world!"); | ||
| System.out.println("Введите количество человек, на которых необходимо разделить счет"); | ||
| Scanner scanner = new Scanner(System.in); | ||
| while (!scanner.hasNextInt() && scanner.hasNext()) { | ||
| System.out.println("некорректные данные, введите еще раз количество персон. Вы ввели: " + scanner.next()); | ||
| } | ||
| int personCount = scanner.nextInt(); | ||
|
|
||
| while (personCount<=1){ | ||
| System.out.println("Введенное значение неверно, введите количество человек больше 1"); | ||
| personCount = scanner.nextInt(); | ||
| } | ||
|
|
||
|
|
||
| String listOfGoods=""; | ||
| double summOfGoods= 0.00; | ||
| System.out.println("Введите товар, который хотите добавить в счёт"); | ||
| while (true){ | ||
| String input = scanner.next(); | ||
| if (input.equalsIgnoreCase("завершить")){ | ||
| break; | ||
| } | ||
| Good position = new Good(); | ||
| position.name = input; | ||
| listOfGoods += position.name + "\n"; | ||
| System.out.println("Введите стоимость добавляемого товара "); | ||
| while (!scanner.hasNextDouble() && scanner.hasNext()) { | ||
| System.out.println("некорректные данные, введите еще раз сумму. Вы ввели: " + scanner.next()); | ||
| } | ||
| position.value = scanner.nextDouble(); | ||
| while (position.value<0){ | ||
| System.out.println("Введенное значение некорректно, введите неотрицательную стоимость"); | ||
| position.value = scanner.nextDouble(); | ||
| } | ||
| summOfGoods+= position.value; | ||
| System.out.println("Товар "+ position.name + " добавлен. Если хотите прекратить добавление товаров, введите команду \"завершить\". Введите новый товар"); | ||
| } | ||
| double aveSumm = Calculator.aveSumm(summOfGoods, personCount); | ||
| System.out.println("Добавленные товары:\n" + listOfGoods); | ||
| System.out.println("Сумма на каждого человека будет равна " + Formatting.round(aveSumm) + " " + Formatting.declination(Math.floor(aveSumm))); | ||
| } | ||
| } | ||
| } |
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.
Это скобка должна быть строкой выше