From f01063f9535108df1dc5c5689200a76c24be9926 Mon Sep 17 00:00:00 2001 From: "Eugene.S" Date: Thu, 8 Dec 2022 22:22:25 +0300 Subject: [PATCH 1/3] rebuild --- src/DepositCalculator.java | 44 ++++++++++++++++++++++++++++++++++++++ src/calculate_deposit.java | 40 ---------------------------------- 2 files changed, 44 insertions(+), 40 deletions(-) create mode 100644 src/DepositCalculator.java delete mode 100644 src/calculate_deposit.java diff --git a/src/DepositCalculator.java b/src/DepositCalculator.java new file mode 100644 index 00000000..fe589360 --- /dev/null +++ b/src/DepositCalculator.java @@ -0,0 +1,44 @@ +import java.util.Scanner; + +public class DepositCalculator { + double calculateComplexPercent(double a, double y, int d) { + double pay = a * Math.pow((1 + y / 12), 12 * d); + + return round(pay, 2); + } + + double calculateSimplePercent(double doubleAmount, double double_year_rate, int deposit_period) { + return round(doubleAmount + doubleAmount * double_year_rate * deposit_period, 2); + } + + double round(double value, int places) { + double ScaLe = Math.pow(10, places); + + return Math.round(value * ScaLe) / ScaLe; + } + + void countContribution() { + Scanner scanner = new Scanner(System.in); + int period; + int action; + double outDoubleVar = 0; + int amount = scanner.nextInt(); + + System.out.println("Введите сумму вклада в рублях:"); + System.out.println("Введите срок вклада в годах:"); + period = scanner.nextInt(); + System.out.println("Выберите тип вклада, 1 - вклад с обычным процентом, 2 - вклад с капитализацией:"); + action = scanner.nextInt(); + if (action == 1) + outDoubleVar = calculateSimplePercent(amount, 0.06, period); + else if (action == 2) + outDoubleVar = calculateComplexPercent(amount, 0.06, period); + System.out.println("Результат вклада: " + amount + " за " + period + " лет превратятся в " + outDoubleVar); + } + + public static void main(String[] args) { + new DepositCalculator().countContribution(); + } + + +} 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 4dabd91a01c689dc9d81d8034e6866182825c09f Mon Sep 17 00:00:00 2001 From: "Eugene.S" Date: Mon, 19 Dec 2022 22:57:19 +0300 Subject: [PATCH 2/3] rebuild --- src/.idea/.gitignore | 8 ++++++++ src/.idea/misc.xml | 6 ++++++ src/.idea/modules.xml | 8 ++++++++ src/.idea/vcs.xml | 6 ++++++ src/m1-t12-code-style.iml | 11 +++++++++++ 5 files changed, 39 insertions(+) create mode 100644 src/.idea/.gitignore create mode 100644 src/.idea/misc.xml create mode 100644 src/.idea/modules.xml create mode 100644 src/.idea/vcs.xml create mode 100644 src/m1-t12-code-style.iml diff --git a/src/.idea/.gitignore b/src/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/src/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml new file mode 100644 index 00000000..dda71418 --- /dev/null +++ b/src/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/.idea/modules.xml b/src/.idea/modules.xml new file mode 100644 index 00000000..28678352 --- /dev/null +++ b/src/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml new file mode 100644 index 00000000..6c0b8635 --- /dev/null +++ b/src/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/m1-t12-code-style.iml b/src/m1-t12-code-style.iml new file mode 100644 index 00000000..b107a2dd --- /dev/null +++ b/src/m1-t12-code-style.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From b9e6b2a5f726a206065985a4cedcfc8c8fd6fda1 Mon Sep 17 00:00:00 2001 From: "Eugene.S" Date: Mon, 19 Dec 2022 22:57:45 +0300 Subject: [PATCH 3/3] rebuild --- src/DepositCalculator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/DepositCalculator.java b/src/DepositCalculator.java index fe589360..44174eae 100644 --- a/src/DepositCalculator.java +++ b/src/DepositCalculator.java @@ -13,7 +13,6 @@ public class DepositCalculator { double round(double value, int places) { double ScaLe = Math.pow(10, places); - return Math.round(value * ScaLe) / ScaLe; }