From 2e83f47e0cbc8430058ea0c51e6b2b09bd6b9272 Mon Sep 17 00:00:00 2001 From: Dee Date: Wed, 7 Dec 2022 22:16:48 +0800 Subject: [PATCH 1/3] The code is formatted according to the style guide --- src/DepositCalculator.java | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/DepositCalculator.java diff --git a/src/DepositCalculator.java b/src/DepositCalculator.java new file mode 100644 index 00000000..8987fda3 --- /dev/null +++ b/src/DepositCalculator.java @@ -0,0 +1,43 @@ +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 round(pay, 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); + return Math.round(value * ScaLe) / ScaLe; + } + + void calculateDeposit() { + 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 out = 0; + + if (action == 1) { + out = calculateSimplePercent(amount, 0.06, period); + } else if (action == 2) { + out = calculateComplexPercent(amount, 0.06, period); + } + + System.out.println("Результат вклада: " + amount + " за " + period + " лет превратятся в " + out); + } + + public static void main(String[] args) { + new DepositCalculator().calculateDeposit(); + } +} From 82276dfed535da0f31bf89940bfd8cb8a655669c Mon Sep 17 00:00:00 2001 From: dima-irqtsk <118014229+dima-irqtsk@users.noreply.github.com> Date: Wed, 7 Dec 2022 22:18:13 +0800 Subject: [PATCH 2/3] 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 ff059d60bff74ccadb2a077881e6b73b7bab29b5 Mon Sep 17 00:00:00 2001 From: Nikita K Date: Wed, 7 Dec 2022 20:20:23 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9E=D1=82=D0=BB=D0=B8=D1=87=D0=BD=D0=BE?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=D1=87=D0=B5=D1=81=D0=B0=D0=BB,=20=D0=B2?= =?UTF-8?q?=D1=81=D0=B5=20=D0=BF=D0=BE=20CodeStyle=20=D0=B2=20=20=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D0=BE=D0=BC=20=D0=BC=D0=B5=D1=81=D1=82=D0=B5=20?= =?UTF-8?q?=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=BF=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=BB=D0=B0=D0=B3=D0=B0=D1=8E=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/DepositCalculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DepositCalculator.java b/src/DepositCalculator.java index 8987fda3..dbdb12c7 100644 --- a/src/DepositCalculator.java +++ b/src/DepositCalculator.java @@ -11,8 +11,8 @@ public class DepositCalculator { } double round(double value, int places) { - double ScaLe = Math.pow(10, places); - return Math.round(value * ScaLe) / ScaLe; + double scale = Math.pow(10, places); //предлагаю переименовать в lowCase + return Math.round(value * scale) / scale; //предлагаю переименовать в lowCase } void calculateDeposit() {