Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions m1-t12-code-style.iml
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>
42 changes: 42 additions & 0 deletions src/CalculateDeposit.java
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 ) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Лучше дать осмысленные названия переменным в параметре

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() {

Choose a reason for hiding this comment

The 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();
}
}
40 changes: 0 additions & 40 deletions src/calculate_deposit.java

This file was deleted.