-
Notifications
You must be signed in to change notification settings - Fork 1.4k
refactor(code-style): рефакторит код по заданию #63
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <module type="JAVA_MODULE" version="4"> | ||
| <component name="NewModuleRootManager" inherit-compiler-output="true"> | ||
| <exclude-output /> | ||
| <content url="file://$MODULE_DIR$"> | ||
| <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> | ||
| </content> | ||
| <orderEntry type="inheritedJdk" /> | ||
| <orderEntry type="sourceFolder" forTests="false" /> | ||
| </component> | ||
| </module> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import java.util.Scanner; | ||
|
|
||
| public class CalculateDeposit { | ||
| double calculateComplexPercent(double a, double y, int d ) { | ||
| double pay = a * Math.pow((1 + y / 12), 12 * d); | ||
|
|
||
| return round(pay, 2); | ||
| } | ||
|
|
||
| double calculateSimplePercent(double doubleAmount, double doubleYearRate, int depositPeriod) { | ||
| return round(doubleAmount + doubleAmount * doubleYearRate * depositPeriod, 2); | ||
| } | ||
|
|
||
| double round(double value, int places) { | ||
| double scale = Math.pow(10, places); | ||
|
|
||
| return Math.round(value * scale) / scale; | ||
| } | ||
|
|
||
| void startCalculateDeposit() { | ||
|
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. у строк этого метода отступ 4 пробела |
||
| Scanner scanner = new Scanner(System.in); | ||
|
|
||
| System.out.println("Введите сумму вклада в рублях:"); | ||
| int amount = scanner.nextInt(); | ||
| System.out.println("Введите срок вклада в годах:"); | ||
| int period = scanner.nextInt(); | ||
| System.out.println("Выберите тип вклада, 1 - вклад с обычным процентом, 2 - вклад с капитализацией:"); | ||
| int action = scanner.nextInt(); | ||
| double outValue = 0; | ||
|
|
||
| if (action == 1) { | ||
| outValue = calculateSimplePercent(amount, 0.06, period); | ||
| } else if (action == 2) { | ||
| outValue = calculateComplexPercent(amount, 0.06, period); | ||
| } | ||
| System.out.println("Результат вклада: " + amount + " за " + period + " лет превратятся в " + outValue); | ||
| } | ||
|
|
||
| public static void main(String[] args) { | ||
| new CalculateDeposit().startCalculateDeposit(); | ||
| } | ||
| } | ||
This file was deleted.
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.
Лучше дать осмысленные названия переменным в параметре