diff --git a/Projects/XAU5/Classes/x-saherelm.class.lib.ex5 b/Projects/XAU5/Classes/x-saherelm.class.lib.ex5 index f4eddb7..f3c4aae 100644 Binary files a/Projects/XAU5/Classes/x-saherelm.class.lib.ex5 and b/Projects/XAU5/Classes/x-saherelm.class.lib.ex5 differ diff --git a/Projects/XAU5/Classes/x-saherelm.nn.lib.ex5 b/Projects/XAU5/Classes/x-saherelm.nn.lib.ex5 index 58a232f..5d997ab 100644 Binary files a/Projects/XAU5/Classes/x-saherelm.nn.lib.ex5 and b/Projects/XAU5/Classes/x-saherelm.nn.lib.ex5 differ diff --git a/Projects/XAU5/Classes/x-saherelm.provider.lib.ex5 b/Projects/XAU5/Classes/x-saherelm.provider.lib.ex5 index 6455a64..0fbe3ba 100644 Binary files a/Projects/XAU5/Classes/x-saherelm.provider.lib.ex5 and b/Projects/XAU5/Classes/x-saherelm.provider.lib.ex5 differ diff --git a/Projects/XAU5/Classes/x-saherelm.provider.lib.mq5 b/Projects/XAU5/Classes/x-saherelm.provider.lib.mq5 index 765544c..6327916 100644 --- a/Projects/XAU5/Classes/x-saherelm.provider.lib.mq5 +++ b/Projects/XAU5/Classes/x-saherelm.provider.lib.mq5 @@ -254,14 +254,14 @@ struct XMarketConditions // // -class XCPriver : public XCBase +class XCProvider : public XCBase { // // Public ... public: // // Constructor ... - XCPriver( + XCProvider( // // Common Requirements ... string xSymbol, // Which Symbol is Used @@ -362,7 +362,7 @@ public: // // Deconstructor ... - ~XCPriver() {} + ~XCProvider() {} // // START Common Functions ... diff --git a/Projects/XAU5/Experts/x-saherelm.xau5.ea.ex5 b/Projects/XAU5/Experts/x-saherelm.xau5.ea.ex5 index fa547aa..d7451c6 100644 Binary files a/Projects/XAU5/Experts/x-saherelm.xau5.ea.ex5 and b/Projects/XAU5/Experts/x-saherelm.xau5.ea.ex5 differ diff --git a/Projects/XAU5/Helpers/x-saherelm.xama.indicator.helper.lib.ex5 b/Projects/XAU5/Helpers/x-saherelm.xama.indicator.helper.lib.ex5 index 648e22f..f464462 100644 Binary files a/Projects/XAU5/Helpers/x-saherelm.xama.indicator.helper.lib.ex5 and b/Projects/XAU5/Helpers/x-saherelm.xama.indicator.helper.lib.ex5 differ diff --git a/Projects/XAU5/Helpers/x-saherelm.xchlh.oscillator.helper.lib.ex5 b/Projects/XAU5/Helpers/x-saherelm.xchlh.oscillator.helper.lib.ex5 index 669fc0e..9c882dd 100644 Binary files a/Projects/XAU5/Helpers/x-saherelm.xchlh.oscillator.helper.lib.ex5 and b/Projects/XAU5/Helpers/x-saherelm.xchlh.oscillator.helper.lib.ex5 differ diff --git a/Projects/XAU5/Helpers/x-saherelm.xchma.oscillator.helper.lib.ex5 b/Projects/XAU5/Helpers/x-saherelm.xchma.oscillator.helper.lib.ex5 index 4e2fe2f..f70d8f1 100644 Binary files a/Projects/XAU5/Helpers/x-saherelm.xchma.oscillator.helper.lib.ex5 and b/Projects/XAU5/Helpers/x-saherelm.xchma.oscillator.helper.lib.ex5 differ diff --git a/Projects/XAU5/Helpers/x-saherelm.xfi.oscillator.helper.lib.ex5 b/Projects/XAU5/Helpers/x-saherelm.xfi.oscillator.helper.lib.ex5 index 30ecc16..5e3b86c 100644 Binary files a/Projects/XAU5/Helpers/x-saherelm.xfi.oscillator.helper.lib.ex5 and b/Projects/XAU5/Helpers/x-saherelm.xfi.oscillator.helper.lib.ex5 differ diff --git a/Projects/XAU5/Helpers/x-saherelm.xlh.indicator.helper.lib.ex5 b/Projects/XAU5/Helpers/x-saherelm.xlh.indicator.helper.lib.ex5 index 9f1bd1a..5bc9985 100644 Binary files a/Projects/XAU5/Helpers/x-saherelm.xlh.indicator.helper.lib.ex5 and b/Projects/XAU5/Helpers/x-saherelm.xlh.indicator.helper.lib.ex5 differ diff --git a/Projects/XAU5/Helpers/x-saherelm.xobd.indicator.helper.lib.ex5 b/Projects/XAU5/Helpers/x-saherelm.xobd.indicator.helper.lib.ex5 index 26c6295..423a380 100644 Binary files a/Projects/XAU5/Helpers/x-saherelm.xobd.indicator.helper.lib.ex5 and b/Projects/XAU5/Helpers/x-saherelm.xobd.indicator.helper.lib.ex5 differ diff --git a/Projects/XAU5/Helpers/x-saherelm.xrsi.oscillator.helper.lib.ex5 b/Projects/XAU5/Helpers/x-saherelm.xrsi.oscillator.helper.lib.ex5 index 0b94d6b..f4006d0 100644 Binary files a/Projects/XAU5/Helpers/x-saherelm.xrsi.oscillator.helper.lib.ex5 and b/Projects/XAU5/Helpers/x-saherelm.xrsi.oscillator.helper.lib.ex5 differ diff --git a/Projects/XAU5/Helpers/x-saherelm.xtd.oscillator.helper.lib.ex5 b/Projects/XAU5/Helpers/x-saherelm.xtd.oscillator.helper.lib.ex5 index 045f360..c3ad626 100644 Binary files a/Projects/XAU5/Helpers/x-saherelm.xtd.oscillator.helper.lib.ex5 and b/Projects/XAU5/Helpers/x-saherelm.xtd.oscillator.helper.lib.ex5 differ diff --git a/Projects/XAU5/Helpers/x-saherelm.xtm.indicator.helper.lib.ex5 b/Projects/XAU5/Helpers/x-saherelm.xtm.indicator.helper.lib.ex5 index af1e7b5..708d601 100644 Binary files a/Projects/XAU5/Helpers/x-saherelm.xtm.indicator.helper.lib.ex5 and b/Projects/XAU5/Helpers/x-saherelm.xtm.indicator.helper.lib.ex5 differ diff --git a/Projects/XAU5/Helpers/x-saherelm.xts.oscillator.helper.lib.ex5 b/Projects/XAU5/Helpers/x-saherelm.xts.oscillator.helper.lib.ex5 index c6e4d59..5a41529 100644 Binary files a/Projects/XAU5/Helpers/x-saherelm.xts.oscillator.helper.lib.ex5 and b/Projects/XAU5/Helpers/x-saherelm.xts.oscillator.helper.lib.ex5 differ diff --git a/Projects/XAU5/Indicators/x-saherelm.xama.indicator.ex5 b/Projects/XAU5/Indicators/x-saherelm.xama.indicator.ex5 index f848d2b..0e23a70 100644 Binary files a/Projects/XAU5/Indicators/x-saherelm.xama.indicator.ex5 and b/Projects/XAU5/Indicators/x-saherelm.xama.indicator.ex5 differ diff --git a/Projects/XAU5/Indicators/x-saherelm.xchlh.oscillator.ex5 b/Projects/XAU5/Indicators/x-saherelm.xchlh.oscillator.ex5 index e86669f..4fe5165 100644 Binary files a/Projects/XAU5/Indicators/x-saherelm.xchlh.oscillator.ex5 and b/Projects/XAU5/Indicators/x-saherelm.xchlh.oscillator.ex5 differ diff --git a/Projects/XAU5/Indicators/x-saherelm.xchma.oscillator.ex5 b/Projects/XAU5/Indicators/x-saherelm.xchma.oscillator.ex5 index 010c6ea..602714e 100644 Binary files a/Projects/XAU5/Indicators/x-saherelm.xchma.oscillator.ex5 and b/Projects/XAU5/Indicators/x-saherelm.xchma.oscillator.ex5 differ diff --git a/Projects/XAU5/Indicators/x-saherelm.xctimer.indicator.ex5 b/Projects/XAU5/Indicators/x-saherelm.xctimer.indicator.ex5 index 2d4fd6c..b94d8b7 100644 Binary files a/Projects/XAU5/Indicators/x-saherelm.xctimer.indicator.ex5 and b/Projects/XAU5/Indicators/x-saherelm.xctimer.indicator.ex5 differ diff --git a/Projects/XAU5/Indicators/x-saherelm.xfi.oscillator.ex5 b/Projects/XAU5/Indicators/x-saherelm.xfi.oscillator.ex5 index 06c49fe..8d5fac9 100644 Binary files a/Projects/XAU5/Indicators/x-saherelm.xfi.oscillator.ex5 and b/Projects/XAU5/Indicators/x-saherelm.xfi.oscillator.ex5 differ diff --git a/Projects/XAU5/Indicators/x-saherelm.xlh.indicator.ex5 b/Projects/XAU5/Indicators/x-saherelm.xlh.indicator.ex5 index af11950..b80dcb2 100644 Binary files a/Projects/XAU5/Indicators/x-saherelm.xlh.indicator.ex5 and b/Projects/XAU5/Indicators/x-saherelm.xlh.indicator.ex5 differ diff --git a/Projects/XAU5/Indicators/x-saherelm.xobd.indicator.ex5 b/Projects/XAU5/Indicators/x-saherelm.xobd.indicator.ex5 index ae85a10..3c0627f 100644 Binary files a/Projects/XAU5/Indicators/x-saherelm.xobd.indicator.ex5 and b/Projects/XAU5/Indicators/x-saherelm.xobd.indicator.ex5 differ diff --git a/Projects/XAU5/Indicators/x-saherelm.xrsi.oscillator.ex5 b/Projects/XAU5/Indicators/x-saherelm.xrsi.oscillator.ex5 index b9c0a29..9dc10b4 100644 Binary files a/Projects/XAU5/Indicators/x-saherelm.xrsi.oscillator.ex5 and b/Projects/XAU5/Indicators/x-saherelm.xrsi.oscillator.ex5 differ diff --git a/Projects/XAU5/Indicators/x-saherelm.xtd.oscillator.ex5 b/Projects/XAU5/Indicators/x-saherelm.xtd.oscillator.ex5 index ac5d672..4a30211 100644 Binary files a/Projects/XAU5/Indicators/x-saherelm.xtd.oscillator.ex5 and b/Projects/XAU5/Indicators/x-saherelm.xtd.oscillator.ex5 differ diff --git a/Projects/XAU5/Indicators/x-saherelm.xtm.indicator.ex5 b/Projects/XAU5/Indicators/x-saherelm.xtm.indicator.ex5 index a27ff53..5311a92 100644 Binary files a/Projects/XAU5/Indicators/x-saherelm.xtm.indicator.ex5 and b/Projects/XAU5/Indicators/x-saherelm.xtm.indicator.ex5 differ diff --git a/Projects/XAU5/Indicators/x-saherelm.xts.oscillator.ex5 b/Projects/XAU5/Indicators/x-saherelm.xts.oscillator.ex5 index 9af01f9..e339984 100644 Binary files a/Projects/XAU5/Indicators/x-saherelm.xts.oscillator.ex5 and b/Projects/XAU5/Indicators/x-saherelm.xts.oscillator.ex5 differ diff --git a/Projects/XAU5/Libraries/x-saherelm.alert.lib.ex5 b/Projects/XAU5/Libraries/x-saherelm.alert.lib.ex5 index d9fe0f2..5a2c5cb 100644 Binary files a/Projects/XAU5/Libraries/x-saherelm.alert.lib.ex5 and b/Projects/XAU5/Libraries/x-saherelm.alert.lib.ex5 differ diff --git a/Projects/XAU5/Libraries/x-saherelm.common.lib.ex5 b/Projects/XAU5/Libraries/x-saherelm.common.lib.ex5 index d59bfc8..ded0ebe 100644 Binary files a/Projects/XAU5/Libraries/x-saherelm.common.lib.ex5 and b/Projects/XAU5/Libraries/x-saherelm.common.lib.ex5 differ diff --git a/Projects/XAU5/Libraries/x-saherelm.draw.lib.ex5 b/Projects/XAU5/Libraries/x-saherelm.draw.lib.ex5 index db9d2c0..61d285d 100644 Binary files a/Projects/XAU5/Libraries/x-saherelm.draw.lib.ex5 and b/Projects/XAU5/Libraries/x-saherelm.draw.lib.ex5 differ diff --git a/Projects/XAU5/Libraries/x-saherelm.http.lib.ex5 b/Projects/XAU5/Libraries/x-saherelm.http.lib.ex5 index 3f10ac5..e7cd8fa 100644 Binary files a/Projects/XAU5/Libraries/x-saherelm.http.lib.ex5 and b/Projects/XAU5/Libraries/x-saherelm.http.lib.ex5 differ diff --git a/Projects/XAU5/Libraries/x-saherelm.log.lib.ex5 b/Projects/XAU5/Libraries/x-saherelm.log.lib.ex5 index b52b13f..38b46c1 100644 Binary files a/Projects/XAU5/Libraries/x-saherelm.log.lib.ex5 and b/Projects/XAU5/Libraries/x-saherelm.log.lib.ex5 differ diff --git a/Projects/XAU5/Libraries/x-saherelm.models.lib.ex5 b/Projects/XAU5/Libraries/x-saherelm.models.lib.ex5 index 873cf21..3f158c5 100644 Binary files a/Projects/XAU5/Libraries/x-saherelm.models.lib.ex5 and b/Projects/XAU5/Libraries/x-saherelm.models.lib.ex5 differ diff --git a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.ex5 b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.ex5 index 786c006..94ebd38 100644 Binary files a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.ex5 and b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.ex5 differ diff --git a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 index dcc5227..b666d0d 100644 --- a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -58,10 +58,10 @@ input bool xAU5XTSFIAllowShortSignals = true; // Enable Short Signals // // XOBDLH ... -input group "XAU5 XOBDLH Signaller"; -input bool xAU5XOBDLHEnableSignaller = true; // Enable Signaller -input bool xAU5XOBDLHAllowLongSignals = true; // Enable Long Signals -input bool xAU5XOBDLHAllowShortSignals = true; // Enable Short Signals +// input group "XAU5 XOBDLH Signaller"; +// input bool xAU5XOBDLHEnableSignaller = true; // Enable Signaller +// input bool xAU5XOBDLHAllowLongSignals = true; // Enable Long Signals +// input bool xAU5XOBDLHAllowShortSignals = true; // Enable Short Signals // // XCHMACC ... @@ -72,17 +72,17 @@ input bool xAU5XCHMACCAllowShortSignals = true; // Enable Short Signals // // XCHMAMX ... -input group "XAU5 XCHMAMX Signaller"; -input bool xAU5XCHMAMXEnableSignaller = true; // Enable Signaller -input bool xAU5XCHMAMXAllowLongSignals = true; // Enable Long Signals -input bool xAU5XCHMAMXAllowShortSignals = true; // Enable Short Signals +// input group "XAU5 XCHMAMX Signaller"; +// input bool xAU5XCHMAMXEnableSignaller = true; // Enable Signaller +// input bool xAU5XCHMAMXAllowLongSignals = true; // Enable Long Signals +// input bool xAU5XCHMAMXAllowShortSignals = true; // Enable Short Signals // // XCHMAMN ... -input group "XAU5 XCHMAMN Signaller"; -input bool xAU5XCHMAMNEnableSignaller = true; // Enable Signaller -input bool xAU5XCHMAMNAllowLongSignals = true; // Enable Long Signals -input bool xAU5XCHMAMNAllowShortSignals = true; // Enable Short Signals +// input group "XAU5 XCHMAMN Signaller"; +// input bool xAU5XCHMAMNEnableSignaller = true; // Enable Signaller +// input bool xAU5XCHMAMNAllowLongSignals = true; // Enable Long Signals +// input bool xAU5XCHMAMNAllowShortSignals = true; // Enable Short Signals // // Check in Test Mode or not ... @@ -128,9 +128,9 @@ bool xAU5MXTSFIAllowShortSignals = xAU5XTSFIAllowShortSignals; // // XOBDLH ... -bool xAU5MXOBDLHEnableSignaller = xAU5XOBDLHEnableSignaller; -bool xAU5MXOBDLHAllowLongSignals = xAU5XOBDLHAllowLongSignals; -bool xAU5MXOBDLHAllowShortSignals = xAU5XOBDLHAllowShortSignals; +bool xAU5MXOBDLHEnableSignaller = false; //xAU5XOBDLHEnableSignaller; +bool xAU5MXOBDLHAllowLongSignals = false; //xAU5XOBDLHAllowLongSignals; +bool xAU5MXOBDLHAllowShortSignals = false; //xAU5XOBDLHAllowShortSignals; // // XCHMACC ... @@ -140,18 +140,18 @@ bool xAU5MXCHMACCAllowShortSignals = xAU5XCHMACCAllowShortSignals; // // XCHMAMX ... -bool xAU5MXCHMAMXEnableSignaller = xAU5XCHMAMXEnableSignaller; -bool xAU5MXCHMAMXAllowLongSignals = xAU5XCHMAMXAllowLongSignals; -bool xAU5MXCHMAMXAllowShortSignals = xAU5XCHMAMXAllowShortSignals; +bool xAU5MXCHMAMXEnableSignaller = false; // xAU5XCHMAMXEnableSignaller; +bool xAU5MXCHMAMXAllowLongSignals = false; // xAU5XCHMAMXAllowLongSignals; +bool xAU5MXCHMAMXAllowShortSignals = false; // xAU5XCHMAMXAllowShortSignals; // // XCHMAMN ... -bool xAU5MXCHMAMNEnableSignaller = xAU5XCHMAMNEnableSignaller; -bool xAU5MXCHMAMNAllowLongSignals = xAU5XCHMAMNAllowLongSignals; -bool xAU5MXCHMAMNAllowShortSignals = xAU5XCHMAMNAllowShortSignals; +bool xAU5MXCHMAMNEnableSignaller = false; // xAU5XCHMAMNEnableSignaller; +bool xAU5MXCHMAMNAllowLongSignals = false; // xAU5XCHMAMNAllowLongSignals; +bool xAU5MXCHMAMNAllowShortSignals = false; // xAU5XCHMAMNAllowShortSignals; // -XCPriver *xAU5Provider; +XCProvider *xAU5Provider; // // Validate Indicators Inputs ... @@ -241,8 +241,8 @@ bool XAU5ValidateIndicatorsInputs() } // - // Make an Instance Of XCPriver Class for Use ... - xAU5Provider = new XCPriver( + // Make an Instance Of XCProvider Class for Use ... + xAU5Provider = new XCProvider( // // Commons ... _Symbol, @@ -436,10 +436,10 @@ bool XAU5InitIndicators() // // XOBDLH ... - bool isXOBDLHEnable = - xAU5XOBDLHEnableSignaller && - (xAU5XOBDLHAllowLongSignals || - xAU5XOBDLHAllowShortSignals); + bool isXOBDLHEnable = false; + // xAU5XOBDLHEnableSignaller && + // (xAU5XOBDLHAllowLongSignals || + // xAU5XOBDLHAllowShortSignals); // // XCHMACC ... @@ -450,17 +450,17 @@ bool XAU5InitIndicators() // // XCHMAMX ... - bool isXCHMAMXEnable = - xAU5XCHMAMXEnableSignaller && - (xAU5XCHMAMXAllowLongSignals || - xAU5XCHMAMXAllowShortSignals); + bool isXCHMAMXEnable = false; + // xAU5XCHMAMXEnableSignaller && + // (xAU5XCHMAMXAllowLongSignals || + // xAU5XCHMAMXAllowShortSignals); // // XCHMAMN ... - bool isXCHMAMNEnable = - xAU5XCHMAMNEnableSignaller && - (xAU5XCHMAMNAllowLongSignals || - xAU5XCHMAMNAllowShortSignals); + bool isXCHMAMNEnable = false; + // xAU5XCHMAMNEnableSignaller && + // (xAU5XCHMAMNAllowLongSignals || + // xAU5XCHMAMNAllowShortSignals); // bool hasSignaller = @@ -1103,12 +1103,12 @@ void XAU5DisableLongSignallers() // // XOBDLH ... - if (xAU5MXOBDLHEnableSignaller) - { - // - xAU5Provider.DisbaleXOBDLHLongs(); - xAU5MXOBDLHAllowLongSignals = false; - } + // if (xAU5MXOBDLHEnableSignaller) + // { + // // + // xAU5Provider.DisbaleXOBDLHLongs(); + // xAU5MXOBDLHAllowLongSignals = false; + // } // // XCHMACC ... @@ -1121,21 +1121,21 @@ void XAU5DisableLongSignallers() // // XCHMAMX ... - if (xAU5MXCHMAMXEnableSignaller) - { - // - xAU5Provider.DisbaleXCHMAMXLongs(); - xAU5MXCHMAMXAllowLongSignals = false; - } + // if (xAU5MXCHMAMXEnableSignaller) + // { + // // + // xAU5Provider.DisbaleXCHMAMXLongs(); + // xAU5MXCHMAMXAllowLongSignals = false; + // } // // XCHMAMN ... - if (xAU5MXCHMAMNEnableSignaller) - { - // - xAU5Provider.DisbaleXCHMAMNLongs(); - xAU5MXCHMAMNAllowLongSignals = false; - } + // if (xAU5MXCHMAMNEnableSignaller) + // { + // // + // xAU5Provider.DisbaleXCHMAMNLongs(); + // xAU5MXCHMAMNAllowLongSignals = false; + // } } // @@ -1213,20 +1213,20 @@ void XAU5EnableLongSignallers() // // XOBDLH ... - if (xAU5MXOBDLHEnableSignaller) - { - // - xAU5MXOBDLHAllowLongSignals = - xAU5XOBDLHAllowLongSignals - ? true - : xAU5MXOBDLHAllowLongSignals; + // if (xAU5MXOBDLHEnableSignaller) + // { + // // + // xAU5MXOBDLHAllowLongSignals = + // xAU5XOBDLHAllowLongSignals + // ? true + // : xAU5MXOBDLHAllowLongSignals; - // - if (xAU5MXOBDLHAllowLongSignals) - { - xAU5Provider.EnableXOBDLHLongs(); - } - } + // // + // if (xAU5MXOBDLHAllowLongSignals) + // { + // xAU5Provider.EnableXOBDLHLongs(); + // } + // } // // XCHMACC ... @@ -1247,37 +1247,37 @@ void XAU5EnableLongSignallers() // // XCHMAMX ... - if (xAU5MXCHMAMXEnableSignaller) - { - // - xAU5MXCHMAMXAllowLongSignals = - xAU5XCHMAMXAllowLongSignals - ? true - : xAU5MXCHMAMXAllowLongSignals; + // if (xAU5MXCHMAMXEnableSignaller) + // { + // // + // xAU5MXCHMAMXAllowLongSignals = + // xAU5XCHMAMXAllowLongSignals + // ? true + // : xAU5MXCHMAMXAllowLongSignals; - // - if (xAU5MXCHMAMXAllowLongSignals) - { - xAU5Provider.EnableXCHMAMXLongs(); - } - } + // // + // if (xAU5MXCHMAMXAllowLongSignals) + // { + // xAU5Provider.EnableXCHMAMXLongs(); + // } + // } // // XCHMAMN ... - if (xAU5MXCHMAMNEnableSignaller) - { - // - xAU5MXCHMAMNAllowLongSignals = - xAU5XCHMAMNAllowLongSignals - ? true - : xAU5MXCHMAMNAllowLongSignals; + // if (xAU5MXCHMAMNEnableSignaller) + // { + // // + // xAU5MXCHMAMNAllowLongSignals = + // xAU5XCHMAMNAllowLongSignals + // ? true + // : xAU5MXCHMAMNAllowLongSignals; - // - if (xAU5MXCHMAMNAllowLongSignals) - { - xAU5Provider.EnableXCHMAMNLongs(); - } - } + // // + // if (xAU5MXCHMAMNAllowLongSignals) + // { + // xAU5Provider.EnableXCHMAMNLongs(); + // } + // } } // @@ -1322,12 +1322,12 @@ void XAU5DisableShortSignallers() // // XOBDLH ... - if (xAU5MXOBDLHEnableSignaller) - { - // - xAU5Provider.DisableXOBDLHShorts(); - xAU5MXOBDLHAllowShortSignals = false; - } + // if (xAU5MXOBDLHEnableSignaller) + // { + // // + // xAU5Provider.DisableXOBDLHShorts(); + // xAU5MXOBDLHAllowShortSignals = false; + // } // // XCHMACC ... @@ -1340,21 +1340,21 @@ void XAU5DisableShortSignallers() // // XCHMAMX ... - if (xAU5MXCHMAMXEnableSignaller) - { - // - xAU5Provider.DisableXCHMAMXShorts(); - xAU5MXCHMAMXAllowShortSignals = false; - } + // if (xAU5MXCHMAMXEnableSignaller) + // { + // // + // xAU5Provider.DisableXCHMAMXShorts(); + // xAU5MXCHMAMXAllowShortSignals = false; + // } // // XCHMAMN ... - if (xAU5MXCHMAMNEnableSignaller) - { - // - xAU5Provider.DisableXCHMAMNShorts(); - xAU5MXCHMAMNAllowShortSignals = false; - } + // if (xAU5MXCHMAMNEnableSignaller) + // { + // // + // xAU5Provider.DisableXCHMAMNShorts(); + // xAU5MXCHMAMNAllowShortSignals = false; + // } } // @@ -1432,20 +1432,20 @@ void XAU5EnableShortSignallers() // // XOBDLH ... - if (xAU5MXOBDLHEnableSignaller) - { - // - xAU5MXOBDLHAllowShortSignals = - xAU5XOBDLHAllowShortSignals - ? true - : xAU5MXOBDLHAllowShortSignals; + // if (xAU5MXOBDLHEnableSignaller) + // { + // // + // xAU5MXOBDLHAllowShortSignals = + // xAU5XOBDLHAllowShortSignals + // ? true + // : xAU5MXOBDLHAllowShortSignals; - // - if (xAU5MXOBDLHAllowShortSignals) - { - xAU5Provider.EnableXOBDLHShorts(); - } - } + // // + // if (xAU5MXOBDLHAllowShortSignals) + // { + // xAU5Provider.EnableXOBDLHShorts(); + // } + // } // // XCHMACC ... @@ -1466,37 +1466,37 @@ void XAU5EnableShortSignallers() // // XCHMAMX ... - if (xAU5MXCHMAMXEnableSignaller) - { - // - xAU5MXCHMAMXAllowShortSignals = - xAU5XCHMAMXAllowShortSignals - ? true - : xAU5MXCHMAMXAllowShortSignals; + // if (xAU5MXCHMAMXEnableSignaller) + // { + // // + // xAU5MXCHMAMXAllowShortSignals = + // xAU5XCHMAMXAllowShortSignals + // ? true + // : xAU5MXCHMAMXAllowShortSignals; - // - if (xAU5MXCHMAMXAllowShortSignals) - { - xAU5Provider.EnableXCHMAMXShorts(); - } - } + // // + // if (xAU5MXCHMAMXAllowShortSignals) + // { + // xAU5Provider.EnableXCHMAMXShorts(); + // } + // } // // XCHMAMN ... - if (xAU5MXCHMAMNEnableSignaller) - { - // - xAU5MXCHMAMNAllowShortSignals = - xAU5XCHMAMNAllowShortSignals - ? true - : xAU5MXCHMAMNAllowShortSignals; + // if (xAU5MXCHMAMNEnableSignaller) + // { + // // + // xAU5MXCHMAMNAllowShortSignals = + // xAU5XCHMAMNAllowShortSignals + // ? true + // : xAU5MXCHMAMNAllowShortSignals; - // - if (xAU5MXCHMAMNAllowShortSignals) - { - xAU5Provider.EnableXCHMAMNShorts(); - } - } + // // + // if (xAU5MXCHMAMNAllowShortSignals) + // { + // xAU5Provider.EnableXCHMAMNShorts(); + // } + // } } // diff --git a/Projects/XAU5/Providers/x-saherelm.xau5.provider.inputs.lib.ex5 b/Projects/XAU5/Providers/x-saherelm.xau5.provider.inputs.lib.ex5 index e80331b..044ef9a 100644 Binary files a/Projects/XAU5/Providers/x-saherelm.xau5.provider.inputs.lib.ex5 and b/Projects/XAU5/Providers/x-saherelm.xau5.provider.inputs.lib.ex5 differ diff --git a/Projects/XAU5/Providers/x-saherelm.xau5.provider.inputs.lib.mq5 b/Projects/XAU5/Providers/x-saherelm.xau5.provider.inputs.lib.mq5 index 2b9b906..94956f6 100644 --- a/Projects/XAU5/Providers/x-saherelm.xau5.provider.inputs.lib.mq5 +++ b/Projects/XAU5/Providers/x-saherelm.xau5.provider.inputs.lib.mq5 @@ -36,15 +36,15 @@ input bool xAU5EnableProvider = true; // Enable Provider input int xAU5NumberOfItemsPerTick = 30; // Number Of items Readed In Each Tick // // Alerts ... -input bool xAU5EnableAlerts = true; // Enable Events Alert -input bool xAU5EnableHourlyAlerts = false; // Send Alert on each new Hour -input bool xAU5EnableDailyAlerts = true; // Send Alert on each new Day -input bool xAU5EnableWeeklyAlerts = true; // Send Alert on each new Week -input bool xAU5EnableMonthlyAlerts = true; // Send Alert on each new Month +input bool xAU5EnableAlerts = true; // Enable Events Alert +input bool xAU5EnableHourlyAlerts = false; // Send Alert on each new Hour +input bool xAU5EnableDailyAlerts = false; // Send Alert on each new Day +input bool xAU5EnableWeeklyAlerts = false; // Send Alert on each new Week +input bool xAU5EnableMonthlyAlerts = false; // Send Alert on each new Month // // Reports ... -input bool xAU5EnableDailyReports = false; // Send Report on each new Day -input bool xAU5EnableWeeklyReports = false; // Send Report on each new Week +input bool xAU5EnableDailyReports = false; // Send Report on each new Day +input bool xAU5EnableWeeklyReports = false; // Send Report on each new Week input bool xAU5EnableMonthlyReports = false; // Send Report on each new Month // @@ -68,11 +68,11 @@ input int xAU5MaxAllowedTrades = 10; input ENUM_X_CROSS_SIGNAL_METHOD xAU5CrossSignalsMethod = X_CROSS_SIGNAL_REGULAR; // Handle Cross Signals Method // // Max Allowed Trade Age ... -input int xAU5MaxAllowedTradeAge = 1800; // Detect Long Time Trades +input int xAU5MaxAllowedTradeAge = 1500; // Detect Long Time Trades input ENUM_X_GUARD_ACTIONS xAU5OldTradesAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // What to do with Old Trades // // Trade Volume Specific Configurations ... -input double xAU5StaticVolumeFactor = 0.0002; // Static Volume baesd on Balance +input double xAU5StaticVolumeFactor = 0.0001; // Static Volume baesd on Balance input ENUM_STATIC_VOLUME_METHODS xAU5StaticVolumeMethod = X_STATIC_VOLUME_BASED_ON_BALANCE; // How to Calculate Static Volume input double xAU5VolumeMultiplier = 0; // Volume Increase Multiplier input double xAU5ApplyVolumeMultiplierFactor = 0; // Apply Volume Multiplier Rate based on Balance @@ -82,14 +82,14 @@ input double xAU5IncreasedMaxSupportedVolumeRate = 0; // Trade Profits ... input double xAU5MinRewardInPips = 60; // Minimum Reward Per Trade in Pips input double xAU5RiskFreeStepInPips = 0; // Make Trades Risk Free Steps in Pips -input double xAU5RiskFreeRate = 0; // Volume Multiplier for Risk Free Trades +input double xAU5RiskFreeRate = 0; // Volume Multiplier for Risk Free Trades // // Guard Riskable Money and Profits ... -input double xAU5CriticalDrawDownFactor = 0.30; // Critical Allowed Drawdown Factor based on Balance -input ENUM_X_GUARD_ACTIONS xAU5CriticalGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_5; // Specify Guard Action on Critical Drawdown -input double xAU5MaxAllowedDrawDownFactor = 0.40; // Max Allowed Drawdown Factor based on Balance -input ENUM_X_GUARD_ACTIONS xAU5MaxAllowedGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_10; // Specify Guard Action on Max Allowed Drawdown -input int xAU5GuardStopoutFiredAfterTouches = 5; // Guard Stopout all Trades if Max Allowed Drawdown touched +input double xAU5CriticalDrawDownFactor = 0.20; // Critical Allowed Drawdown Factor based on Balance +input ENUM_X_GUARD_ACTIONS xAU5CriticalGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // Specify Guard Action on Critical Drawdown +input double xAU5MaxAllowedDrawDownFactor = 0.25; // Max Allowed Drawdown Factor based on Balance +input ENUM_X_GUARD_ACTIONS xAU5MaxAllowedGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_5; // Specify Guard Action on Max Allowed Drawdown +input int xAU5GuardStopoutFiredAfterTouches = 5; // Guard Stopout all Trades if Max Allowed Drawdown touched // // Account Conditions for Trading ... diff --git a/Projects/XAU5/Providers/x-saherelm.xau5.provider.lib.ex5 b/Projects/XAU5/Providers/x-saherelm.xau5.provider.lib.ex5 index e7c5de5..b4079b0 100644 Binary files a/Projects/XAU5/Providers/x-saherelm.xau5.provider.lib.ex5 and b/Projects/XAU5/Providers/x-saherelm.xau5.provider.lib.ex5 differ diff --git a/Projects/XEU5/Classes/x-saherelm.class.lib.ex5 b/Projects/XEU5/Classes/x-saherelm.class.lib.ex5 index a4477ab..b0aac15 100644 Binary files a/Projects/XEU5/Classes/x-saherelm.class.lib.ex5 and b/Projects/XEU5/Classes/x-saherelm.class.lib.ex5 differ diff --git a/Projects/XEU5/Classes/x-saherelm.nn.lib.ex5 b/Projects/XEU5/Classes/x-saherelm.nn.lib.ex5 index ef6823a..ff7116e 100644 Binary files a/Projects/XEU5/Classes/x-saherelm.nn.lib.ex5 and b/Projects/XEU5/Classes/x-saherelm.nn.lib.ex5 differ diff --git a/Projects/XEU5/Classes/x-saherelm.provider.lib.ex5 b/Projects/XEU5/Classes/x-saherelm.provider.lib.ex5 index 09b4df0..c0420b5 100644 Binary files a/Projects/XEU5/Classes/x-saherelm.provider.lib.ex5 and b/Projects/XEU5/Classes/x-saherelm.provider.lib.ex5 differ diff --git a/Projects/XEU5/Experts/x-saherelm.xeu5.ea.ex5 b/Projects/XEU5/Experts/x-saherelm.xeu5.ea.ex5 index 6f4641c..a467af8 100644 Binary files a/Projects/XEU5/Experts/x-saherelm.xeu5.ea.ex5 and b/Projects/XEU5/Experts/x-saherelm.xeu5.ea.ex5 differ diff --git a/Projects/XEU5/Helpers/x-saherelm.xama.indicator.helper.lib.ex5 b/Projects/XEU5/Helpers/x-saherelm.xama.indicator.helper.lib.ex5 index a8d5318..c79cc91 100644 Binary files a/Projects/XEU5/Helpers/x-saherelm.xama.indicator.helper.lib.ex5 and b/Projects/XEU5/Helpers/x-saherelm.xama.indicator.helper.lib.ex5 differ diff --git a/Projects/XEU5/Helpers/x-saherelm.xchlh.oscillator.helper.lib.ex5 b/Projects/XEU5/Helpers/x-saherelm.xchlh.oscillator.helper.lib.ex5 index 7881f4a..c8ceea1 100644 Binary files a/Projects/XEU5/Helpers/x-saherelm.xchlh.oscillator.helper.lib.ex5 and b/Projects/XEU5/Helpers/x-saherelm.xchlh.oscillator.helper.lib.ex5 differ diff --git a/Projects/XEU5/Helpers/x-saherelm.xchma.oscillator.helper.lib.ex5 b/Projects/XEU5/Helpers/x-saherelm.xchma.oscillator.helper.lib.ex5 index baf2455..501b68f 100644 Binary files a/Projects/XEU5/Helpers/x-saherelm.xchma.oscillator.helper.lib.ex5 and b/Projects/XEU5/Helpers/x-saherelm.xchma.oscillator.helper.lib.ex5 differ diff --git a/Projects/XEU5/Helpers/x-saherelm.xfi.oscillator.helper.lib.ex5 b/Projects/XEU5/Helpers/x-saherelm.xfi.oscillator.helper.lib.ex5 index 3945419..a358455 100644 Binary files a/Projects/XEU5/Helpers/x-saherelm.xfi.oscillator.helper.lib.ex5 and b/Projects/XEU5/Helpers/x-saherelm.xfi.oscillator.helper.lib.ex5 differ diff --git a/Projects/XEU5/Helpers/x-saherelm.xlh.indicator.helper.lib.ex5 b/Projects/XEU5/Helpers/x-saherelm.xlh.indicator.helper.lib.ex5 index d1e2bd6..b88fc19 100644 Binary files a/Projects/XEU5/Helpers/x-saherelm.xlh.indicator.helper.lib.ex5 and b/Projects/XEU5/Helpers/x-saherelm.xlh.indicator.helper.lib.ex5 differ diff --git a/Projects/XEU5/Helpers/x-saherelm.xobd.indicator.helper.lib.ex5 b/Projects/XEU5/Helpers/x-saherelm.xobd.indicator.helper.lib.ex5 index 7da433c..84bfd57 100644 Binary files a/Projects/XEU5/Helpers/x-saherelm.xobd.indicator.helper.lib.ex5 and b/Projects/XEU5/Helpers/x-saherelm.xobd.indicator.helper.lib.ex5 differ diff --git a/Projects/XEU5/Helpers/x-saherelm.xrsi.oscillator.helper.lib.ex5 b/Projects/XEU5/Helpers/x-saherelm.xrsi.oscillator.helper.lib.ex5 index 5726a40..eb0e20a 100644 Binary files a/Projects/XEU5/Helpers/x-saherelm.xrsi.oscillator.helper.lib.ex5 and b/Projects/XEU5/Helpers/x-saherelm.xrsi.oscillator.helper.lib.ex5 differ diff --git a/Projects/XEU5/Helpers/x-saherelm.xtd.oscillator.helper.lib.ex5 b/Projects/XEU5/Helpers/x-saherelm.xtd.oscillator.helper.lib.ex5 index c236ab1..f8ac146 100644 Binary files a/Projects/XEU5/Helpers/x-saherelm.xtd.oscillator.helper.lib.ex5 and b/Projects/XEU5/Helpers/x-saherelm.xtd.oscillator.helper.lib.ex5 differ diff --git a/Projects/XEU5/Helpers/x-saherelm.xtm.indicator.helper.lib.ex5 b/Projects/XEU5/Helpers/x-saherelm.xtm.indicator.helper.lib.ex5 index d72e644..405a917 100644 Binary files a/Projects/XEU5/Helpers/x-saherelm.xtm.indicator.helper.lib.ex5 and b/Projects/XEU5/Helpers/x-saherelm.xtm.indicator.helper.lib.ex5 differ diff --git a/Projects/XEU5/Helpers/x-saherelm.xts.oscillator.helper.lib.ex5 b/Projects/XEU5/Helpers/x-saherelm.xts.oscillator.helper.lib.ex5 index 6c03915..9400ce3 100644 Binary files a/Projects/XEU5/Helpers/x-saherelm.xts.oscillator.helper.lib.ex5 and b/Projects/XEU5/Helpers/x-saherelm.xts.oscillator.helper.lib.ex5 differ diff --git a/Projects/XEU5/Indicators/x-saherelm.xama.indicator.ex5 b/Projects/XEU5/Indicators/x-saherelm.xama.indicator.ex5 index 6d40565..d6cc641 100644 Binary files a/Projects/XEU5/Indicators/x-saherelm.xama.indicator.ex5 and b/Projects/XEU5/Indicators/x-saherelm.xama.indicator.ex5 differ diff --git a/Projects/XEU5/Indicators/x-saherelm.xchlh.oscillator.ex5 b/Projects/XEU5/Indicators/x-saherelm.xchlh.oscillator.ex5 index cfc2b34..f543a80 100644 Binary files a/Projects/XEU5/Indicators/x-saherelm.xchlh.oscillator.ex5 and b/Projects/XEU5/Indicators/x-saherelm.xchlh.oscillator.ex5 differ diff --git a/Projects/XEU5/Indicators/x-saherelm.xchma.oscillator.ex5 b/Projects/XEU5/Indicators/x-saherelm.xchma.oscillator.ex5 index aeb5a93..c5f42b7 100644 Binary files a/Projects/XEU5/Indicators/x-saherelm.xchma.oscillator.ex5 and b/Projects/XEU5/Indicators/x-saherelm.xchma.oscillator.ex5 differ diff --git a/Projects/XEU5/Indicators/x-saherelm.xctimer.indicator.ex5 b/Projects/XEU5/Indicators/x-saherelm.xctimer.indicator.ex5 index 661bd22..e363014 100644 Binary files a/Projects/XEU5/Indicators/x-saherelm.xctimer.indicator.ex5 and b/Projects/XEU5/Indicators/x-saherelm.xctimer.indicator.ex5 differ diff --git a/Projects/XEU5/Indicators/x-saherelm.xfi.oscillator.ex5 b/Projects/XEU5/Indicators/x-saherelm.xfi.oscillator.ex5 index be819dc..dd29c4f 100644 Binary files a/Projects/XEU5/Indicators/x-saherelm.xfi.oscillator.ex5 and b/Projects/XEU5/Indicators/x-saherelm.xfi.oscillator.ex5 differ diff --git a/Projects/XEU5/Indicators/x-saherelm.xlh.indicator.ex5 b/Projects/XEU5/Indicators/x-saherelm.xlh.indicator.ex5 index a5f7a90..cde5f32 100644 Binary files a/Projects/XEU5/Indicators/x-saherelm.xlh.indicator.ex5 and b/Projects/XEU5/Indicators/x-saherelm.xlh.indicator.ex5 differ diff --git a/Projects/XEU5/Indicators/x-saherelm.xobd.indicator.ex5 b/Projects/XEU5/Indicators/x-saherelm.xobd.indicator.ex5 index 04dbc2e..ad3b632 100644 Binary files a/Projects/XEU5/Indicators/x-saherelm.xobd.indicator.ex5 and b/Projects/XEU5/Indicators/x-saherelm.xobd.indicator.ex5 differ diff --git a/Projects/XEU5/Indicators/x-saherelm.xrsi.oscillator.ex5 b/Projects/XEU5/Indicators/x-saherelm.xrsi.oscillator.ex5 index 106c214..79365b6 100644 Binary files a/Projects/XEU5/Indicators/x-saherelm.xrsi.oscillator.ex5 and b/Projects/XEU5/Indicators/x-saherelm.xrsi.oscillator.ex5 differ diff --git a/Projects/XEU5/Indicators/x-saherelm.xtd.oscillator.ex5 b/Projects/XEU5/Indicators/x-saherelm.xtd.oscillator.ex5 index 0f869b6..12a0b96 100644 Binary files a/Projects/XEU5/Indicators/x-saherelm.xtd.oscillator.ex5 and b/Projects/XEU5/Indicators/x-saherelm.xtd.oscillator.ex5 differ diff --git a/Projects/XEU5/Indicators/x-saherelm.xtm.indicator.ex5 b/Projects/XEU5/Indicators/x-saherelm.xtm.indicator.ex5 index dca7ce3..629c29e 100644 Binary files a/Projects/XEU5/Indicators/x-saherelm.xtm.indicator.ex5 and b/Projects/XEU5/Indicators/x-saherelm.xtm.indicator.ex5 differ diff --git a/Projects/XEU5/Indicators/x-saherelm.xts.oscillator.ex5 b/Projects/XEU5/Indicators/x-saherelm.xts.oscillator.ex5 index edb7096..b4713d3 100644 Binary files a/Projects/XEU5/Indicators/x-saherelm.xts.oscillator.ex5 and b/Projects/XEU5/Indicators/x-saherelm.xts.oscillator.ex5 differ diff --git a/Projects/XEU5/Libraries/x-saherelm.alert.lib.ex5 b/Projects/XEU5/Libraries/x-saherelm.alert.lib.ex5 index 9a95ee1..147b094 100644 Binary files a/Projects/XEU5/Libraries/x-saherelm.alert.lib.ex5 and b/Projects/XEU5/Libraries/x-saherelm.alert.lib.ex5 differ diff --git a/Projects/XEU5/Libraries/x-saherelm.common.lib.ex5 b/Projects/XEU5/Libraries/x-saherelm.common.lib.ex5 index 19451fc..1fef789 100644 Binary files a/Projects/XEU5/Libraries/x-saherelm.common.lib.ex5 and b/Projects/XEU5/Libraries/x-saherelm.common.lib.ex5 differ diff --git a/Projects/XEU5/Libraries/x-saherelm.draw.lib.ex5 b/Projects/XEU5/Libraries/x-saherelm.draw.lib.ex5 index ad5825c..79eafe9 100644 Binary files a/Projects/XEU5/Libraries/x-saherelm.draw.lib.ex5 and b/Projects/XEU5/Libraries/x-saherelm.draw.lib.ex5 differ diff --git a/Projects/XEU5/Libraries/x-saherelm.http.lib.ex5 b/Projects/XEU5/Libraries/x-saherelm.http.lib.ex5 index fc164b0..2d02c0e 100644 Binary files a/Projects/XEU5/Libraries/x-saherelm.http.lib.ex5 and b/Projects/XEU5/Libraries/x-saherelm.http.lib.ex5 differ diff --git a/Projects/XEU5/Libraries/x-saherelm.log.lib.ex5 b/Projects/XEU5/Libraries/x-saherelm.log.lib.ex5 index c7c5cfc..4dfe72e 100644 Binary files a/Projects/XEU5/Libraries/x-saherelm.log.lib.ex5 and b/Projects/XEU5/Libraries/x-saherelm.log.lib.ex5 differ diff --git a/Projects/XEU5/Libraries/x-saherelm.models.lib.ex5 b/Projects/XEU5/Libraries/x-saherelm.models.lib.ex5 index bffaa3a..606bab3 100644 Binary files a/Projects/XEU5/Libraries/x-saherelm.models.lib.ex5 and b/Projects/XEU5/Libraries/x-saherelm.models.lib.ex5 differ diff --git a/Projects/XEU5/Providers/x-saherelm.xeu5.provider.indicators.lib.ex5 b/Projects/XEU5/Providers/x-saherelm.xeu5.provider.indicators.lib.ex5 index 1632c54..17badfb 100644 Binary files a/Projects/XEU5/Providers/x-saherelm.xeu5.provider.indicators.lib.ex5 and b/Projects/XEU5/Providers/x-saherelm.xeu5.provider.indicators.lib.ex5 differ diff --git a/Projects/XEU5/Providers/x-saherelm.xeu5.provider.indicators.lib.mq5 b/Projects/XEU5/Providers/x-saherelm.xeu5.provider.indicators.lib.mq5 index b57e633..9dcb2ca 100644 --- a/Projects/XEU5/Providers/x-saherelm.xeu5.provider.indicators.lib.mq5 +++ b/Projects/XEU5/Providers/x-saherelm.xeu5.provider.indicators.lib.mq5 @@ -58,10 +58,10 @@ input bool xEU5XTSFIAllowShortSignals = true; // Enable Short Signals // // XOBDLH ... -input group "XEU5 XOBDLH Signaller"; -input bool xEU5XOBDLHEnableSignaller = true; // Enable Signaller -input bool xEU5XOBDLHAllowLongSignals = true; // Enable Long Signals -input bool xEU5XOBDLHAllowShortSignals = true; // Enable Short Signals +// input group "XEU5 XOBDLH Signaller"; +// input bool xEU5XOBDLHEnableSignaller = true; // Enable Signaller +// input bool xEU5XOBDLHAllowLongSignals = true; // Enable Long Signals +// input bool xEU5XOBDLHAllowShortSignals = true; // Enable Short Signals // // XCHMACC ... @@ -72,17 +72,17 @@ input bool xEU5XCHMACCAllowShortSignals = true; // Enable Short Signals // // XCHMAMX ... -input group "XEU5 XCHMAMX Signaller"; -input bool xEU5XCHMAMXEnableSignaller = true; // Enable Signaller -input bool xEU5XCHMAMXAllowLongSignals = true; // Enable Long Signals -input bool xEU5XCHMAMXAllowShortSignals = true; // Enable Short Signals +// input group "XEU5 XCHMAMX Signaller"; +// input bool xEU5XCHMAMXEnableSignaller = true; // Enable Signaller +// input bool xEU5XCHMAMXAllowLongSignals = true; // Enable Long Signals +// input bool xEU5XCHMAMXAllowShortSignals = true; // Enable Short Signals // // XCHMAMN ... -input group "XEU5 XCHMAMN Signaller"; -input bool xEU5XCHMAMNEnableSignaller = true; // Enable Signaller -input bool xEU5XCHMAMNAllowLongSignals = true; // Enable Long Signals -input bool xEU5XCHMAMNAllowShortSignals = true; // Enable Short Signals +// input group "XEU5 XCHMAMN Signaller"; +// input bool xEU5XCHMAMNEnableSignaller = true; // Enable Signaller +// input bool xEU5XCHMAMNAllowLongSignals = true; // Enable Long Signals +// input bool xEU5XCHMAMNAllowShortSignals = true; // Enable Short Signals // // Check in Test Mode or not ... @@ -128,9 +128,9 @@ bool xEU5MXTSFIAllowShortSignals = xEU5XTSFIAllowShortSignals; // // XOBDLH ... -bool xEU5MXOBDLHEnableSignaller = xEU5XOBDLHEnableSignaller; -bool xEU5MXOBDLHAllowLongSignals = xEU5XOBDLHAllowLongSignals; -bool xEU5MXOBDLHAllowShortSignals = xEU5XOBDLHAllowShortSignals; +bool xEU5MXOBDLHEnableSignaller = false; // xEU5XOBDLHEnableSignaller; +bool xEU5MXOBDLHAllowLongSignals = false; // xEU5XOBDLHAllowLongSignals; +bool xEU5MXOBDLHAllowShortSignals = false; // xEU5XOBDLHAllowShortSignals; // // XCHMACC ... @@ -140,15 +140,15 @@ bool xEU5MXCHMACCAllowShortSignals = xEU5XCHMACCAllowShortSignals; // // XCHMAMX ... -bool xEU5MXCHMAMXEnableSignaller = xEU5XCHMAMXEnableSignaller; -bool xEU5MXCHMAMXAllowLongSignals = xEU5XCHMAMXAllowLongSignals; -bool xEU5MXCHMAMXAllowShortSignals = xEU5XCHMAMXAllowShortSignals; +bool xEU5MXCHMAMXEnableSignaller = false; // xEU5XCHMAMXEnableSignaller; +bool xEU5MXCHMAMXAllowLongSignals = false; // xEU5XCHMAMXAllowLongSignals; +bool xEU5MXCHMAMXAllowShortSignals = false; // xEU5XCHMAMXAllowShortSignals; // // XCHMAMN ... -bool xEU5MXCHMAMNEnableSignaller = xEU5XCHMAMNEnableSignaller; -bool xEU5MXCHMAMNAllowLongSignals = xEU5XCHMAMNAllowLongSignals; -bool xEU5MXCHMAMNAllowShortSignals = xEU5XCHMAMNAllowShortSignals; +bool xEU5MXCHMAMNEnableSignaller = false; // xEU5XCHMAMNEnableSignaller; +bool xEU5MXCHMAMNAllowLongSignals = false; // xEU5XCHMAMNAllowLongSignals; +bool xEU5MXCHMAMNAllowShortSignals = false; // xEU5XCHMAMNAllowShortSignals; // XCProvider *xEU5Provider; @@ -436,10 +436,10 @@ bool XEU5InitIndicators() // // XOBDLH ... - bool isXOBDLHEnable = - xEU5XOBDLHEnableSignaller && - (xEU5XOBDLHAllowLongSignals || - xEU5XOBDLHAllowShortSignals); + bool isXOBDLHEnable = false; + // xEU5XOBDLHEnableSignaller && + // (xEU5XOBDLHAllowLongSignals || + // xEU5XOBDLHAllowShortSignals); // // XCHMACC ... @@ -450,17 +450,17 @@ bool XEU5InitIndicators() // // XCHMAMX ... - bool isXCHMAMXEnable = - xEU5XCHMAMXEnableSignaller && - (xEU5XCHMAMXAllowLongSignals || - xEU5XCHMAMXAllowShortSignals); + bool isXCHMAMXEnable = false; + // xEU5XCHMAMXEnableSignaller && + // (xEU5XCHMAMXAllowLongSignals || + // xEU5XCHMAMXAllowShortSignals); // // XCHMAMN ... - bool isXCHMAMNEnable = - xEU5XCHMAMNEnableSignaller && - (xEU5XCHMAMNAllowLongSignals || - xEU5XCHMAMNAllowShortSignals); + bool isXCHMAMNEnable = false; + // xEU5XCHMAMNEnableSignaller && + // (xEU5XCHMAMNAllowLongSignals || + // xEU5XCHMAMNAllowShortSignals); // bool hasSignaller = @@ -1103,12 +1103,12 @@ void XEU5DisableLongSignallers() // // XOBDLH ... - if (xEU5MXOBDLHEnableSignaller) - { - // - xEU5Provider.DisbaleXOBDLHLongs(); - xEU5MXOBDLHAllowLongSignals = false; - } + // if (xEU5MXOBDLHEnableSignaller) + // { + // // + // xEU5Provider.DisbaleXOBDLHLongs(); + // xEU5MXOBDLHAllowLongSignals = false; + // } // // XCHMACC ... @@ -1121,21 +1121,21 @@ void XEU5DisableLongSignallers() // // XCHMAMX ... - if (xEU5MXCHMAMXEnableSignaller) - { - // - xEU5Provider.DisbaleXCHMAMXLongs(); - xEU5MXCHMAMXAllowLongSignals = false; - } + // if (xEU5MXCHMAMXEnableSignaller) + // { + // // + // xEU5Provider.DisbaleXCHMAMXLongs(); + // xEU5MXCHMAMXAllowLongSignals = false; + // } // // XCHMAMN ... - if (xEU5MXCHMAMNEnableSignaller) - { - // - xEU5Provider.DisbaleXCHMAMNLongs(); - xEU5MXCHMAMNAllowLongSignals = false; - } + // if (xEU5MXCHMAMNEnableSignaller) + // { + // // + // xEU5Provider.DisbaleXCHMAMNLongs(); + // xEU5MXCHMAMNAllowLongSignals = false; + // } } // @@ -1213,20 +1213,20 @@ void XEU5EnableLongSignallers() // // XOBDLH ... - if (xEU5MXOBDLHEnableSignaller) - { - // - xEU5MXOBDLHAllowLongSignals = - xEU5XOBDLHAllowLongSignals - ? true - : xEU5MXOBDLHAllowLongSignals; + // if (xEU5MXOBDLHEnableSignaller) + // { + // // + // xEU5MXOBDLHAllowLongSignals = + // xEU5XOBDLHAllowLongSignals + // ? true + // : xEU5MXOBDLHAllowLongSignals; - // - if (xEU5MXOBDLHAllowLongSignals) - { - xEU5Provider.EnableXOBDLHLongs(); - } - } + // // + // if (xEU5MXOBDLHAllowLongSignals) + // { + // xEU5Provider.EnableXOBDLHLongs(); + // } + // } // // XCHMACC ... @@ -1247,37 +1247,37 @@ void XEU5EnableLongSignallers() // // XCHMAMX ... - if (xEU5MXCHMAMXEnableSignaller) - { - // - xEU5MXCHMAMXAllowLongSignals = - xEU5XCHMAMXAllowLongSignals - ? true - : xEU5MXCHMAMXAllowLongSignals; + // if (xEU5MXCHMAMXEnableSignaller) + // { + // // + // xEU5MXCHMAMXAllowLongSignals = + // xEU5XCHMAMXAllowLongSignals + // ? true + // : xEU5MXCHMAMXAllowLongSignals; - // - if (xEU5MXCHMAMXAllowLongSignals) - { - xEU5Provider.EnableXCHMAMXLongs(); - } - } + // // + // if (xEU5MXCHMAMXAllowLongSignals) + // { + // xEU5Provider.EnableXCHMAMXLongs(); + // } + // } // // XCHMAMN ... - if (xEU5MXCHMAMNEnableSignaller) - { - // - xEU5MXCHMAMNAllowLongSignals = - xEU5XCHMAMNAllowLongSignals - ? true - : xEU5MXCHMAMNAllowLongSignals; + // if (xEU5MXCHMAMNEnableSignaller) + // { + // // + // xEU5MXCHMAMNAllowLongSignals = + // xEU5XCHMAMNAllowLongSignals + // ? true + // : xEU5MXCHMAMNAllowLongSignals; - // - if (xEU5MXCHMAMNAllowLongSignals) - { - xEU5Provider.EnableXCHMAMNLongs(); - } - } + // // + // if (xEU5MXCHMAMNAllowLongSignals) + // { + // xEU5Provider.EnableXCHMAMNLongs(); + // } + // } } // @@ -1322,12 +1322,12 @@ void XEU5DisableShortSignallers() // // XOBDLH ... - if (xEU5MXOBDLHEnableSignaller) - { - // - xEU5Provider.DisableXOBDLHShorts(); - xEU5MXOBDLHAllowShortSignals = false; - } + // if (xEU5MXOBDLHEnableSignaller) + // { + // // + // xEU5Provider.DisableXOBDLHShorts(); + // xEU5MXOBDLHAllowShortSignals = false; + // } // // XCHMACC ... @@ -1340,21 +1340,21 @@ void XEU5DisableShortSignallers() // // XCHMAMX ... - if (xEU5MXCHMAMXEnableSignaller) - { - // - xEU5Provider.DisableXCHMAMXShorts(); - xEU5MXCHMAMXAllowShortSignals = false; - } + // if (xEU5MXCHMAMXEnableSignaller) + // { + // // + // xEU5Provider.DisableXCHMAMXShorts(); + // xEU5MXCHMAMXAllowShortSignals = false; + // } // // XCHMAMN ... - if (xEU5MXCHMAMNEnableSignaller) - { - // - xEU5Provider.DisableXCHMAMNShorts(); - xEU5MXCHMAMNAllowShortSignals = false; - } + // if (xEU5MXCHMAMNEnableSignaller) + // { + // // + // xEU5Provider.DisableXCHMAMNShorts(); + // xEU5MXCHMAMNAllowShortSignals = false; + // } } // @@ -1432,20 +1432,20 @@ void XEU5EnableShortSignallers() // // XOBDLH ... - if (xEU5MXOBDLHEnableSignaller) - { - // - xEU5MXOBDLHAllowShortSignals = - xEU5XOBDLHAllowShortSignals - ? true - : xEU5MXOBDLHAllowShortSignals; + // if (xEU5MXOBDLHEnableSignaller) + // { + // // + // xEU5MXOBDLHAllowShortSignals = + // xEU5XOBDLHAllowShortSignals + // ? true + // : xEU5MXOBDLHAllowShortSignals; - // - if (xEU5MXOBDLHAllowShortSignals) - { - xEU5Provider.EnableXOBDLHShorts(); - } - } + // // + // if (xEU5MXOBDLHAllowShortSignals) + // { + // xEU5Provider.EnableXOBDLHShorts(); + // } + // } // // XCHMACC ... @@ -1466,37 +1466,37 @@ void XEU5EnableShortSignallers() // // XCHMAMX ... - if (xEU5MXCHMAMXEnableSignaller) - { - // - xEU5MXCHMAMXAllowShortSignals = - xEU5XCHMAMXAllowShortSignals - ? true - : xEU5MXCHMAMXAllowShortSignals; + // if (xEU5MXCHMAMXEnableSignaller) + // { + // // + // xEU5MXCHMAMXAllowShortSignals = + // xEU5XCHMAMXAllowShortSignals + // ? true + // : xEU5MXCHMAMXAllowShortSignals; - // - if (xEU5MXCHMAMXAllowShortSignals) - { - xEU5Provider.EnableXCHMAMXShorts(); - } - } + // // + // if (xEU5MXCHMAMXAllowShortSignals) + // { + // xEU5Provider.EnableXCHMAMXShorts(); + // } + // } // // XCHMAMN ... - if (xEU5MXCHMAMNEnableSignaller) - { - // - xEU5MXCHMAMNAllowShortSignals = - xEU5XCHMAMNAllowShortSignals - ? true - : xEU5MXCHMAMNAllowShortSignals; + // if (xEU5MXCHMAMNEnableSignaller) + // { + // // + // xEU5MXCHMAMNAllowShortSignals = + // xEU5XCHMAMNAllowShortSignals + // ? true + // : xEU5MXCHMAMNAllowShortSignals; - // - if (xEU5MXCHMAMNAllowShortSignals) - { - xEU5Provider.EnableXCHMAMNShorts(); - } - } + // // + // if (xEU5MXCHMAMNAllowShortSignals) + // { + // xEU5Provider.EnableXCHMAMNShorts(); + // } + // } } // diff --git a/Projects/XEU5/Providers/x-saherelm.xeu5.provider.inputs.lib.mq5 b/Projects/XEU5/Providers/x-saherelm.xeu5.provider.inputs.lib.mq5 index 6f2be90..d991bf5 100644 --- a/Projects/XEU5/Providers/x-saherelm.xeu5.provider.inputs.lib.mq5 +++ b/Projects/XEU5/Providers/x-saherelm.xeu5.provider.inputs.lib.mq5 @@ -36,15 +36,15 @@ input bool xEU5EnableProvider = true; // Enable Provider input int xEU5NumberOfItemsPerTick = 30; // Number Of items Readed In Each Tick // // Alerts ... -input bool xEU5EnableAlerts = true; // Enable Events Alert -input bool xEU5EnableHourlyAlerts = false; // Send Alert on each new Hour -input bool xEU5EnableDailyAlerts = true; // Send Alert on each new Day -input bool xEU5EnableWeeklyAlerts = true; // Send Alert on each new Week -input bool xEU5EnableMonthlyAlerts = true; // Send Alert on each new Month +input bool xEU5EnableAlerts = true; // Enable Events Alert +input bool xEU5EnableHourlyAlerts = false; // Send Alert on each new Hour +input bool xEU5EnableDailyAlerts = false; // Send Alert on each new Day +input bool xEU5EnableWeeklyAlerts = false; // Send Alert on each new Week +input bool xEU5EnableMonthlyAlerts = false; // Send Alert on each new Month // // Reports ... -input bool xEU5EnableDailyReports = false; // Send Report on each new Day -input bool xEU5EnableWeeklyReports = false; // Send Report on each new Week +input bool xEU5EnableDailyReports = false; // Send Report on each new Day +input bool xEU5EnableWeeklyReports = false; // Send Report on each new Week input bool xEU5EnableMonthlyReports = false; // Send Report on each new Month // @@ -68,11 +68,11 @@ input int xEU5MaxAllowedTrades = 10; input ENUM_X_CROSS_SIGNAL_METHOD xEU5CrossSignalsMethod = X_CROSS_SIGNAL_REGULAR; // Handle Cross Signals Method // // Max Allowed Trade Age ... -input int xEU5MaxAllowedTradeAge = 1800; // Detect Long Time Trades +input int xEU5MaxAllowedTradeAge = 1500; // Detect Long Time Trades input ENUM_X_GUARD_ACTIONS xEU5OldTradesAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // What to do with Old Trades // // Trade Volume Specific Configurations ... -input double xEU5StaticVolumeFactor = 0.0004; // Static Volume baesd on Balance +input double xEU5StaticVolumeFactor = 0.0002; // Static Volume baesd on Balance input ENUM_STATIC_VOLUME_METHODS xEU5StaticVolumeMethod = X_STATIC_VOLUME_BASED_ON_BALANCE; // How to Calculate Static Volume input double xEU5VolumeMultiplier = 0; // Volume Increase Multiplier input double xEU5ApplyVolumeMultiplierFactor = 0; // Apply Volume Multiplier Rate based on Balance @@ -80,14 +80,14 @@ input double xEU5MaxSupportedVolumePerTradeFactor = 0; input double xEU5IncreasedMaxSupportedVolumeRate = 0; // Increase Max Supported Volume based on Balance // // Trade Profits ... -input double xEU5MinRewardInPips = 6; // Minimum Reward Per Trade in Pips +input double xEU5MinRewardInPips = 6; // Minimum Reward Per Trade in Pips input double xEU5RiskFreeStepInPips = 0; // Make Trades Risk Free Steps in Pips -input double xEU5RiskFreeRate = 0; // Volume Multiplier for Risk Free Trades +input double xEU5RiskFreeRate = 0; // Volume Multiplier for Risk Free Trades // // Guard Riskable Money and Profits ... -input double xEU5CriticalDrawDownFactor = 0.30; // Critical Allowed Drawdown Factor based on Balance +input double xEU5CriticalDrawDownFactor = 0.20; // Critical Allowed Drawdown Factor based on Balance input ENUM_X_GUARD_ACTIONS xEU5CriticalGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_1; // Specify Guard Action on Critical Drawdown -input double xEU5MaxAllowedDrawDownFactor = 0.40; // Max Allowed Drawdown Factor based on Balance +input double xEU5MaxAllowedDrawDownFactor = 0.25; // Max Allowed Drawdown Factor based on Balance input ENUM_X_GUARD_ACTIONS xEU5MaxAllowedGuardAction = X_GUARD_PARTIAL_CLOSE_MAX_IN_DD_5; // Specify Guard Action on Max Allowed Drawdown input int xEU5GuardStopoutFiredAfterTouches = 5; // Guard Stopout all Trades if Max Allowed Drawdown touched