diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..26d33521
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..0319d5d5
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..28678352
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/m1-t12-code-style.iml b/m1-t12-code-style.iml
new file mode 100644
index 00000000..c90834f2
--- /dev/null
+++ b/m1-t12-code-style.iml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/out/production/m1-t12-code-style/DepositCalculator.class b/out/production/m1-t12-code-style/DepositCalculator.class
new file mode 100644
index 00000000..1ee0acd4
Binary files /dev/null and b/out/production/m1-t12-code-style/DepositCalculator.class differ
diff --git a/src/DepositCalculator.java b/src/DepositCalculator.java
new file mode 100644
index 00000000..bb2ba31e
--- /dev/null
+++ b/src/DepositCalculator.java
@@ -0,0 +1,47 @@
+import java.util.Scanner;
+
+public class DepositCalculator {
+
+ double calculateComplexPercent(double amount, double yearRate, int depositPeriod ) {
+ double pay = amount * Math.pow((1 + yearRate / 12), 12 * depositPeriod);
+ return roundToTenth(pay);
+ }
+
+ double calculateSimplePercent(double amount, double yearRate, int depositPeriod) {
+ double pay = amount + amount * yearRate * depositPeriod;
+ return roundToTenth(pay);
+ }
+
+ double roundToTenth(double value) {
+ double scale = Math.pow(10, 2);
+ return Math.round(value * scale) / scale;
+ }
+
+ void calculationDeposit() {
+ 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 depositAmount = 0;
+ if (action == 1) {
+ depositAmount = calculateSimplePercent(amount, 0.06, period);
+ } else if (action == 2) {
+ depositAmount = calculateComplexPercent(amount, 0.06, period);
+ }
+
+ System.out.println("Результат вклада: " + amount + " за " + period + " лет превратятся в " + depositAmount);
+ }
+
+ public static void main(String[] args) {
+ DepositCalculator depositCalculator = new DepositCalculator();
+ depositCalculator.calculationDeposit();
+ }
+
+}
diff --git a/src/calculate_deposit.java b/src/calculate_deposit.java
deleted file mode 100644
index 90164f11..00000000
--- a/src/calculate_deposit.java
+++ /dev/null
@@ -1,40 +0,0 @@
-import java.net.URI;import java.util.Scanner;import java.io.IOException;
-
-public class calculate_deposit
-{
-double Calculate_Complex_Percent_Function(double a, double y,int d ) {
- double pay = a * Math.pow((1 + y/ 12), 12 *d);
- return rnd(pay, 2);
- } double Calculate_Simple_Percent_Function(double doubleAmount,double double_year_rate, int deposit_period) {
- return rnd(doubleAmount+doubleAmount * double_year_rate *deposit_period, 2);
- } double rnd(double value
- ,int places) {
- double ScaLe= Math.pow
- (10, places);
- return Math.round(value*ScaLe)
- /ScaLe; }
-
- void do_important_job( )
- {
- int period, action ;
- Scanner abcdef = new Scanner(System.in); System.out.println("Введите сумму вклада в рублях:") ;
- int amount = abcdef.nextInt(); System.out.println("Введите срок вклада в годах:") ;
- period = abcdef.nextInt( );
- System.out.println ( "Выберите тип вклада, 1 - вклад с обычным процентом, 2 - вклад с капитализацией:");
- action = abcdef.nextInt();
- double outDoubleVar = 0;
- if (action ==1) outDoubleVar = Calculate_Simple_Percent_Function(amount, 0.06, period);
- else if (action == 2)
- {
- outDoubleVar = Calculate_Complex_Percent_Function(amount, 0.06, period); }
- System.out.println("Результат вклада: " + amount + " за " + period + " лет превратятся в " + outDoubleVar);
- }
-public static void main(String[] args)
- {
- new calculate_deposit().do_important_job();
-}
-
-
-
-
-}