From 5d33101192a4834ee186228c4c3a17d6112086d7 Mon Sep 17 00:00:00 2001
From: Nikhil Saraf <1028334+nikhilsaraf@users.noreply.github.com>
Date: Tue, 30 Apr 2019 21:40:32 -0700
Subject: [PATCH] improve function number.AsRatio(), closes #163 (#164)

---
 model/number.go      | 19 +++++++++++++++----
 model/number_test.go |  4 ++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/model/number.go b/model/number.go
index 91d3f27b8..f5abd2d15 100644
--- a/model/number.go
+++ b/model/number.go
@@ -39,15 +39,26 @@ func (n Number) AsString() string {
 
 // AsRatio returns an integer numerator and denominator
 func (n Number) AsRatio() (int32, int32, error) {
-	denominator := int32(math.Pow(10, float64(n.Precision())))
+	denominator64 := uint64(math.Pow(10, float64(n.Precision())))
 
+	var numerator64 uint64
 	// add an adjustment because the computed value should not have any digits beyond the decimal
 	// and we want to roll over values that are not computed correctly rather than using the expensive math/big library
-	adjustment := 0.1
+	unsignedPartial := n.AsFloat() * float64(denominator64)
 	if n.AsFloat() < 0 {
-		adjustment = -0.1
+		unsignedPartial *= -1
+	}
+	numerator64 = uint64(unsignedPartial + 0.1)
+
+	for numerator64%10 == 0 {
+		numerator64 /= 10
+		denominator64 /= 10
+	}
+
+	numerator, denominator := int32(numerator64), int32(denominator64)
+	if n.AsFloat() < 0 {
+		numerator *= -1
 	}
-	numerator := int32(n.AsFloat()*float64(denominator) + adjustment)
 
 	if float64(numerator)/float64(denominator) != n.AsFloat() {
 		return 0, 0, fmt.Errorf("invalid conversion to a ratio probably caused by an overflow, float input: %f, numerator: %d, denominator: %d", n.AsFloat(), numerator, denominator)
diff --git a/model/number_test.go b/model/number_test.go
index f18ee7d8f..c7533351a 100644
--- a/model/number_test.go
+++ b/model/number_test.go
@@ -287,6 +287,10 @@ func TestAsRatio(t *testing.T) {
 			n:     NumberFromFloat(-0.251841, 6),
 			wantN: -251841,
 			wantD: 1000000,
+		}, {
+			n:     NumberFromFloat(5274.26, 8),
+			wantN: 527426,
+			wantD: 100,
 		},
 	}