diff --git a/BKP/Main/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 b/BKP/Main/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 index 85f28249..8fa14209 100644 --- a/BKP/Main/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 @@ -68,11 +68,11 @@ input int xTESTMaxAllowedTrades = 10; input ENUM_X_CROSS_SIGNAL_METHOD xTESTCrossSignalsMethod = X_CROSS_SIGNAL_REGULAR; // Handle Cross Signals Method // // Max Allowed Trade Age ... -input int xTESTMaxAllowedTradeAge = 1500; // Detect Long Time Trades +input int xTESTMaxAllowedTradeAge = 300; // Detect Long Time Trades input ENUM_X_GUARD_ACTIONS xTESTOldTradesAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // What to do with Old Trades // // Trade Volume Specific Configurations ... -input double xTESTStaticVolumeFactor = 0.0001; // Static Volume baesd on Balance +input double xTESTStaticVolumeFactor = 0.0004; // Static Volume baesd on Balance input ENUM_STATIC_VOLUME_METHODS xTESTStaticVolumeMethod = X_STATIC_VOLUME_BASED_ON_BALANCE; // How to Calculate Static Volume input double xTESTVolumeMultiplier = 0; // Volume Increase Multiplier input double xTESTApplyVolumeMultiplierFactor = 0; // Apply Volume Multiplier Rate based on Balance @@ -85,9 +85,9 @@ input double xTESTRiskFreeStepInPips = 0; // Make Trades Risk Free Steps in Pips input double xTESTRiskFreeRate = 0; // Volume Multiplier for Risk Free Trades // // Guard Riskable Money and Profits ... -input double xTESTCriticalDrawDownFactor = 0.30; // Critical Allowed Drawdown Factor based on Balance +input double xTESTCriticalDrawDownFactor = 0.10; // Critical Allowed Drawdown Factor based on Balance input ENUM_X_GUARD_ACTIONS xTESTCriticalGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // Specify Guard Action on Critical Drawdown -input double xTESTMaxAllowedDrawDownFactor = 0.40; // Max Allowed Drawdown Factor based on Balance +input double xTESTMaxAllowedDrawDownFactor = 0.15; // Max Allowed Drawdown Factor based on Balance input ENUM_X_GUARD_ACTIONS xTESTMaxAllowedGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_5; // Specify Guard Action on Max Allowed Drawdown input int xTESTGuardStopoutFiredAfterTouches = 5; // Guard Stopout all Trades if Max Allowed Drawdown touched @@ -212,7 +212,7 @@ bool XTESTValidateInputs() // result = xTESTCriticalDrawDownFactor == 0 || (xTESTCriticalDrawDownFactor > 0 && - xTESTCriticalDrawDownFactor < 1); + xTESTCriticalDrawDownFactor < 1); if (!result) { // @@ -225,7 +225,7 @@ bool XTESTValidateInputs() // result = xTESTMaxAllowedDrawDownFactor == 0 || (xTESTMaxAllowedDrawDownFactor > 0 && - xTESTMaxAllowedDrawDownFactor < 1); + xTESTMaxAllowedDrawDownFactor < 1); if (!result) { // diff --git a/Projects/XTEST/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 b/Projects/XTEST/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 index 85f28249..8fa14209 100644 --- a/Projects/XTEST/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 +++ b/Projects/XTEST/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 @@ -68,11 +68,11 @@ input int xTESTMaxAllowedTrades = 10; input ENUM_X_CROSS_SIGNAL_METHOD xTESTCrossSignalsMethod = X_CROSS_SIGNAL_REGULAR; // Handle Cross Signals Method // // Max Allowed Trade Age ... -input int xTESTMaxAllowedTradeAge = 1500; // Detect Long Time Trades +input int xTESTMaxAllowedTradeAge = 300; // Detect Long Time Trades input ENUM_X_GUARD_ACTIONS xTESTOldTradesAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // What to do with Old Trades // // Trade Volume Specific Configurations ... -input double xTESTStaticVolumeFactor = 0.0001; // Static Volume baesd on Balance +input double xTESTStaticVolumeFactor = 0.0004; // Static Volume baesd on Balance input ENUM_STATIC_VOLUME_METHODS xTESTStaticVolumeMethod = X_STATIC_VOLUME_BASED_ON_BALANCE; // How to Calculate Static Volume input double xTESTVolumeMultiplier = 0; // Volume Increase Multiplier input double xTESTApplyVolumeMultiplierFactor = 0; // Apply Volume Multiplier Rate based on Balance @@ -85,9 +85,9 @@ input double xTESTRiskFreeStepInPips = 0; // Make Trades Risk Free Steps in Pips input double xTESTRiskFreeRate = 0; // Volume Multiplier for Risk Free Trades // // Guard Riskable Money and Profits ... -input double xTESTCriticalDrawDownFactor = 0.30; // Critical Allowed Drawdown Factor based on Balance +input double xTESTCriticalDrawDownFactor = 0.10; // Critical Allowed Drawdown Factor based on Balance input ENUM_X_GUARD_ACTIONS xTESTCriticalGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // Specify Guard Action on Critical Drawdown -input double xTESTMaxAllowedDrawDownFactor = 0.40; // Max Allowed Drawdown Factor based on Balance +input double xTESTMaxAllowedDrawDownFactor = 0.15; // Max Allowed Drawdown Factor based on Balance input ENUM_X_GUARD_ACTIONS xTESTMaxAllowedGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_5; // Specify Guard Action on Max Allowed Drawdown input int xTESTGuardStopoutFiredAfterTouches = 5; // Guard Stopout all Trades if Max Allowed Drawdown touched @@ -212,7 +212,7 @@ bool XTESTValidateInputs() // result = xTESTCriticalDrawDownFactor == 0 || (xTESTCriticalDrawDownFactor > 0 && - xTESTCriticalDrawDownFactor < 1); + xTESTCriticalDrawDownFactor < 1); if (!result) { // @@ -225,7 +225,7 @@ bool XTESTValidateInputs() // result = xTESTMaxAllowedDrawDownFactor == 0 || (xTESTMaxAllowedDrawDownFactor > 0 && - xTESTMaxAllowedDrawDownFactor < 1); + xTESTMaxAllowedDrawDownFactor < 1); if (!result) { // diff --git a/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 b/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 index 85f28249..8fa14209 100644 --- a/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 +++ b/Providers/x-saherelm.xtest.provider.inputs.lib.mq5 @@ -68,11 +68,11 @@ input int xTESTMaxAllowedTrades = 10; input ENUM_X_CROSS_SIGNAL_METHOD xTESTCrossSignalsMethod = X_CROSS_SIGNAL_REGULAR; // Handle Cross Signals Method // // Max Allowed Trade Age ... -input int xTESTMaxAllowedTradeAge = 1500; // Detect Long Time Trades +input int xTESTMaxAllowedTradeAge = 300; // Detect Long Time Trades input ENUM_X_GUARD_ACTIONS xTESTOldTradesAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // What to do with Old Trades // // Trade Volume Specific Configurations ... -input double xTESTStaticVolumeFactor = 0.0001; // Static Volume baesd on Balance +input double xTESTStaticVolumeFactor = 0.0004; // Static Volume baesd on Balance input ENUM_STATIC_VOLUME_METHODS xTESTStaticVolumeMethod = X_STATIC_VOLUME_BASED_ON_BALANCE; // How to Calculate Static Volume input double xTESTVolumeMultiplier = 0; // Volume Increase Multiplier input double xTESTApplyVolumeMultiplierFactor = 0; // Apply Volume Multiplier Rate based on Balance @@ -85,9 +85,9 @@ input double xTESTRiskFreeStepInPips = 0; // Make Trades Risk Free Steps in Pips input double xTESTRiskFreeRate = 0; // Volume Multiplier for Risk Free Trades // // Guard Riskable Money and Profits ... -input double xTESTCriticalDrawDownFactor = 0.30; // Critical Allowed Drawdown Factor based on Balance +input double xTESTCriticalDrawDownFactor = 0.10; // Critical Allowed Drawdown Factor based on Balance input ENUM_X_GUARD_ACTIONS xTESTCriticalGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // Specify Guard Action on Critical Drawdown -input double xTESTMaxAllowedDrawDownFactor = 0.40; // Max Allowed Drawdown Factor based on Balance +input double xTESTMaxAllowedDrawDownFactor = 0.15; // Max Allowed Drawdown Factor based on Balance input ENUM_X_GUARD_ACTIONS xTESTMaxAllowedGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_5; // Specify Guard Action on Max Allowed Drawdown input int xTESTGuardStopoutFiredAfterTouches = 5; // Guard Stopout all Trades if Max Allowed Drawdown touched @@ -212,7 +212,7 @@ bool XTESTValidateInputs() // result = xTESTCriticalDrawDownFactor == 0 || (xTESTCriticalDrawDownFactor > 0 && - xTESTCriticalDrawDownFactor < 1); + xTESTCriticalDrawDownFactor < 1); if (!result) { // @@ -225,7 +225,7 @@ bool XTESTValidateInputs() // result = xTESTMaxAllowedDrawDownFactor == 0 || (xTESTMaxAllowedDrawDownFactor > 0 && - xTESTMaxAllowedDrawDownFactor < 1); + xTESTMaxAllowedDrawDownFactor < 1); if (!result) { //