支持逆序功能

wukan1986 · wukan1986 · commit fa55ce462db4 · 2015-05-08T12:00:55.000+08:00
diff --git a/QuantBox.Data.Serializer/V2/Int2DoubleConverter.cs b/QuantBox.Data.Serializer/V2/Int2DoubleConverter.cs
@@ -138,7 +138,7 @@ public PbTickView Int2Double(PbTick tick, bool descending)
             view.Split = Int2Double(tick.Split);
             view.LocalTime_Msec = tick.LocalTime_Msec;
             view.DepthList = Int2Double(tick.DepthList, descending);
-            view.LoadQuote();
+            view.LoadQuote(descending);
             return view;
         }
     }
diff --git a/QuantBox.Data.Serializer/V2/PbTickView.cs b/QuantBox.Data.Serializer/V2/PbTickView.cs
@@ -24,6 +24,7 @@ public class PbTickView
         public DepthItemView Bid1 { get; set; }
         public int AskPos { get; set; }
         public int BidPos { get; set; }
+        public bool descending { get; set; }
 
         /// <summary>
         /// 成交量
@@ -70,30 +71,65 @@ public override string ToString()
             return LastPrice.ToString(CultureInfo.InvariantCulture);
         }
 
-        public void LoadQuote()
+        public void LoadQuote(bool descending)
         {
-            AskPos = DepthListHelper.FindAsk1Position(DepthList, AskPrice1);
-            BidPos = AskPos - 1;
-            Ask1 = GetAsk(0);
-            Bid1 = GetBid(0);
+            this.descending = descending;
+            if(descending)
+            {
+                AskPos = DepthListHelper.FindAsk1PositionDescending(DepthList, AskPrice1);
+                BidPos = AskPos + 1;
+                Ask1 = GetAsk(1);
+                Bid1 = GetBid(1);
+            }
+            else
+            {
+                AskPos = DepthListHelper.FindAsk1Position(DepthList, AskPrice1);
+                BidPos = AskPos - 1;
+                Ask1 = GetAsk(1);
+                Bid1 = GetBid(1);
+            }
         }
 
         public DepthItemView GetBid(int level)
         {
             if (level > 0) {
-                var pos = BidPos - (level - 1);
-                if (pos >= 0) {
-                    return DepthList[pos];
+                if(descending)
+                {
+                    var pos = BidPos + (level - 1);
+                    if (pos <= DepthList.Count - 1)
+                    {
+                        return DepthList[pos];
+                    }
                 }
+                else
+                {
+                    var pos = BidPos - (level - 1);
+                    if (pos >= 0)
+                    {
+                        return DepthList[pos];
+                    }
+                }
+                
             }
             return null;
         }
         public DepthItemView GetAsk(int level)
         {
             if (level > 0) {
-                var pos = AskPos + (level - 1);
-                if (pos <= DepthList.Count - 1) {
-                    return DepthList[pos];
+                if (descending)
+                {
+                    var pos = AskPos - (level - 1);
+                    if (pos >= 0)
+                    {
+                        return DepthList[pos];
+                    }
+                }
+                else
+                {
+                    var pos = AskPos + (level - 1);
+                    if (pos <= DepthList.Count - 1) {
+                        return DepthList[pos];
+                    }
                 }
             }
             return null;

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public PbTickView Int2Double(PbTick tick, bool descending)`
`138`	`138`	`view.Split = Int2Double(tick.Split);`
`139`	`139`	`view.LocalTime_Msec = tick.LocalTime_Msec;`
`140`	`140`	`view.DepthList = Int2Double(tick.DepthList, descending);`
`141`		`- view.LoadQuote();`
	`141`	`+ view.LoadQuote(descending);`
`142`	`142`	`return view;`
`143`	`143`	`}`
`144`	`144`	`}`