tester/optimizer stop orders execution rules change

AlexandrJC · Jun 3, 2021 · 91076a4 · 91076a4
1 parent 28f1074
commit 91076a4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/project/OsEngine/Market/Servers/Optimizer/OptimizerServer.cs b/project/OsEngine/Market/Servers/Optimizer/OptimizerServer.cs
@@ -624,14 +624,14 @@ private bool CheckOrdersInCandleTest(Order order, Candle lastCandle)
                 {
                     if (minPrice > realPrice)
                     {
-                        realPrice = minPrice;
+                        realPrice = lastCandle.Open;
                     }
                 }
                 if (order.Side == Side.Sell)
                 {
                     if (maxPrice < realPrice)
                     {
-                        realPrice = maxPrice;
+                        realPrice = lastCandle.Open;
                     }
                 }
 

diff --git a/project/OsEngine/Market/Servers/Tester/TesterServer.cs b/project/OsEngine/Market/Servers/Tester/TesterServer.cs
@@ -1968,14 +1968,14 @@ private bool CheckOrdersInCandleTest(Order order, Candle lastCandle)
                 {
                     if (minPrice > realPrice)
                     {
-                        realPrice = minPrice;
+                        realPrice = lastCandle.Open;
                     }
                 }
                 if (order.Side == Side.Sell)
                 {
                     if (maxPrice < realPrice)
                     {
-                        realPrice = maxPrice;
+                        realPrice = lastCandle.Open;
                     }
                 }
 

diff --git a/project/OsEngine/Properties/AssemblyInfo.cs b/project/OsEngine/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.8")]
-[assembly: AssemblyFileVersion("1.7.1.8")]
+[assembly: AssemblyVersion("1.7.1.9")]
+[assembly: AssemblyFileVersion("1.7.1.9")]
diff --git a/project/OsEngine/bin/Debug/OsEngine.exe b/project/OsEngine/bin/Debug/OsEngine.exe