github/injoyai-tdx
1
0
Fork 0
mirror of https://github.com/injoyai/tdx.git synced 2025-11-26 21:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

把集合竞价合并到931里面

Browse Source
This commit is contained in:
injoyai
2025-10-28 08:41:04 +08:00
parent 61b2e737b3
commit 5fa572f298
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
protocol/model_kline.go
View File

@@ -295,12 +295,6 @@ func (this Klines) Merge(n int) Klines {
} }
ks := Klines(nil) ks := Klines(nil)
if this[0].Time.Hour() == 9 && this[0].Time.Minute() == 30 {
ks = append(ks, this[0])
this = this[1:]
}
ls := Klines(nil) ls := Klines(nil)
for i := 0; ; i++ { for i := 0; ; i++ {
if len(this) <= i*n { if len(this) <= i*n {

5
protocol/model_trade.go
View File

@@ -183,7 +183,6 @@ func (this Trades) Kline(t time.Time, last Price) *Kline {
// kline1 生成一分钟k线,一天 // kline1 生成一分钟k线,一天
func (this Trades) klinesForDay(date time.Time) Klines { func (this Trades) klinesForDay(date time.Time) Klines {
_929 := 569 //9:29 的分钟,为了兼容性强,把9:25算9:29
_930 := 570 //9:30 的分钟 _930 := 570 //9:30 的分钟
_1130 := 690 //11:30 的分钟 _1130 := 690 //11:30 的分钟
_1300 := 780 //13:00 的分钟 _1300 := 780 //13:00 的分钟
@@ -191,7 +190,7 @@ func (this Trades) klinesForDay(date time.Time) Klines {
keys := []int(nil) keys := []int(nil)
//早上 //早上
m := map[int]Trades{} m := map[int]Trades{}
for i := 0; i <= 120; i++ { for i := 1; i <= 120; i++ {
keys = append(keys, _930+i) keys = append(keys, _930+i)
m[_930+i] = []*Trade{} m[_930+i] = []*Trade{}
} }
@@ -211,7 +210,7 @@ func (this Trades) klinesForDay(date time.Time) Klines {
//分组,按 //分组,按
for _, v := range this { for _, v := range this {
ms := minutes(v.Time) ms := minutes(v.Time)
t := conv.Select(ms < _929, _929, ms) t := conv.Select(ms < _930, _930, ms)
t++ t++
t = conv.Select(t > _1130 && t <= _1300, _1130, t) t = conv.Select(t > _1130 && t <= _1300, _1130, t)
t = conv.Select(t > _1500, _1500, t) t = conv.Select(t > _1500, _1500, t)