diff --git a/Experts/x-saherelm.xch.strategy.ea.mq5 b/Experts/x-saherelm.xch.strategy.ea.mq5 index e0170dfa..744695a5 100644 --- a/Experts/x-saherelm.xch.strategy.ea.mq5 +++ b/Experts/x-saherelm.xch.strategy.ea.mq5 @@ -44,7 +44,7 @@ input string eaLogSuffix = ""; // Log Suffix // // Symbols ... input group "Symbols"; -input bool eaMultiSymbol = true; // Use Multi Symbol +input bool eaMultiSymbol = false; // Use Multi Symbol input bool eaUseMaxAllowedTradesPerSymbol = true; // Use Max Allowed Trades Per Symbol input string eaSymbols = "EURUSDb,GBPUSDb,EURGBPb,USDJPYb,EURJPYb,USDCHFb,EURCHFb,AUDUSDb,NZDUSDb,USDCADb,EURCADb,XAUUSDb,DowJones30"; // Trading Symbols @@ -60,7 +60,7 @@ input bool eaUseFixedTPSLPoints = true; // Use Fixed TP SL in Points input bool eaIgnoreTP = false; // Ignore TP input bool eaIgnoreSL = false; // Ignore SL input double eaTPPoint = 200; // Static TP Point -input double eaSLPoint = 500; // Static SL Point +input double eaSLPoint = 100; // Static SL Point // // Risk Management > Volume Calculation ... @@ -68,7 +68,7 @@ input group "Volume"; input bool eaUseDynamicVolume = false; // Use Dynamic Volume input double eaDynamicVolumeStep = 0.01; // Increase Volume Step input double eaDynamicVolumeBalanceFactor = 200; // Balance Factor for Generate Dynamic Volume -input double eaVolume = 0.3; // Static Volume +input double eaVolume = 0.2; // Static Volume // // Risk Management > Trade Management ... @@ -91,8 +91,8 @@ input double eaMinimumProfitPerVolumeForHedging = 1; // Minimum Required Profit // Risk Management > Trailling Stop ... input group "Trailling Stop"; input bool eaAllowTrailStop = false; // Allow Trail Stop -input double eaStartTrailInPoint = 100; // Trail Start After Profit (Point) -input double eaTrailStepInPoint = 30; // Trail Size in each Step (Point) +input double eaStartTrailInPoint = 50; // Trail Start After Profit (Point) +input double eaTrailStepInPoint = 25; // Trail Size in each Step (Point) input bool eaIgnoreTPAfterTrail = true; // Ignore TP after Trail // @@ -861,32 +861,32 @@ void OnSignalRecieved( return; } - // - // Here we Can Increase Signal Volume if - // it is not force Filtered ... - bool isForceFiltered = parser.IsFiltered( - signal, - conditions, - true // - ); - if (!isForceFiltered) - { - // - // TODO: - // Implement Strong Signals Conditions - // Senarios ... - forceSignalsCount++; + // // + // // Here we Can Increase Signal Volume if + // // it is not force Filtered ... + // bool isForceFiltered = parser.IsFiltered( + // signal, + // conditions, + // true // + // ); + // if (!isForceFiltered) + // { + // // + // // TODO: + // // Implement Strong Signals Conditions + // // Senarios ... + // forceSignalsCount++; - // - // Alert Froce Strong Signals - // if Provided ... - if (eaAlertStrongSignals) - { - // - string msg = "Foce Strong " + (IsLong(signal.type) ? "Long" : "Short") + " Signal Recieved: (" + signal.provider + "," + signal.symbol + "," + ToString(signal.period) + ") ..."; - eaAlert.Alert(msg); - } - } + // // + // // Alert Froce Strong Signals + // // if Provided ... + // if (eaAlertStrongSignals) + // { + // // + // string msg = "Foce Strong " + (IsLong(signal.type) ? "Long" : "Short") + " Signal Recieved: (" + signal.provider + "," + signal.symbol + "," + ToString(signal.period) + ") ..."; + // eaAlert.Alert(msg); + // } + // } // // Attach Conditions Summary to Signal ... diff --git a/Parsers/AMarkets/x-saherelm.xch.amarkets.parser.mq5 b/Parsers/AMarkets/x-saherelm.xch.amarkets.parser.mq5 index 74929339..6d4a810d 100644 --- a/Parsers/AMarkets/x-saherelm.xch.amarkets.parser.mq5 +++ b/Parsers/AMarkets/x-saherelm.xch.amarkets.parser.mq5 @@ -197,6 +197,21 @@ struct XCHStartegyAMarketsConditionsParser bool isEURCAD = _symbolParser.IsEURCAD(signal.symbol); bool isDowJones = _symbolParser.IsDowJones(signal.symbol); + // + bool isEURUSDFiltered = false; + bool isGBPUSDFiltered = false; + bool isEURGBPFiltered = false; + bool isXAUUSDFiltered = false; + bool isUSDJPYFiltered = false; + bool isEURJPYFiltered = false; + bool isUSDCHFFiltered = false; + bool isEURCHFFiltered = false; + bool isAUDUSDFiltered = false; + bool isNZDUSDFiltered = false; + bool isUSDCADFiltered = false; + bool isEURCADFiltered = false; + bool isDowJonesFiltered = false; + // if (!force) { @@ -446,6 +461,21 @@ struct XCHStartegyAMarketsConditionsParser bool isEURCAD = _symbolParser.IsEURCAD(signal.symbol); bool isDowJones = _symbolParser.IsDowJones(signal.symbol); + // + bool isEURUSDFiltered = false; + bool isGBPUSDFiltered = false; + bool isEURGBPFiltered = false; + bool isXAUUSDFiltered = false; + bool isUSDJPYFiltered = false; + bool isEURJPYFiltered = false; + bool isUSDCHFFiltered = false; + bool isEURCHFFiltered = false; + bool isAUDUSDFiltered = false; + bool isNZDUSDFiltered = false; + bool isUSDCADFiltered = false; + bool isEURCADFiltered = false; + bool isDowJonesFiltered = false; + // if (!force) {