mirror of
https://github.com/c9s/bbgo.git
synced 2024-11-22 23:05:15 +00:00
fix distribution for floating numbers
This commit is contained in:
parent
0b0c895cd2
commit
fcf0f30628
|
@ -5,6 +5,7 @@ import (
|
||||||
"github.com/c9s/bbgo/pkg/bbgo/types"
|
"github.com/c9s/bbgo/pkg/bbgo/types"
|
||||||
"math"
|
"math"
|
||||||
"sort"
|
"sort"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
)
|
)
|
||||||
|
@ -59,34 +60,43 @@ type StockManager struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type Distribution struct {
|
type Distribution struct {
|
||||||
PriceLevels []int `json:"priceLevels"`
|
PriceLevels []string `json:"priceLevels"`
|
||||||
TotalQuantity float64 `json:"totalQuantity"`
|
TotalQuantity float64 `json:"totalQuantity"`
|
||||||
Quantities map[int]float64 `json:"quantities"`
|
Quantities map[string]float64 `json:"quantities"`
|
||||||
Stocks map[int]StockSlice `json:"stocks"`
|
Stocks map[string]StockSlice `json:"stocks"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *StockManager) Distribution(level int) *Distribution {
|
func (m *StockManager) Distribution(level int) *Distribution {
|
||||||
var d = Distribution{
|
var d = Distribution{
|
||||||
Quantities: map[int]float64{},
|
Quantities: map[string]float64{},
|
||||||
Stocks: map[int]StockSlice{},
|
Stocks: map[string]StockSlice{},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, stock := range m.Stocks {
|
for _, stock := range m.Stocks {
|
||||||
n := math.Ceil(math.Log10(stock.Price))
|
n := math.Ceil(math.Log10(stock.Price))
|
||||||
digits := int(n - math.Max(float64(level), 1.0))
|
digits := int(n - math.Max(float64(level), 1.0))
|
||||||
div := math.Pow10(digits)
|
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.TotalQuantity += stock.Quantity
|
||||||
d.Stocks[priceLevel] = append(d.Stocks[priceLevel], stock)
|
d.Stocks[key] = append(d.Stocks[key], stock)
|
||||||
d.Quantities[priceLevel] += stock.Quantity
|
d.Quantities[key] += stock.Quantity
|
||||||
}
|
}
|
||||||
|
|
||||||
for level := range d.Stocks {
|
var priceLevels []float64
|
||||||
d.PriceLevels = append(d.PriceLevels, level)
|
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
|
return &d
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user