From faa8678e935874dd1cb2b319a2743b1c8f0a8791 Mon Sep 17 00:00:00 2001 From: Hadi Khazaee Asl Date: Sat, 24 Feb 2024 06:11:50 +0330 Subject: [PATCH] comment all these providers related variables: XOBDLH, XCHMACC, XCHMAMN, XCHMAMX ... --- ...herelm.xuschf5.provider.indicators.lib.mq5 | 408 +++++++++--------- ...x-saherelm.xuschf5.provider.inputs.lib.mq5 | 4 +- ...herelm.xuschf5.provider.indicators.lib.mq5 | 408 +++++++++--------- ...x-saherelm.xuschf5.provider.inputs.lib.mq5 | 4 +- ...herelm.xuschf5.provider.indicators.lib.mq5 | 408 +++++++++--------- ...x-saherelm.xuschf5.provider.inputs.lib.mq5 | 4 +- 6 files changed, 618 insertions(+), 618 deletions(-) diff --git a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index e1d3704b..3c4addef 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -56,33 +56,33 @@ input bool xUSCHF5XTSFIEnableSignaller = true; // Enable Signaller input bool xUSCHF5XTSFIAllowLongSignals = true; // Enable Long Signals input bool xUSCHF5XTSFIAllowShortSignals = true; // Enable Short Signals -// -// XOBDLH ... -input group "XUSCHF5 XOBDLH Signaller"; -input bool xUSCHF5XOBDLHEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XOBDLHAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XOBDLHAllowShortSignals = true; // Enable Short Signals +// // +// // XOBDLH ... +// input group "XUSCHF5 XOBDLH Signaller"; +// input bool xUSCHF5XOBDLHEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XOBDLHAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XOBDLHAllowShortSignals = true; // Enable Short Signals -// -// XCHMACC ... -input group "XUSCHF5 XCHMACC Signaller"; -input bool xUSCHF5XCHMACCEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XCHMACCAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XCHMACCAllowShortSignals = true; // Enable Short Signals +// // +// // XCHMACC ... +// input group "XUSCHF5 XCHMACC Signaller"; +// input bool xUSCHF5XCHMACCEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XCHMACCAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XCHMACCAllowShortSignals = true; // Enable Short Signals -// -// XCHMAMX ... -input group "XUSCHF5 XCHMAMX Signaller"; -input bool xUSCHF5XCHMAMXEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XCHMAMXAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XCHMAMXAllowShortSignals = true; // Enable Short Signals +// // +// // XCHMAMX ... +// input group "XUSCHF5 XCHMAMX Signaller"; +// input bool xUSCHF5XCHMAMXEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XCHMAMXAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XCHMAMXAllowShortSignals = true; // Enable Short Signals -// -// XCHMAMN ... -input group "XUSCHF5 XCHMAMN Signaller"; -input bool xUSCHF5XCHMAMNEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XCHMAMNAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XCHMAMNAllowShortSignals = true; // Enable Short Signals +// // +// // XCHMAMN ... +// input group "XUSCHF5 XCHMAMN Signaller"; +// input bool xUSCHF5XCHMAMNEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XCHMAMNAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XCHMAMNAllowShortSignals = true; // Enable Short Signals // // Check in Test Mode or not ... @@ -128,27 +128,27 @@ bool xUSCHF5MXTSFIAllowShortSignals = xUSCHF5XTSFIAllowShortSignals; // // XOBDLH ... -bool xUSCHF5MXOBDLHEnableSignaller = xUSCHF5XOBDLHEnableSignaller; -bool xUSCHF5MXOBDLHAllowLongSignals = xUSCHF5XOBDLHAllowLongSignals; -bool xUSCHF5MXOBDLHAllowShortSignals = xUSCHF5XOBDLHAllowShortSignals; +bool xUSCHF5MXOBDLHEnableSignaller = false; // xUSCHF5XOBDLHEnableSignaller; +bool xUSCHF5MXOBDLHAllowLongSignals = false; // xUSCHF5XOBDLHAllowLongSignals; +bool xUSCHF5MXOBDLHAllowShortSignals = false; // xUSCHF5XOBDLHAllowShortSignals; // // XCHMACC ... -bool xUSCHF5MXCHMACCEnableSignaller = xUSCHF5XCHMACCEnableSignaller; -bool xUSCHF5MXCHMACCAllowLongSignals = xUSCHF5XCHMACCAllowLongSignals; -bool xUSCHF5MXCHMACCAllowShortSignals = xUSCHF5XCHMACCAllowShortSignals; +bool xUSCHF5MXCHMACCEnableSignaller = false; // xUSCHF5XCHMACCEnableSignaller; +bool xUSCHF5MXCHMACCAllowLongSignals = false; // xUSCHF5XCHMACCAllowLongSignals; +bool xUSCHF5MXCHMACCAllowShortSignals = false; // xUSCHF5XCHMACCAllowShortSignals; // // XCHMAMX ... -bool xUSCHF5MXCHMAMXEnableSignaller = xUSCHF5XCHMAMXEnableSignaller; -bool xUSCHF5MXCHMAMXAllowLongSignals = xUSCHF5XCHMAMXAllowLongSignals; -bool xUSCHF5MXCHMAMXAllowShortSignals = xUSCHF5XCHMAMXAllowShortSignals; +bool xUSCHF5MXCHMAMXEnableSignaller = false; // xUSCHF5XCHMAMXEnableSignaller; +bool xUSCHF5MXCHMAMXAllowLongSignals = false; // xUSCHF5XCHMAMXAllowLongSignals; +bool xUSCHF5MXCHMAMXAllowShortSignals = false; // xUSCHF5XCHMAMXAllowShortSignals; // // XCHMAMN ... -bool xUSCHF5MXCHMAMNEnableSignaller = xUSCHF5XCHMAMNEnableSignaller; -bool xUSCHF5MXCHMAMNAllowLongSignals = xUSCHF5XCHMAMNAllowLongSignals; -bool xUSCHF5MXCHMAMNAllowShortSignals = xUSCHF5XCHMAMNAllowShortSignals; +bool xUSCHF5MXCHMAMNEnableSignaller = false; // xUSCHF5XCHMAMNEnableSignaller; +bool xUSCHF5MXCHMAMNAllowLongSignals = false; // xUSCHF5XCHMAMNAllowLongSignals; +bool xUSCHF5MXCHMAMNAllowShortSignals = false; // xUSCHF5XCHMAMNAllowShortSignals; // XCPriver *xUSCHF5Provider; @@ -436,31 +436,31 @@ bool XUSCHF5InitIndicators() // // XOBDLH ... - bool isXOBDLHEnable = - xUSCHF5XOBDLHEnableSignaller && - (xUSCHF5XOBDLHAllowLongSignals || - xUSCHF5XOBDLHAllowShortSignals); + bool isXOBDLHEnable = false; + // xUSCHF5XOBDLHEnableSignaller && + // (xUSCHF5XOBDLHAllowLongSignals || + // xUSCHF5XOBDLHAllowShortSignals); // // XCHMACC ... - bool isXCHMACCEnable = - xUSCHF5XCHMACCEnableSignaller && - (xUSCHF5XCHMACCAllowLongSignals || - xUSCHF5XCHMACCAllowShortSignals); + bool isXCHMACCEnable = false; + // xUSCHF5XCHMACCEnableSignaller && + // (xUSCHF5XCHMACCAllowLongSignals || + // xUSCHF5XCHMACCAllowShortSignals); // // XCHMAMX ... - bool isXCHMAMXEnable = - xUSCHF5XCHMAMXEnableSignaller && - (xUSCHF5XCHMAMXAllowLongSignals || - xUSCHF5XCHMAMXAllowShortSignals); + bool isXCHMAMXEnable = false; + // xUSCHF5XCHMAMXEnableSignaller && + // (xUSCHF5XCHMAMXAllowLongSignals || + // xUSCHF5XCHMAMXAllowShortSignals); // // XCHMAMN ... - bool isXCHMAMNEnable = - xUSCHF5XCHMAMNEnableSignaller && - (xUSCHF5XCHMAMNAllowLongSignals || - xUSCHF5XCHMAMNAllowShortSignals); + bool isXCHMAMNEnable = false; + // xUSCHF5XCHMAMNEnableSignaller && + // (xUSCHF5XCHMAMNAllowLongSignals || + // xUSCHF5XCHMAMNAllowShortSignals); // bool hasSignaller = @@ -1103,39 +1103,39 @@ void XUSCHF5DisableLongSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXOBDLHLongs(); - xUSCHF5MXOBDLHAllowLongSignals = false; - } + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXOBDLHLongs(); + // xUSCHF5MXOBDLHAllowLongSignals = false; + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXCHMACCLongs(); - xUSCHF5MXCHMACCAllowLongSignals = false; - } + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXCHMACCLongs(); + // xUSCHF5MXCHMACCAllowLongSignals = false; + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXCHMAMXLongs(); - xUSCHF5MXCHMAMXAllowLongSignals = false; - } + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXCHMAMXLongs(); + // xUSCHF5MXCHMAMXAllowLongSignals = false; + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXCHMAMNLongs(); - xUSCHF5MXCHMAMNAllowLongSignals = false; - } + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXCHMAMNLongs(); + // xUSCHF5MXCHMAMNAllowLongSignals = false; + // } } // @@ -1213,71 +1213,71 @@ void XUSCHF5EnableLongSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5MXOBDLHAllowLongSignals = - xUSCHF5XOBDLHAllowLongSignals - ? true - : xUSCHF5MXOBDLHAllowLongSignals; + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5MXOBDLHAllowLongSignals = + // xUSCHF5XOBDLHAllowLongSignals + // ? true + // : xUSCHF5MXOBDLHAllowLongSignals; - // - if (xUSCHF5MXOBDLHAllowLongSignals) - { - xUSCHF5Provider.EnableXOBDLHLongs(); - } - } + // // + // if (xUSCHF5MXOBDLHAllowLongSignals) + // { + // xUSCHF5Provider.EnableXOBDLHLongs(); + // } + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5MXCHMACCAllowLongSignals = - xUSCHF5XCHMACCAllowLongSignals - ? true - : xUSCHF5MXCHMACCAllowLongSignals; + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5MXCHMACCAllowLongSignals = + // xUSCHF5XCHMACCAllowLongSignals + // ? true + // : xUSCHF5MXCHMACCAllowLongSignals; - // - if (xUSCHF5MXCHMACCAllowLongSignals) - { - xUSCHF5Provider.EnableXCHMACCLongs(); - } - } + // // + // if (xUSCHF5MXCHMACCAllowLongSignals) + // { + // xUSCHF5Provider.EnableXCHMACCLongs(); + // } + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5MXCHMAMXAllowLongSignals = - xUSCHF5XCHMAMXAllowLongSignals - ? true - : xUSCHF5MXCHMAMXAllowLongSignals; + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMXAllowLongSignals = + // xUSCHF5XCHMAMXAllowLongSignals + // ? true + // : xUSCHF5MXCHMAMXAllowLongSignals; - // - if (xUSCHF5MXCHMAMXAllowLongSignals) - { - xUSCHF5Provider.EnableXCHMAMXLongs(); - } - } + // // + // if (xUSCHF5MXCHMAMXAllowLongSignals) + // { + // xUSCHF5Provider.EnableXCHMAMXLongs(); + // } + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5MXCHMAMNAllowLongSignals = - xUSCHF5XCHMAMNAllowLongSignals - ? true - : xUSCHF5MXCHMAMNAllowLongSignals; + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMNAllowLongSignals = + // xUSCHF5XCHMAMNAllowLongSignals + // ? true + // : xUSCHF5MXCHMAMNAllowLongSignals; - // - if (xUSCHF5MXCHMAMNAllowLongSignals) - { - xUSCHF5Provider.EnableXCHMAMNLongs(); - } - } + // // + // if (xUSCHF5MXCHMAMNAllowLongSignals) + // { + // xUSCHF5Provider.EnableXCHMAMNLongs(); + // } + // } } // @@ -1322,39 +1322,39 @@ void XUSCHF5DisableShortSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5Provider.DisableXOBDLHShorts(); - xUSCHF5MXOBDLHAllowShortSignals = false; - } + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXOBDLHShorts(); + // xUSCHF5MXOBDLHAllowShortSignals = false; + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5Provider.DisableXCHMACCShorts(); - xUSCHF5MXCHMACCAllowShortSignals = false; - } + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXCHMACCShorts(); + // xUSCHF5MXCHMACCAllowShortSignals = false; + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5Provider.DisableXCHMAMXShorts(); - xUSCHF5MXCHMAMXAllowShortSignals = false; - } + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXCHMAMXShorts(); + // xUSCHF5MXCHMAMXAllowShortSignals = false; + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5Provider.DisableXCHMAMNShorts(); - xUSCHF5MXCHMAMNAllowShortSignals = false; - } + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXCHMAMNShorts(); + // xUSCHF5MXCHMAMNAllowShortSignals = false; + // } } // @@ -1432,71 +1432,71 @@ void XUSCHF5EnableShortSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5MXOBDLHAllowShortSignals = - xUSCHF5XOBDLHAllowShortSignals - ? true - : xUSCHF5MXOBDLHAllowShortSignals; + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5MXOBDLHAllowShortSignals = + // xUSCHF5XOBDLHAllowShortSignals + // ? true + // : xUSCHF5MXOBDLHAllowShortSignals; - // - if (xUSCHF5MXOBDLHAllowShortSignals) - { - xUSCHF5Provider.EnableXOBDLHShorts(); - } - } + // // + // if (xUSCHF5MXOBDLHAllowShortSignals) + // { + // xUSCHF5Provider.EnableXOBDLHShorts(); + // } + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5MXCHMACCAllowShortSignals = - xUSCHF5XCHMACCAllowShortSignals - ? true - : xUSCHF5MXCHMACCAllowShortSignals; + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5MXCHMACCAllowShortSignals = + // xUSCHF5XCHMACCAllowShortSignals + // ? true + // : xUSCHF5MXCHMACCAllowShortSignals; - // - if (xUSCHF5MXCHMACCAllowShortSignals) - { - xUSCHF5Provider.EnableXCHMACCShorts(); - } - } + // // + // if (xUSCHF5MXCHMACCAllowShortSignals) + // { + // xUSCHF5Provider.EnableXCHMACCShorts(); + // } + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5MXCHMAMXAllowShortSignals = - xUSCHF5XCHMAMXAllowShortSignals - ? true - : xUSCHF5MXCHMAMXAllowShortSignals; + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMXAllowShortSignals = + // xUSCHF5XCHMAMXAllowShortSignals + // ? true + // : xUSCHF5MXCHMAMXAllowShortSignals; - // - if (xUSCHF5MXCHMAMXAllowShortSignals) - { - xUSCHF5Provider.EnableXCHMAMXShorts(); - } - } + // // + // if (xUSCHF5MXCHMAMXAllowShortSignals) + // { + // xUSCHF5Provider.EnableXCHMAMXShorts(); + // } + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5MXCHMAMNAllowShortSignals = - xUSCHF5XCHMAMNAllowShortSignals - ? true - : xUSCHF5MXCHMAMNAllowShortSignals; + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMNAllowShortSignals = + // xUSCHF5XCHMAMNAllowShortSignals + // ? true + // : xUSCHF5MXCHMAMNAllowShortSignals; - // - if (xUSCHF5MXCHMAMNAllowShortSignals) - { - xUSCHF5Provider.EnableXCHMAMNShorts(); - } - } + // // + // if (xUSCHF5MXCHMAMNAllowShortSignals) + // { + // xUSCHF5Provider.EnableXCHMAMNShorts(); + // } + // } } // diff --git a/BKP/Main/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 index 8861a47b..78c15b06 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 @@ -68,11 +68,11 @@ input int xUSCHF5MaxAllowedTrades = 10; input ENUM_X_CROSS_SIGNAL_METHOD xUSCHF5CrossSignalsMethod = X_CROSS_SIGNAL_REGULAR; // Handle Cross Signals Method // // Max Allowed Trade Age ... -input int xUSCHF5MaxAllowedTradeAge = 2000; // Detect Long Time Trades +input int xUSCHF5MaxAllowedTradeAge = 1500; // Detect Long Time Trades input ENUM_X_GUARD_ACTIONS xUSCHF5OldTradesAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // What to do with Old Trades // // Trade Volume Specific Configurations ... -input double xUSCHF5StaticVolumeFactor = 0.0002; // Static Volume baesd on Balance +input double xUSCHF5StaticVolumeFactor = 0.0001; // Static Volume baesd on Balance input ENUM_STATIC_VOLUME_METHODS xUSCHF5StaticVolumeMethod = X_STATIC_VOLUME_BASED_ON_BALANCE; // How to Calculate Static Volume input double xUSCHF5VolumeMultiplier = 0; // Volume Increase Multiplier input double xUSCHF5ApplyVolumeMultiplierFactor = 0; // Apply Volume Multiplier Rate based on Balance diff --git a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index e1d3704b..3c4addef 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -56,33 +56,33 @@ input bool xUSCHF5XTSFIEnableSignaller = true; // Enable Signaller input bool xUSCHF5XTSFIAllowLongSignals = true; // Enable Long Signals input bool xUSCHF5XTSFIAllowShortSignals = true; // Enable Short Signals -// -// XOBDLH ... -input group "XUSCHF5 XOBDLH Signaller"; -input bool xUSCHF5XOBDLHEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XOBDLHAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XOBDLHAllowShortSignals = true; // Enable Short Signals +// // +// // XOBDLH ... +// input group "XUSCHF5 XOBDLH Signaller"; +// input bool xUSCHF5XOBDLHEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XOBDLHAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XOBDLHAllowShortSignals = true; // Enable Short Signals -// -// XCHMACC ... -input group "XUSCHF5 XCHMACC Signaller"; -input bool xUSCHF5XCHMACCEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XCHMACCAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XCHMACCAllowShortSignals = true; // Enable Short Signals +// // +// // XCHMACC ... +// input group "XUSCHF5 XCHMACC Signaller"; +// input bool xUSCHF5XCHMACCEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XCHMACCAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XCHMACCAllowShortSignals = true; // Enable Short Signals -// -// XCHMAMX ... -input group "XUSCHF5 XCHMAMX Signaller"; -input bool xUSCHF5XCHMAMXEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XCHMAMXAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XCHMAMXAllowShortSignals = true; // Enable Short Signals +// // +// // XCHMAMX ... +// input group "XUSCHF5 XCHMAMX Signaller"; +// input bool xUSCHF5XCHMAMXEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XCHMAMXAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XCHMAMXAllowShortSignals = true; // Enable Short Signals -// -// XCHMAMN ... -input group "XUSCHF5 XCHMAMN Signaller"; -input bool xUSCHF5XCHMAMNEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XCHMAMNAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XCHMAMNAllowShortSignals = true; // Enable Short Signals +// // +// // XCHMAMN ... +// input group "XUSCHF5 XCHMAMN Signaller"; +// input bool xUSCHF5XCHMAMNEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XCHMAMNAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XCHMAMNAllowShortSignals = true; // Enable Short Signals // // Check in Test Mode or not ... @@ -128,27 +128,27 @@ bool xUSCHF5MXTSFIAllowShortSignals = xUSCHF5XTSFIAllowShortSignals; // // XOBDLH ... -bool xUSCHF5MXOBDLHEnableSignaller = xUSCHF5XOBDLHEnableSignaller; -bool xUSCHF5MXOBDLHAllowLongSignals = xUSCHF5XOBDLHAllowLongSignals; -bool xUSCHF5MXOBDLHAllowShortSignals = xUSCHF5XOBDLHAllowShortSignals; +bool xUSCHF5MXOBDLHEnableSignaller = false; // xUSCHF5XOBDLHEnableSignaller; +bool xUSCHF5MXOBDLHAllowLongSignals = false; // xUSCHF5XOBDLHAllowLongSignals; +bool xUSCHF5MXOBDLHAllowShortSignals = false; // xUSCHF5XOBDLHAllowShortSignals; // // XCHMACC ... -bool xUSCHF5MXCHMACCEnableSignaller = xUSCHF5XCHMACCEnableSignaller; -bool xUSCHF5MXCHMACCAllowLongSignals = xUSCHF5XCHMACCAllowLongSignals; -bool xUSCHF5MXCHMACCAllowShortSignals = xUSCHF5XCHMACCAllowShortSignals; +bool xUSCHF5MXCHMACCEnableSignaller = false; // xUSCHF5XCHMACCEnableSignaller; +bool xUSCHF5MXCHMACCAllowLongSignals = false; // xUSCHF5XCHMACCAllowLongSignals; +bool xUSCHF5MXCHMACCAllowShortSignals = false; // xUSCHF5XCHMACCAllowShortSignals; // // XCHMAMX ... -bool xUSCHF5MXCHMAMXEnableSignaller = xUSCHF5XCHMAMXEnableSignaller; -bool xUSCHF5MXCHMAMXAllowLongSignals = xUSCHF5XCHMAMXAllowLongSignals; -bool xUSCHF5MXCHMAMXAllowShortSignals = xUSCHF5XCHMAMXAllowShortSignals; +bool xUSCHF5MXCHMAMXEnableSignaller = false; // xUSCHF5XCHMAMXEnableSignaller; +bool xUSCHF5MXCHMAMXAllowLongSignals = false; // xUSCHF5XCHMAMXAllowLongSignals; +bool xUSCHF5MXCHMAMXAllowShortSignals = false; // xUSCHF5XCHMAMXAllowShortSignals; // // XCHMAMN ... -bool xUSCHF5MXCHMAMNEnableSignaller = xUSCHF5XCHMAMNEnableSignaller; -bool xUSCHF5MXCHMAMNAllowLongSignals = xUSCHF5XCHMAMNAllowLongSignals; -bool xUSCHF5MXCHMAMNAllowShortSignals = xUSCHF5XCHMAMNAllowShortSignals; +bool xUSCHF5MXCHMAMNEnableSignaller = false; // xUSCHF5XCHMAMNEnableSignaller; +bool xUSCHF5MXCHMAMNAllowLongSignals = false; // xUSCHF5XCHMAMNAllowLongSignals; +bool xUSCHF5MXCHMAMNAllowShortSignals = false; // xUSCHF5XCHMAMNAllowShortSignals; // XCPriver *xUSCHF5Provider; @@ -436,31 +436,31 @@ bool XUSCHF5InitIndicators() // // XOBDLH ... - bool isXOBDLHEnable = - xUSCHF5XOBDLHEnableSignaller && - (xUSCHF5XOBDLHAllowLongSignals || - xUSCHF5XOBDLHAllowShortSignals); + bool isXOBDLHEnable = false; + // xUSCHF5XOBDLHEnableSignaller && + // (xUSCHF5XOBDLHAllowLongSignals || + // xUSCHF5XOBDLHAllowShortSignals); // // XCHMACC ... - bool isXCHMACCEnable = - xUSCHF5XCHMACCEnableSignaller && - (xUSCHF5XCHMACCAllowLongSignals || - xUSCHF5XCHMACCAllowShortSignals); + bool isXCHMACCEnable = false; + // xUSCHF5XCHMACCEnableSignaller && + // (xUSCHF5XCHMACCAllowLongSignals || + // xUSCHF5XCHMACCAllowShortSignals); // // XCHMAMX ... - bool isXCHMAMXEnable = - xUSCHF5XCHMAMXEnableSignaller && - (xUSCHF5XCHMAMXAllowLongSignals || - xUSCHF5XCHMAMXAllowShortSignals); + bool isXCHMAMXEnable = false; + // xUSCHF5XCHMAMXEnableSignaller && + // (xUSCHF5XCHMAMXAllowLongSignals || + // xUSCHF5XCHMAMXAllowShortSignals); // // XCHMAMN ... - bool isXCHMAMNEnable = - xUSCHF5XCHMAMNEnableSignaller && - (xUSCHF5XCHMAMNAllowLongSignals || - xUSCHF5XCHMAMNAllowShortSignals); + bool isXCHMAMNEnable = false; + // xUSCHF5XCHMAMNEnableSignaller && + // (xUSCHF5XCHMAMNAllowLongSignals || + // xUSCHF5XCHMAMNAllowShortSignals); // bool hasSignaller = @@ -1103,39 +1103,39 @@ void XUSCHF5DisableLongSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXOBDLHLongs(); - xUSCHF5MXOBDLHAllowLongSignals = false; - } + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXOBDLHLongs(); + // xUSCHF5MXOBDLHAllowLongSignals = false; + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXCHMACCLongs(); - xUSCHF5MXCHMACCAllowLongSignals = false; - } + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXCHMACCLongs(); + // xUSCHF5MXCHMACCAllowLongSignals = false; + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXCHMAMXLongs(); - xUSCHF5MXCHMAMXAllowLongSignals = false; - } + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXCHMAMXLongs(); + // xUSCHF5MXCHMAMXAllowLongSignals = false; + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXCHMAMNLongs(); - xUSCHF5MXCHMAMNAllowLongSignals = false; - } + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXCHMAMNLongs(); + // xUSCHF5MXCHMAMNAllowLongSignals = false; + // } } // @@ -1213,71 +1213,71 @@ void XUSCHF5EnableLongSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5MXOBDLHAllowLongSignals = - xUSCHF5XOBDLHAllowLongSignals - ? true - : xUSCHF5MXOBDLHAllowLongSignals; + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5MXOBDLHAllowLongSignals = + // xUSCHF5XOBDLHAllowLongSignals + // ? true + // : xUSCHF5MXOBDLHAllowLongSignals; - // - if (xUSCHF5MXOBDLHAllowLongSignals) - { - xUSCHF5Provider.EnableXOBDLHLongs(); - } - } + // // + // if (xUSCHF5MXOBDLHAllowLongSignals) + // { + // xUSCHF5Provider.EnableXOBDLHLongs(); + // } + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5MXCHMACCAllowLongSignals = - xUSCHF5XCHMACCAllowLongSignals - ? true - : xUSCHF5MXCHMACCAllowLongSignals; + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5MXCHMACCAllowLongSignals = + // xUSCHF5XCHMACCAllowLongSignals + // ? true + // : xUSCHF5MXCHMACCAllowLongSignals; - // - if (xUSCHF5MXCHMACCAllowLongSignals) - { - xUSCHF5Provider.EnableXCHMACCLongs(); - } - } + // // + // if (xUSCHF5MXCHMACCAllowLongSignals) + // { + // xUSCHF5Provider.EnableXCHMACCLongs(); + // } + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5MXCHMAMXAllowLongSignals = - xUSCHF5XCHMAMXAllowLongSignals - ? true - : xUSCHF5MXCHMAMXAllowLongSignals; + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMXAllowLongSignals = + // xUSCHF5XCHMAMXAllowLongSignals + // ? true + // : xUSCHF5MXCHMAMXAllowLongSignals; - // - if (xUSCHF5MXCHMAMXAllowLongSignals) - { - xUSCHF5Provider.EnableXCHMAMXLongs(); - } - } + // // + // if (xUSCHF5MXCHMAMXAllowLongSignals) + // { + // xUSCHF5Provider.EnableXCHMAMXLongs(); + // } + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5MXCHMAMNAllowLongSignals = - xUSCHF5XCHMAMNAllowLongSignals - ? true - : xUSCHF5MXCHMAMNAllowLongSignals; + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMNAllowLongSignals = + // xUSCHF5XCHMAMNAllowLongSignals + // ? true + // : xUSCHF5MXCHMAMNAllowLongSignals; - // - if (xUSCHF5MXCHMAMNAllowLongSignals) - { - xUSCHF5Provider.EnableXCHMAMNLongs(); - } - } + // // + // if (xUSCHF5MXCHMAMNAllowLongSignals) + // { + // xUSCHF5Provider.EnableXCHMAMNLongs(); + // } + // } } // @@ -1322,39 +1322,39 @@ void XUSCHF5DisableShortSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5Provider.DisableXOBDLHShorts(); - xUSCHF5MXOBDLHAllowShortSignals = false; - } + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXOBDLHShorts(); + // xUSCHF5MXOBDLHAllowShortSignals = false; + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5Provider.DisableXCHMACCShorts(); - xUSCHF5MXCHMACCAllowShortSignals = false; - } + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXCHMACCShorts(); + // xUSCHF5MXCHMACCAllowShortSignals = false; + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5Provider.DisableXCHMAMXShorts(); - xUSCHF5MXCHMAMXAllowShortSignals = false; - } + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXCHMAMXShorts(); + // xUSCHF5MXCHMAMXAllowShortSignals = false; + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5Provider.DisableXCHMAMNShorts(); - xUSCHF5MXCHMAMNAllowShortSignals = false; - } + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXCHMAMNShorts(); + // xUSCHF5MXCHMAMNAllowShortSignals = false; + // } } // @@ -1432,71 +1432,71 @@ void XUSCHF5EnableShortSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5MXOBDLHAllowShortSignals = - xUSCHF5XOBDLHAllowShortSignals - ? true - : xUSCHF5MXOBDLHAllowShortSignals; + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5MXOBDLHAllowShortSignals = + // xUSCHF5XOBDLHAllowShortSignals + // ? true + // : xUSCHF5MXOBDLHAllowShortSignals; - // - if (xUSCHF5MXOBDLHAllowShortSignals) - { - xUSCHF5Provider.EnableXOBDLHShorts(); - } - } + // // + // if (xUSCHF5MXOBDLHAllowShortSignals) + // { + // xUSCHF5Provider.EnableXOBDLHShorts(); + // } + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5MXCHMACCAllowShortSignals = - xUSCHF5XCHMACCAllowShortSignals - ? true - : xUSCHF5MXCHMACCAllowShortSignals; + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5MXCHMACCAllowShortSignals = + // xUSCHF5XCHMACCAllowShortSignals + // ? true + // : xUSCHF5MXCHMACCAllowShortSignals; - // - if (xUSCHF5MXCHMACCAllowShortSignals) - { - xUSCHF5Provider.EnableXCHMACCShorts(); - } - } + // // + // if (xUSCHF5MXCHMACCAllowShortSignals) + // { + // xUSCHF5Provider.EnableXCHMACCShorts(); + // } + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5MXCHMAMXAllowShortSignals = - xUSCHF5XCHMAMXAllowShortSignals - ? true - : xUSCHF5MXCHMAMXAllowShortSignals; + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMXAllowShortSignals = + // xUSCHF5XCHMAMXAllowShortSignals + // ? true + // : xUSCHF5MXCHMAMXAllowShortSignals; - // - if (xUSCHF5MXCHMAMXAllowShortSignals) - { - xUSCHF5Provider.EnableXCHMAMXShorts(); - } - } + // // + // if (xUSCHF5MXCHMAMXAllowShortSignals) + // { + // xUSCHF5Provider.EnableXCHMAMXShorts(); + // } + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5MXCHMAMNAllowShortSignals = - xUSCHF5XCHMAMNAllowShortSignals - ? true - : xUSCHF5MXCHMAMNAllowShortSignals; + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMNAllowShortSignals = + // xUSCHF5XCHMAMNAllowShortSignals + // ? true + // : xUSCHF5MXCHMAMNAllowShortSignals; - // - if (xUSCHF5MXCHMAMNAllowShortSignals) - { - xUSCHF5Provider.EnableXCHMAMNShorts(); - } - } + // // + // if (xUSCHF5MXCHMAMNAllowShortSignals) + // { + // xUSCHF5Provider.EnableXCHMAMNShorts(); + // } + // } } // diff --git a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 index 8861a47b..78c15b06 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 @@ -68,11 +68,11 @@ input int xUSCHF5MaxAllowedTrades = 10; input ENUM_X_CROSS_SIGNAL_METHOD xUSCHF5CrossSignalsMethod = X_CROSS_SIGNAL_REGULAR; // Handle Cross Signals Method // // Max Allowed Trade Age ... -input int xUSCHF5MaxAllowedTradeAge = 2000; // Detect Long Time Trades +input int xUSCHF5MaxAllowedTradeAge = 1500; // Detect Long Time Trades input ENUM_X_GUARD_ACTIONS xUSCHF5OldTradesAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // What to do with Old Trades // // Trade Volume Specific Configurations ... -input double xUSCHF5StaticVolumeFactor = 0.0002; // Static Volume baesd on Balance +input double xUSCHF5StaticVolumeFactor = 0.0001; // Static Volume baesd on Balance input ENUM_STATIC_VOLUME_METHODS xUSCHF5StaticVolumeMethod = X_STATIC_VOLUME_BASED_ON_BALANCE; // How to Calculate Static Volume input double xUSCHF5VolumeMultiplier = 0; // Volume Increase Multiplier input double xUSCHF5ApplyVolumeMultiplierFactor = 0; // Apply Volume Multiplier Rate based on Balance diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index e1d3704b..3c4addef 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -56,33 +56,33 @@ input bool xUSCHF5XTSFIEnableSignaller = true; // Enable Signaller input bool xUSCHF5XTSFIAllowLongSignals = true; // Enable Long Signals input bool xUSCHF5XTSFIAllowShortSignals = true; // Enable Short Signals -// -// XOBDLH ... -input group "XUSCHF5 XOBDLH Signaller"; -input bool xUSCHF5XOBDLHEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XOBDLHAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XOBDLHAllowShortSignals = true; // Enable Short Signals +// // +// // XOBDLH ... +// input group "XUSCHF5 XOBDLH Signaller"; +// input bool xUSCHF5XOBDLHEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XOBDLHAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XOBDLHAllowShortSignals = true; // Enable Short Signals -// -// XCHMACC ... -input group "XUSCHF5 XCHMACC Signaller"; -input bool xUSCHF5XCHMACCEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XCHMACCAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XCHMACCAllowShortSignals = true; // Enable Short Signals +// // +// // XCHMACC ... +// input group "XUSCHF5 XCHMACC Signaller"; +// input bool xUSCHF5XCHMACCEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XCHMACCAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XCHMACCAllowShortSignals = true; // Enable Short Signals -// -// XCHMAMX ... -input group "XUSCHF5 XCHMAMX Signaller"; -input bool xUSCHF5XCHMAMXEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XCHMAMXAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XCHMAMXAllowShortSignals = true; // Enable Short Signals +// // +// // XCHMAMX ... +// input group "XUSCHF5 XCHMAMX Signaller"; +// input bool xUSCHF5XCHMAMXEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XCHMAMXAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XCHMAMXAllowShortSignals = true; // Enable Short Signals -// -// XCHMAMN ... -input group "XUSCHF5 XCHMAMN Signaller"; -input bool xUSCHF5XCHMAMNEnableSignaller = true; // Enable Signaller -input bool xUSCHF5XCHMAMNAllowLongSignals = true; // Enable Long Signals -input bool xUSCHF5XCHMAMNAllowShortSignals = true; // Enable Short Signals +// // +// // XCHMAMN ... +// input group "XUSCHF5 XCHMAMN Signaller"; +// input bool xUSCHF5XCHMAMNEnableSignaller = true; // Enable Signaller +// input bool xUSCHF5XCHMAMNAllowLongSignals = true; // Enable Long Signals +// input bool xUSCHF5XCHMAMNAllowShortSignals = true; // Enable Short Signals // // Check in Test Mode or not ... @@ -128,27 +128,27 @@ bool xUSCHF5MXTSFIAllowShortSignals = xUSCHF5XTSFIAllowShortSignals; // // XOBDLH ... -bool xUSCHF5MXOBDLHEnableSignaller = xUSCHF5XOBDLHEnableSignaller; -bool xUSCHF5MXOBDLHAllowLongSignals = xUSCHF5XOBDLHAllowLongSignals; -bool xUSCHF5MXOBDLHAllowShortSignals = xUSCHF5XOBDLHAllowShortSignals; +bool xUSCHF5MXOBDLHEnableSignaller = false; // xUSCHF5XOBDLHEnableSignaller; +bool xUSCHF5MXOBDLHAllowLongSignals = false; // xUSCHF5XOBDLHAllowLongSignals; +bool xUSCHF5MXOBDLHAllowShortSignals = false; // xUSCHF5XOBDLHAllowShortSignals; // // XCHMACC ... -bool xUSCHF5MXCHMACCEnableSignaller = xUSCHF5XCHMACCEnableSignaller; -bool xUSCHF5MXCHMACCAllowLongSignals = xUSCHF5XCHMACCAllowLongSignals; -bool xUSCHF5MXCHMACCAllowShortSignals = xUSCHF5XCHMACCAllowShortSignals; +bool xUSCHF5MXCHMACCEnableSignaller = false; // xUSCHF5XCHMACCEnableSignaller; +bool xUSCHF5MXCHMACCAllowLongSignals = false; // xUSCHF5XCHMACCAllowLongSignals; +bool xUSCHF5MXCHMACCAllowShortSignals = false; // xUSCHF5XCHMACCAllowShortSignals; // // XCHMAMX ... -bool xUSCHF5MXCHMAMXEnableSignaller = xUSCHF5XCHMAMXEnableSignaller; -bool xUSCHF5MXCHMAMXAllowLongSignals = xUSCHF5XCHMAMXAllowLongSignals; -bool xUSCHF5MXCHMAMXAllowShortSignals = xUSCHF5XCHMAMXAllowShortSignals; +bool xUSCHF5MXCHMAMXEnableSignaller = false; // xUSCHF5XCHMAMXEnableSignaller; +bool xUSCHF5MXCHMAMXAllowLongSignals = false; // xUSCHF5XCHMAMXAllowLongSignals; +bool xUSCHF5MXCHMAMXAllowShortSignals = false; // xUSCHF5XCHMAMXAllowShortSignals; // // XCHMAMN ... -bool xUSCHF5MXCHMAMNEnableSignaller = xUSCHF5XCHMAMNEnableSignaller; -bool xUSCHF5MXCHMAMNAllowLongSignals = xUSCHF5XCHMAMNAllowLongSignals; -bool xUSCHF5MXCHMAMNAllowShortSignals = xUSCHF5XCHMAMNAllowShortSignals; +bool xUSCHF5MXCHMAMNEnableSignaller = false; // xUSCHF5XCHMAMNEnableSignaller; +bool xUSCHF5MXCHMAMNAllowLongSignals = false; // xUSCHF5XCHMAMNAllowLongSignals; +bool xUSCHF5MXCHMAMNAllowShortSignals = false; // xUSCHF5XCHMAMNAllowShortSignals; // XCPriver *xUSCHF5Provider; @@ -436,31 +436,31 @@ bool XUSCHF5InitIndicators() // // XOBDLH ... - bool isXOBDLHEnable = - xUSCHF5XOBDLHEnableSignaller && - (xUSCHF5XOBDLHAllowLongSignals || - xUSCHF5XOBDLHAllowShortSignals); + bool isXOBDLHEnable = false; + // xUSCHF5XOBDLHEnableSignaller && + // (xUSCHF5XOBDLHAllowLongSignals || + // xUSCHF5XOBDLHAllowShortSignals); // // XCHMACC ... - bool isXCHMACCEnable = - xUSCHF5XCHMACCEnableSignaller && - (xUSCHF5XCHMACCAllowLongSignals || - xUSCHF5XCHMACCAllowShortSignals); + bool isXCHMACCEnable = false; + // xUSCHF5XCHMACCEnableSignaller && + // (xUSCHF5XCHMACCAllowLongSignals || + // xUSCHF5XCHMACCAllowShortSignals); // // XCHMAMX ... - bool isXCHMAMXEnable = - xUSCHF5XCHMAMXEnableSignaller && - (xUSCHF5XCHMAMXAllowLongSignals || - xUSCHF5XCHMAMXAllowShortSignals); + bool isXCHMAMXEnable = false; + // xUSCHF5XCHMAMXEnableSignaller && + // (xUSCHF5XCHMAMXAllowLongSignals || + // xUSCHF5XCHMAMXAllowShortSignals); // // XCHMAMN ... - bool isXCHMAMNEnable = - xUSCHF5XCHMAMNEnableSignaller && - (xUSCHF5XCHMAMNAllowLongSignals || - xUSCHF5XCHMAMNAllowShortSignals); + bool isXCHMAMNEnable = false; + // xUSCHF5XCHMAMNEnableSignaller && + // (xUSCHF5XCHMAMNAllowLongSignals || + // xUSCHF5XCHMAMNAllowShortSignals); // bool hasSignaller = @@ -1103,39 +1103,39 @@ void XUSCHF5DisableLongSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXOBDLHLongs(); - xUSCHF5MXOBDLHAllowLongSignals = false; - } + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXOBDLHLongs(); + // xUSCHF5MXOBDLHAllowLongSignals = false; + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXCHMACCLongs(); - xUSCHF5MXCHMACCAllowLongSignals = false; - } + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXCHMACCLongs(); + // xUSCHF5MXCHMACCAllowLongSignals = false; + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXCHMAMXLongs(); - xUSCHF5MXCHMAMXAllowLongSignals = false; - } + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXCHMAMXLongs(); + // xUSCHF5MXCHMAMXAllowLongSignals = false; + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5Provider.DisbaleXCHMAMNLongs(); - xUSCHF5MXCHMAMNAllowLongSignals = false; - } + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5Provider.DisbaleXCHMAMNLongs(); + // xUSCHF5MXCHMAMNAllowLongSignals = false; + // } } // @@ -1213,71 +1213,71 @@ void XUSCHF5EnableLongSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5MXOBDLHAllowLongSignals = - xUSCHF5XOBDLHAllowLongSignals - ? true - : xUSCHF5MXOBDLHAllowLongSignals; + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5MXOBDLHAllowLongSignals = + // xUSCHF5XOBDLHAllowLongSignals + // ? true + // : xUSCHF5MXOBDLHAllowLongSignals; - // - if (xUSCHF5MXOBDLHAllowLongSignals) - { - xUSCHF5Provider.EnableXOBDLHLongs(); - } - } + // // + // if (xUSCHF5MXOBDLHAllowLongSignals) + // { + // xUSCHF5Provider.EnableXOBDLHLongs(); + // } + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5MXCHMACCAllowLongSignals = - xUSCHF5XCHMACCAllowLongSignals - ? true - : xUSCHF5MXCHMACCAllowLongSignals; + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5MXCHMACCAllowLongSignals = + // xUSCHF5XCHMACCAllowLongSignals + // ? true + // : xUSCHF5MXCHMACCAllowLongSignals; - // - if (xUSCHF5MXCHMACCAllowLongSignals) - { - xUSCHF5Provider.EnableXCHMACCLongs(); - } - } + // // + // if (xUSCHF5MXCHMACCAllowLongSignals) + // { + // xUSCHF5Provider.EnableXCHMACCLongs(); + // } + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5MXCHMAMXAllowLongSignals = - xUSCHF5XCHMAMXAllowLongSignals - ? true - : xUSCHF5MXCHMAMXAllowLongSignals; + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMXAllowLongSignals = + // xUSCHF5XCHMAMXAllowLongSignals + // ? true + // : xUSCHF5MXCHMAMXAllowLongSignals; - // - if (xUSCHF5MXCHMAMXAllowLongSignals) - { - xUSCHF5Provider.EnableXCHMAMXLongs(); - } - } + // // + // if (xUSCHF5MXCHMAMXAllowLongSignals) + // { + // xUSCHF5Provider.EnableXCHMAMXLongs(); + // } + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5MXCHMAMNAllowLongSignals = - xUSCHF5XCHMAMNAllowLongSignals - ? true - : xUSCHF5MXCHMAMNAllowLongSignals; + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMNAllowLongSignals = + // xUSCHF5XCHMAMNAllowLongSignals + // ? true + // : xUSCHF5MXCHMAMNAllowLongSignals; - // - if (xUSCHF5MXCHMAMNAllowLongSignals) - { - xUSCHF5Provider.EnableXCHMAMNLongs(); - } - } + // // + // if (xUSCHF5MXCHMAMNAllowLongSignals) + // { + // xUSCHF5Provider.EnableXCHMAMNLongs(); + // } + // } } // @@ -1322,39 +1322,39 @@ void XUSCHF5DisableShortSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5Provider.DisableXOBDLHShorts(); - xUSCHF5MXOBDLHAllowShortSignals = false; - } + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXOBDLHShorts(); + // xUSCHF5MXOBDLHAllowShortSignals = false; + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5Provider.DisableXCHMACCShorts(); - xUSCHF5MXCHMACCAllowShortSignals = false; - } + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXCHMACCShorts(); + // xUSCHF5MXCHMACCAllowShortSignals = false; + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5Provider.DisableXCHMAMXShorts(); - xUSCHF5MXCHMAMXAllowShortSignals = false; - } + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXCHMAMXShorts(); + // xUSCHF5MXCHMAMXAllowShortSignals = false; + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5Provider.DisableXCHMAMNShorts(); - xUSCHF5MXCHMAMNAllowShortSignals = false; - } + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5Provider.DisableXCHMAMNShorts(); + // xUSCHF5MXCHMAMNAllowShortSignals = false; + // } } // @@ -1432,71 +1432,71 @@ void XUSCHF5EnableShortSignallers() // // XOBDLH ... - if (xUSCHF5MXOBDLHEnableSignaller) - { - // - xUSCHF5MXOBDLHAllowShortSignals = - xUSCHF5XOBDLHAllowShortSignals - ? true - : xUSCHF5MXOBDLHAllowShortSignals; + // if (xUSCHF5MXOBDLHEnableSignaller) + // { + // // + // xUSCHF5MXOBDLHAllowShortSignals = + // xUSCHF5XOBDLHAllowShortSignals + // ? true + // : xUSCHF5MXOBDLHAllowShortSignals; - // - if (xUSCHF5MXOBDLHAllowShortSignals) - { - xUSCHF5Provider.EnableXOBDLHShorts(); - } - } + // // + // if (xUSCHF5MXOBDLHAllowShortSignals) + // { + // xUSCHF5Provider.EnableXOBDLHShorts(); + // } + // } // // XCHMACC ... - if (xUSCHF5MXCHMACCEnableSignaller) - { - // - xUSCHF5MXCHMACCAllowShortSignals = - xUSCHF5XCHMACCAllowShortSignals - ? true - : xUSCHF5MXCHMACCAllowShortSignals; + // if (xUSCHF5MXCHMACCEnableSignaller) + // { + // // + // xUSCHF5MXCHMACCAllowShortSignals = + // xUSCHF5XCHMACCAllowShortSignals + // ? true + // : xUSCHF5MXCHMACCAllowShortSignals; - // - if (xUSCHF5MXCHMACCAllowShortSignals) - { - xUSCHF5Provider.EnableXCHMACCShorts(); - } - } + // // + // if (xUSCHF5MXCHMACCAllowShortSignals) + // { + // xUSCHF5Provider.EnableXCHMACCShorts(); + // } + // } // // XCHMAMX ... - if (xUSCHF5MXCHMAMXEnableSignaller) - { - // - xUSCHF5MXCHMAMXAllowShortSignals = - xUSCHF5XCHMAMXAllowShortSignals - ? true - : xUSCHF5MXCHMAMXAllowShortSignals; + // if (xUSCHF5MXCHMAMXEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMXAllowShortSignals = + // xUSCHF5XCHMAMXAllowShortSignals + // ? true + // : xUSCHF5MXCHMAMXAllowShortSignals; - // - if (xUSCHF5MXCHMAMXAllowShortSignals) - { - xUSCHF5Provider.EnableXCHMAMXShorts(); - } - } + // // + // if (xUSCHF5MXCHMAMXAllowShortSignals) + // { + // xUSCHF5Provider.EnableXCHMAMXShorts(); + // } + // } // // XCHMAMN ... - if (xUSCHF5MXCHMAMNEnableSignaller) - { - // - xUSCHF5MXCHMAMNAllowShortSignals = - xUSCHF5XCHMAMNAllowShortSignals - ? true - : xUSCHF5MXCHMAMNAllowShortSignals; + // if (xUSCHF5MXCHMAMNEnableSignaller) + // { + // // + // xUSCHF5MXCHMAMNAllowShortSignals = + // xUSCHF5XCHMAMNAllowShortSignals + // ? true + // : xUSCHF5MXCHMAMNAllowShortSignals; - // - if (xUSCHF5MXCHMAMNAllowShortSignals) - { - xUSCHF5Provider.EnableXCHMAMNShorts(); - } - } + // // + // if (xUSCHF5MXCHMAMNAllowShortSignals) + // { + // xUSCHF5Provider.EnableXCHMAMNShorts(); + // } + // } } // diff --git a/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 index 8861a47b..78c15b06 100644 --- a/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.inputs.lib.mq5 @@ -68,11 +68,11 @@ input int xUSCHF5MaxAllowedTrades = 10; input ENUM_X_CROSS_SIGNAL_METHOD xUSCHF5CrossSignalsMethod = X_CROSS_SIGNAL_REGULAR; // Handle Cross Signals Method // // Max Allowed Trade Age ... -input int xUSCHF5MaxAllowedTradeAge = 2000; // Detect Long Time Trades +input int xUSCHF5MaxAllowedTradeAge = 1500; // Detect Long Time Trades input ENUM_X_GUARD_ACTIONS xUSCHF5OldTradesAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // What to do with Old Trades // // Trade Volume Specific Configurations ... -input double xUSCHF5StaticVolumeFactor = 0.0002; // Static Volume baesd on Balance +input double xUSCHF5StaticVolumeFactor = 0.0001; // Static Volume baesd on Balance input ENUM_STATIC_VOLUME_METHODS xUSCHF5StaticVolumeMethod = X_STATIC_VOLUME_BASED_ON_BALANCE; // How to Calculate Static Volume input double xUSCHF5VolumeMultiplier = 0; // Volume Increase Multiplier input double xUSCHF5ApplyVolumeMultiplierFactor = 0; // Apply Volume Multiplier Rate based on Balance