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.

124 changes: 124 additions & 0 deletions .idea/uiDesigner.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>
Binary file not shown.
43 changes: 43 additions & 0 deletions src/DepositCalculator.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import java.util.Scanner;

public class DepositCalculator {
double calculateComplexPercent(double amount, double yearRate, int depositPeriod) {
double percent = amount * Math.pow((1 + yearRate / 12), 12 * depositPeriod);
return round(percent, 2);
}

double calculateSimplePercent(double amount, double yearRate, int depositPeriod) {
return round(amount + amount * yearRate * depositPeriod, 2);
}

double round(double value, int places) {
double ScaLe = Math.pow(10, places);

Choose a reason for hiding this comment

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

scale - переменная, лучше с маленькой буквы написать

return Math.round(value * ScaLe) / ScaLe;
}

void runInterface() {
int period;

Choose a reason for hiding this comment

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

Я бы объявила переменные и сразу им присвоила значения из сканнера, или все переменные(period,action,amout) объявила бы, а потом уже присваивала значения, чтоб было единообразно

int action;

Scanner scanner = new Scanner(System.in);
System.out.println("Введите сумму вклада в рублях:");
int amount = scanner.nextInt();
System.out.println("Введите срок вклада в годах:");
period = scanner.nextInt();
System.out.println("Выберите тип вклада, 1 - вклад с обычным процентом, 2 - вклад с капитализацией:");
action = scanner.nextInt();

double targetAmount = 0;

if (action == 1) {
targetAmount = calculateSimplePercent(amount, 0.06, period);
} else if (action == 2) {
targetAmount = calculateComplexPercent(amount, 0.06, period);
}
System.out.println("Результат вклада: " + amount + " за " + period + " лет превратятся в " + targetAmount);
}

public static void main(String[] args) {
new DepositCalculator().runInterface();
}
}
40 changes: 0 additions & 40 deletions src/calculate_deposit.java

This file was deleted.