xmaker: fix aggregatePrice function

This commit is contained in:
c9s 2024-08-28 22:32:27 +08:00
parent e187614179
commit 8de0c67503
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54

View File

@ -167,29 +167,23 @@ func (s *Strategy) CrossSubscribe(sessions map[string]*bbgo.ExchangeSession) {
} }
func aggregatePrice(pvs types.PriceVolumeSlice, requiredQuantity fixedpoint.Value) (price fixedpoint.Value) { func aggregatePrice(pvs types.PriceVolumeSlice, requiredQuantity fixedpoint.Value) (price fixedpoint.Value) {
q := requiredQuantity
totalAmount := fixedpoint.Zero
if len(pvs) == 0 { if len(pvs) == 0 {
price = fixedpoint.Zero price = fixedpoint.Zero
return price return price
} else if pvs[0].Volume.Compare(requiredQuantity) >= 0 {
return pvs[0].Price
} }
sumAmount := fixedpoint.Zero
sumQty := fixedpoint.Zero
for i := 0; i < len(pvs); i++ { for i := 0; i < len(pvs); i++ {
pv := pvs[i] pv := pvs[i]
if pv.Volume.Compare(q) >= 0 { sumQty = sumQty.Add(pv.Volume)
totalAmount = totalAmount.Add(q.Mul(pv.Price)) sumAmount = sumAmount.Add(pv.Volume.Mul(pv.Price))
if sumQty.Compare(requiredQuantity) >= 0 {
break break
} }
q = q.Sub(pv.Volume)
totalAmount = totalAmount.Add(pv.Volume.Mul(pv.Price))
} }
price = totalAmount.Div(requiredQuantity) return sumAmount.Div(sumQty)
return price
} }
func (s *Strategy) Initialize() error { func (s *Strategy) Initialize() error {