compounding 0.1.2 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/compounding/calculation_result.rb +20 -7
- data/lib/compounding/calculator.rb +2 -2
- data/lib/compounding/dto/period.rb +4 -2
- data/lib/compounding/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0aedbca6ac289af1d5af7aaf2ee95289048eacb09b78196d13999028c8edf0dc
|
|
4
|
+
data.tar.gz: bbcbb9ae9fc530c1d1122c489a246ffc4ff92882b83b8532b1799f0c732e2fea
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ec3c09042d2b4e5d9a8f8d0ff296acf21f419109cb3176f14621fe43bea9befae85d75264b7877840157896795dd357896313060b54e09cba7105a9e4781c28c
|
|
7
|
+
data.tar.gz: 38bb33a199c30f6a5c85ebfaa75e1ca950ae002e93362980344aa387a2702a1454766b50bfca4dc3ef7d6d2d03e7ab51adf1eb325ad122bf0f17bab87986f527
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
module Compounding
|
|
2
2
|
class CalculationResult
|
|
3
|
-
attr_reader :principal, :rate, :time, :compounding_frequency, :periods, :interest, :total
|
|
3
|
+
attr_reader :principal, :period_contribution, :rate, :time, :compounding_frequency, :periods, :interest, :total
|
|
4
4
|
|
|
5
5
|
# time can be any unit of time, e.g. years, months, days, etc.
|
|
6
|
-
def initialize(principal, rate, time, compounding_frequency)
|
|
6
|
+
def initialize(principal, period_contribution, rate, time, compounding_frequency)
|
|
7
7
|
@principal = principal
|
|
8
|
+
@period_contribution = period_contribution
|
|
8
9
|
@rate = rate
|
|
9
10
|
@time = time
|
|
10
11
|
@compounding_frequency = compounding_frequency
|
|
@@ -12,24 +13,28 @@ module Compounding
|
|
|
12
13
|
end
|
|
13
14
|
|
|
14
15
|
def calculate
|
|
15
|
-
@interest = (1 + @rate / @compounding_frequency)**(@compounding_frequency * @time)
|
|
16
|
-
@total = @principal + @interest
|
|
17
16
|
populate_periods
|
|
17
|
+
calculate_interest
|
|
18
|
+
calculate_total
|
|
18
19
|
end
|
|
19
20
|
|
|
20
21
|
def populate_periods
|
|
21
22
|
total_number_of_periods = @compounding_frequency * @time
|
|
22
23
|
@periods = []
|
|
23
24
|
previous_total_full = @principal
|
|
24
|
-
previous_total = @principal
|
|
25
25
|
total_full = @principal
|
|
26
26
|
|
|
27
27
|
for n in 1..total_number_of_periods
|
|
28
|
+
previous_total_full = total_full
|
|
29
|
+
previous_total = previous_total_full
|
|
30
|
+
previous_total = previous_total_full.round(2)
|
|
31
|
+
|
|
28
32
|
period_interest = previous_total_full * @rate / @compounding_frequency
|
|
29
|
-
total_full
|
|
33
|
+
total_full = previous_total_full + @period_contribution + period_interest
|
|
30
34
|
total = total_full.round(2)
|
|
31
35
|
|
|
32
|
-
@periods.push(DTO::Period.new(n, previous_total_full, previous_total, period_interest,
|
|
36
|
+
@periods.push(DTO::Period.new(n, @period_contribution, previous_total_full, previous_total, period_interest,
|
|
37
|
+
total_full, total))
|
|
33
38
|
|
|
34
39
|
previous_total_full = total_full
|
|
35
40
|
previous_total = total
|
|
@@ -37,5 +42,13 @@ module Compounding
|
|
|
37
42
|
|
|
38
43
|
@periods
|
|
39
44
|
end
|
|
45
|
+
|
|
46
|
+
def calculate_interest
|
|
47
|
+
@interest = @periods.reduce(0) { |sum, period| sum + period.interest }
|
|
48
|
+
end
|
|
49
|
+
|
|
50
|
+
def calculate_total
|
|
51
|
+
@total = @periods.last.total
|
|
52
|
+
end
|
|
40
53
|
end
|
|
41
54
|
end
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
module Compounding
|
|
2
2
|
class Calculator
|
|
3
|
-
def self.calculate(principal, rate, time, compounding_frequency)
|
|
4
|
-
cr = CalculationResult.new(principal, rate, time, compounding_frequency)
|
|
3
|
+
def self.calculate(principal, period_contribution, rate, time, compounding_frequency)
|
|
4
|
+
cr = CalculationResult.new(principal, period_contribution, rate, time, compounding_frequency)
|
|
5
5
|
cr.calculate
|
|
6
6
|
cr
|
|
7
7
|
end
|
|
@@ -2,10 +2,12 @@ module Compounding
|
|
|
2
2
|
module DTO
|
|
3
3
|
class Period
|
|
4
4
|
# previous_total_full and total_full contain number that's not rounded
|
|
5
|
-
attr_reader :period_id, :
|
|
5
|
+
attr_reader :period_id, :period_contribution,
|
|
6
|
+
:previous_total_full, :previous_total, :interest, :total_full, :total
|
|
6
7
|
|
|
7
|
-
def initialize(period_id, previous_total_full, previous_total, interest, total_full, total)
|
|
8
|
+
def initialize(period_id, period_contribution, previous_total_full, previous_total, interest, total_full, total)
|
|
8
9
|
@period_id = period_id
|
|
10
|
+
@period_contribution = period_contribution
|
|
9
11
|
@previous_total_full = previous_total_full
|
|
10
12
|
@previous_total = previous_total
|
|
11
13
|
@interest = interest
|
data/lib/compounding/version.rb
CHANGED