From da8e476ca6f2d62436fdb9bc07a61210c6130c68 Mon Sep 17 00:00:00 2001
From: MrGriv <iv4nrut@yandex.ru>
Date: Thu, 2 Nov 2023 13:20:21 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                              |   3 ++
 .idea/misc.xml                                |   6 +++
 .idea/modules.xml                             |   8 ++++
 .idea/vcs.xml                                 |   6 +++
 m1-t12-code-style.iml                         |  11 +++++
 .../m1-t12-code-style/DepositCalculator.class | Bin 0 -> 2579 bytes
 src/DepositCalculator.java                    |  45 ++++++++++++++++++
 src/calculate_deposit.java                    |  40 ----------------
 8 files changed, 79 insertions(+), 40 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 m1-t12-code-style.iml
 create mode 100644 out/production/m1-t12-code-style/DepositCalculator.class
 create mode 100644 src/DepositCalculator.java
 delete mode 100644 src/calculate_deposit.java

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..dda71418
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/m1-t12-code-style.iml" filepath="$PROJECT_DIR$/m1-t12-code-style.iml" />
+    </modules>
+  </component>
+</project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ 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 @@
+<?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>
\ 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 0000000000000000000000000000000000000000..36dc817d1cd2019f7325611eb8de90c49769a02d
GIT binary patch
literal 2579
zcmaJ@TUQfT6#j->2IELDLIe#otxys~soK^8iWjIg7QDq`tyVjPDU7*HnoN-NYH=xR
zY1eWspZe%q-&&;QQb2s~)8u#bKeYYMOn_img_Se2_u2dV_U)YHuYZ=;0362;K7?@A
zdpbgie?AOg(1&Jx=sn%GsX8a)qa8Spm=8N}LA-rjiy<F|aZzY4)#7q3u6R%Vx^(65
zhpkHj;Hp^S0b*PicAo|y;WHUGh5D>mZprvug7<`;(anAdu1Iu5f_uOi(<JzZ^o(|~
zkRH`?*VNGzHGv@`p{7REoG#?D(rr%Yc?o-l2DPk_*UbSnl_;cC)5!Hn*h_m`(guul
zHl<Bn)^Z6gW0Es6I2el#N|023#IwlH7(X$_kyR-LH=N_TaNhJ)(?&sn)Q=ejMsla9
zsku8j)ntsj#+)!{tQ&;$<!CxKqNWPm^h6v^&!i)Jvne&9F?vrtp$>@*%iilr=tf3@
zoG{X9HAAp<@H1upfD_1d-JB=~M=Uv?P%{}VCu(w6om9IErk?61fl#t0yW*yrNDiyn
z^#Z0<oh-q~O~*W?X2!eYW=_wH_u1`GbK|1G+iWwvxKUt5&*`E+!KxM<76B+|L92}0
z3hv+w1@GX90u`eYc2|WbBcWgnnsE72!8j%)9JiiXbJo1|hqY9iw&ug7A4?CcRcp2M
zAWZ$TwPMY3Z<a#1be~%<td-K!(!*XEx`Mk%Do7zM;aD}yeQV8Ht^%=sr<#C-knq@g
zR(e9n`O^J$`e|#)dbP!?D|{q;s6xXK!^C(|dQzIPUebRxY`r4DTImt<c*!i*tktgY
z(Q2n<=JLuWnq^)~)*{1r#OJ*AXRm@Tv@2*sI|uKqVVHR{r)GyWbHW(Q`@P82!cdUK
zR|;}S)*>$i4(aZyt|)j9tpu^lZ@2r>=v^&A+qzBFuxhgSuB>s-p4&ljRy_7F^MpnQ
zqZhUS#EW@TW0h;fC^b5Rq#NC_OtxThmNYfZ$!m&iyCH_mWfVxi>3Esrx9PaY4vTmd
zY7Tl<7^MVZ8Tj?ll{4Cu851X!Hw*8r0wyIyt>>)gA}3{~^b>nATbi!uoi*DVmcpX&
zVTt!gT21om$Rt!#95TM;O*LckI0PfHShV`Uuts)N5)Opf!Fho#T0d{iaU~T;bD9(U
zl$3&?k(I1Qk#SEn?;8nin+?%3lSWc2pG+sFb83S3Tv5h%ywHXWBU#8wP-5bs52Vz5
zUR*6dSJtMC;S9}r-YF?9-{v^>Rfkcb+2VMunANs1ue>0ff$FQwtqj4dEfv>Itxv}H
z656Zs+b%W<t^aR_H~D1}vcIdm{Ep#$!}Sfy-F!-XdO8;&z2Hj?!d!(B;G!F#I0kqN
z2Pi=tFlvNz4z>ITLLL5S18R&!z0&BJm|225+2ieO@_H8F`HlMyrjJj7+&~|J`z}1f
zcLO(sx6xs9g%IJJ%ifKmlXk-AAa!2qc*@KC*CE>)e`iNWG}-8xNhY>ZI%z02T_@ah
z_HWSnai~n^$Kf)apY;%Q5SMV7WR!k_HrN1fi^#3V-O=PuE}`~uliPSby?XvS2vqO|
zH~4}$TILJl7+GAjR9J)#J1$;04xc2Fl*w1D>v6AO$BjAo7O}I}I|n7OYXNo5-Uayk
zg;c*Toe<LQb?Ict{TzYLmYD_w_Aj8J$NdW$LZ0XFZ|E9(+;nN#zl<QTfV~u&+{<XP
z1u+FKgt_*!T;Sliu#ayc?B(Ey(P?M*57Oco6YXJw{hW+p&c#*k+-5>a_HPPNyA1ty
z@rva#9K=Pt#1j2Z<9(K)hKRTL8%q?#g-Lv17sSsmrXKXtw~rBUw*Do7S4OiWNiLbc
zrclr21WuNl)I%JJmOEF_d}9&&7O;PFn4Q7vV!aR9AvpuRlVP8ti;IDX5j}&i`ScNH
V3g4p0w69UF<IX44jo9mr{{Wa9u=M}{

literal 0
HcmV?d00001

diff --git a/src/DepositCalculator.java b/src/DepositCalculator.java
new file mode 100644
index 00000000..9d9f9946
--- /dev/null
+++ b/src/DepositCalculator.java
@@ -0,0 +1,45 @@
+import java.util.Scanner;
+
+public class DepositCalculator {
+
+    double calculateComplexPercent(double depositAmount, double yearRate, int depositPeriod) {
+        double amount = depositAmount * Math.pow((1 + yearRate / 12), 12 * depositPeriod);
+
+        return calculateAmountWithPercents(amount, 2);
+    }
+
+    double calculateSimplePercent(double depositAmount, double yearRate, int depositPeriod) {
+        return calculateAmountWithPercents(depositAmount + depositAmount * yearRate * depositPeriod, 2);
+    }
+
+    double calculateAmountWithPercents(double amount, int power) {
+        return Math.round(amount * Math.pow(10, power)) / Math.pow(10, power);
+    }
+
+    void depositCalculation() {
+        int depositPeriod;
+        int command;
+        int depositAmount;
+        double amountWithPercents = 0;
+        double yearRate = 0.06;
+        Scanner scanner = new Scanner(System.in);
+
+        System.out.println("Введите сумму вклада в рублях:");
+        depositAmount = scanner.nextInt();
+        System.out.println("Введите срок вклада в годах:");
+        depositPeriod = scanner.nextInt();
+        System.out.println("Выберите тип вклада, 1 - вклад с обычным процентом, 2 - вклад с капитализацией:");
+        command = scanner.nextInt();
+        if (command == 1) {
+            amountWithPercents = calculateSimplePercent(depositAmount, yearRate, depositPeriod);
+        } else if (command == 2) {
+            amountWithPercents = calculateComplexPercent(depositAmount, yearRate, depositPeriod);
+        }
+        System.out.print("Результат вклада: " + depositAmount + " за " + depositPeriod);
+        System.out.print(" лет превратятся в " + amountWithPercents);
+    }
+
+    public static void main(String[] args) {
+        new DepositCalculator().depositCalculation();
+    }
+}
\ No newline at end of file
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();
-}
-
-
-
-
-}