-
Notifications
You must be signed in to change notification settings - Fork 1.5k
style: изменить стиль кода #42
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.
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 DepositCalculator { | ||
|
||
double calculateComplexPercent(double startDeposit, double yearRate, int depositPeriod) { | ||
double pay = startDeposit * Math.pow((1 + yearRate / 12), 12 * depositPeriod); | ||
return roundFinalDeposit(pay, 2); | ||
} | ||
|
||
double calculateSimplePercent(double startDeposit, double yearRate, int depositPeriod) { | ||
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. Понятное название метода-отлично! |
||
return roundFinalDeposit(startDeposit + startDeposit * yearRate * depositPeriod, 2); | ||
} | ||
|
||
double roundFinalDeposit(double finalDeposit, int DecimalPlaces) { | ||
double scale = Math.pow(10, DecimalPlaces); | ||
return Math.round(finalDeposit * scale) / scale; | ||
} | ||
|
||
void calculationDepositInterest() { | ||
int depositPeriod; | ||
int depositType; | ||
Scanner scanner = new Scanner(System.in); | ||
System.out.println("Введите сумму вклада в рублях:"); | ||
int startDeposit = scanner.nextInt(); | ||
System.out.println("Введите срок вклада в годах:"); | ||
depositPeriod = scanner.nextInt(); | ||
System.out.println("Выберите тип вклада, 1 - вклад с обычным процентом, 2 - вклад с капитализацией:"); | ||
depositType = scanner.nextInt(); | ||
double finalDeposit = 0; | ||
if (depositType == 1) { | ||
finalDeposit = calculateSimplePercent(startDeposit, 0.06, depositPeriod); | ||
} else if (depositType == 2) { | ||
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. else if без выравнивания , возможно можно лучше. |
||
finalDeposit = calculateComplexPercent(startDeposit, 0.06, depositPeriod); | ||
} | ||
System.out.println("Результат вклада: " + startDeposit + " за " + depositPeriod + " лет превратятся в " | ||
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. Перенос метода на новую строку не требуется если не превышает размер 120 символов. |
||
+ finalDeposit); | ||
} | ||
|
||
public static void main(String[] args) { | ||
new DepositCalculator().calculationDepositInterest(); | ||
} | ||
} | ||
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. Отлично выполненная работа! |
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.
public не требуется. Отлично!