From 3ff5cc883752e5feef64338e13506e7f615d2330 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 20 Apr 2023 17:14:03 +0300 Subject: [PATCH 1/5] version 1.0 --- src/DepositCalculator.java | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/DepositCalculator.java diff --git a/src/DepositCalculator.java b/src/DepositCalculator.java new file mode 100644 index 00000000..ba0824cf --- /dev/null +++ b/src/DepositCalculator.java @@ -0,0 +1,41 @@ +import java.util.Scanner; + +public class DepositCalculator { + double calculateComplexPercent(double amount, double yearRate, int period) { + double pay = amount * Math.pow((1 + yearRate / 12), 12 * period); + return roundValue(pay, 2); + } + + double calculateSimplePercent(double amount, double yearRate, int depositPeriod) { + return roundValue(amount + amount * yearRate * depositPeriod, 2); + } + + double roundValue(double value, int places) { + double scale = Math.pow(10, places); + return Math.round(value * scale) / scale; + } + + void printDepositSum() { + int period; + 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 depositSum = 0; + if (action == 1) { + depositSum = calculateSimplePercent(amount, 0.06, period); + } else if (action == 2) { + depositSum = calculateComplexPercent(amount, 0.06, period); + } + System.out.println("Результат вклада: " + amount + " за " + period + " лет превратятся в " + depositSum); + } + + public static void main(String[] args) { + new DepositCalculator().printDepositSum(); + } +} From e5bbf1972a17b7e95a6c724ddd2a6dbe45b3aaaf Mon Sep 17 00:00:00 2001 From: Alex-Naumenko1986 <128585511+Alex-Naumenko1986@users.noreply.github.com> Date: Thu, 20 Apr 2023 17:15:36 +0300 Subject: [PATCH 2/5] Delete calculate_deposit.java --- src/calculate_deposit.java | 40 -------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 src/calculate_deposit.java 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(); -} - - - - -} From 657f778ee4c042df7581d6ac74e69413001c7931 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 25 Apr 2023 11:30:50 +0300 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BF=D1=80=D0=BE=D0=B1=D0=B5=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/DepositCalculator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/DepositCalculator.java b/src/DepositCalculator.java index ba0824cf..64680ec3 100644 --- a/src/DepositCalculator.java +++ b/src/DepositCalculator.java @@ -6,8 +6,8 @@ public class DepositCalculator { return roundValue(pay, 2); } - double calculateSimplePercent(double amount, double yearRate, int depositPeriod) { - return roundValue(amount + amount * yearRate * depositPeriod, 2); + double calculateSimplePercent(double amount, double yearRate, int period) { + return roundValue(amount + amount * yearRate * period, 2); } double roundValue(double value, int places) { @@ -27,6 +27,7 @@ void printDepositSum() { System.out.println("Выберите тип вклада, 1 - вклад с обычным процентом, 2 - вклад с капитализацией:"); action = scanner.nextInt(); double depositSum = 0; + if (action == 1) { depositSum = calculateSimplePercent(amount, 0.06, period); } else if (action == 2) { From e65f52ae953536d9d27c49c32cb04e782b2d136d Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 4 Aug 2023 14:50:41 +0300 Subject: [PATCH 4/5] Test commit --- src/DepositCalculator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DepositCalculator.java b/src/DepositCalculator.java index 64680ec3..18b754a0 100644 --- a/src/DepositCalculator.java +++ b/src/DepositCalculator.java @@ -38,5 +38,6 @@ void printDepositSum() { public static void main(String[] args) { new DepositCalculator().printDepositSum(); + System.out.println("123"); } } From dca671a02337a6f140884b6c4099afcee58caa3a Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 4 Aug 2023 14:56:49 +0300 Subject: [PATCH 5/5] Test commit 2 --- src/DepositCalculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DepositCalculator.java b/src/DepositCalculator.java index 18b754a0..f8455fa8 100644 --- a/src/DepositCalculator.java +++ b/src/DepositCalculator.java @@ -38,6 +38,6 @@ void printDepositSum() { public static void main(String[] args) { new DepositCalculator().printDepositSum(); - System.out.println("123"); + System.out.println("1"); } }