diff --git a/KLHZ.Trader.Core/Exchange/Services/Trader.cs b/KLHZ.Trader.Core/Exchange/Services/Trader.cs index 5c535ca..86e0f6e 100644 --- a/KLHZ.Trader.Core/Exchange/Services/Trader.cs +++ b/KLHZ.Trader.Core/Exchange/Services/Trader.cs @@ -1197,26 +1197,26 @@ INewPrice message, int windowMaxSize, decimal? uptrendStartingDetectionMeanfullS private (decimal stopLoss, decimal takeProfit) GetStops(INewPrice message, PositionType type) { var mode = TradingModes[message.Figi]; - decimal stopLossShift = 15; + decimal stopLossShift = 1.5m; decimal takeProfitShift = 6; if (mode == TradingMode.Growing && type == PositionType.Long) { takeProfitShift = 15; - stopLossShift = 2; + //stopLossShift = 2; } if (mode == TradingMode.Growing && type == PositionType.Short) { - stopLossShift = 2; - takeProfitShift = 2; + //stopLossShift = 2; + takeProfitShift = 3m; } if (mode == TradingMode.Stable && type == PositionType.Long) { - takeProfitShift = 2.5m; + takeProfitShift = 3m; } if (mode == TradingMode.Stable && type == PositionType.Short) { - takeProfitShift = 2.5m; - stopLossShift = 10; + takeProfitShift = 3m; + //stopLossShift = 10; } if (mode == TradingMode.SlowDropping && type == PositionType.Short) { @@ -1225,12 +1225,12 @@ INewPrice message, int windowMaxSize, decimal? uptrendStartingDetectionMeanfullS if (mode == TradingMode.SlowDropping && type == PositionType.Long) { takeProfitShift = 1.5m; - stopLossShift = 10; + //stopLossShift = 10; } if (mode == TradingMode.SlowGrowing && type == PositionType.Short) { - takeProfitShift = 1.5m; - stopLossShift = 10; + //takeProfitShift = 2.5m; + //stopLossShift = 10; } if (mode == TradingMode.SlowGrowing && type == PositionType.Long) { @@ -1238,12 +1238,12 @@ INewPrice message, int windowMaxSize, decimal? uptrendStartingDetectionMeanfullS if (mode == TradingMode.Dropping && type == PositionType.Short) { takeProfitShift = 15; - stopLossShift = 2; + //stopLossShift = 2; } if (mode == TradingMode.Dropping && type == PositionType.Long) { - stopLossShift = 2; - takeProfitShift = 1.5m; + //stopLossShift = 2; + takeProfitShift = 3m; } return (stopLossShift, takeProfitShift); }