From fcf0f30628841285beab5923911b57d5e8e9e600 Mon Sep 17 00:00:00 2001
From: c9s <yoan@maicoin.com>
Date: Tue, 11 Aug 2020 12:09:40 +0800
Subject: [PATCH] fix distribution for floating numbers

---
 bbgo/stock.go | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/bbgo/stock.go b/bbgo/stock.go
index 603b09d5e..93ae8d46e 100644
--- a/bbgo/stock.go
+++ b/bbgo/stock.go
@@ -5,6 +5,7 @@ import (
 	"github.com/c9s/bbgo/pkg/bbgo/types"
 	"math"
 	"sort"
+	"strconv"
 	"strings"
 	"sync"
 )
@@ -59,34 +60,43 @@ type StockManager struct {
 }
 
 type Distribution struct {
-	PriceLevels []int `json:"priceLevels"`
+	PriceLevels []string `json:"priceLevels"`
 	TotalQuantity float64 `json:"totalQuantity"`
-	Quantities map[int]float64 `json:"quantities"`
-	Stocks map[int]StockSlice `json:"stocks"`
+	Quantities map[string]float64 `json:"quantities"`
+	Stocks map[string]StockSlice `json:"stocks"`
 }
 
 func (m *StockManager) Distribution(level int) *Distribution {
 	var d = Distribution{
-		Quantities: map[int]float64{},
-		Stocks: map[int]StockSlice{},
+		Quantities: map[string]float64{},
+		Stocks: map[string]StockSlice{},
 	}
 
 	for _, stock := range m.Stocks {
 		n := math.Ceil(math.Log10(stock.Price))
 		digits := int(n - math.Max(float64(level), 1.0))
 		div := math.Pow10(digits)
-		priceLevel := int(math.Floor(stock.Price / div) * div)
+		priceLevel := math.Floor(stock.Price / div) * div
+		key := strconv.FormatFloat(priceLevel, 'f', 2, 64)
 
 		d.TotalQuantity += stock.Quantity
-		d.Stocks[priceLevel] = append(d.Stocks[priceLevel], stock)
-		d.Quantities[priceLevel] += stock.Quantity
+		d.Stocks[key] = append(d.Stocks[key], stock)
+		d.Quantities[key] += stock.Quantity
 	}
 
-	for level := range d.Stocks {
-		d.PriceLevels = append(d.PriceLevels, level)
+	var priceLevels []float64
+	for priceString := range d.Stocks {
+		price, _ := strconv.ParseFloat(priceString, 32)
+		priceLevels = append(priceLevels, price)
+	}
+	sort.Float64s(priceLevels)
+
+	for _, price := range priceLevels {
+		d.PriceLevels = append(d.PriceLevels, strconv.FormatFloat(price, 'f', 2, 64))
 	}
 
-	sort.Ints(d.PriceLevels)
+	sort.Float64s(priceLevels)
+
 
 	return &d
 }