This commit is contained in:
2024-07-24 19:18:43 +03:30
parent 21f9d79833
commit 53090256e3
4 changed files with 4454 additions and 12 deletions
+36 -3
View File
@@ -29,6 +29,7 @@
// //
#include "../Strategies/x-saherelm.xdtd.strategy.mq5" #include "../Strategies/x-saherelm.xdtd.strategy.mq5"
#include "../Strategies/x-saherelm.xchkm.strategy.mq5"
#include "../Strategies/x-saherelm.xtest.strategy.mq5" #include "../Strategies/x-saherelm.xtest.strategy.mq5"
// //
@@ -254,8 +255,8 @@ bool InitialEA()
// //
// Configure Trailing ... // Configure Trailing ...
eaTradeHandler.AllowTrailStops(false); eaTradeHandler.AllowTrailStops(false);
eaTradeHandler.TrailStepInPoint(15); eaTradeHandler.TrailStepInPoint(25);
eaTradeHandler.TrailStartInPoint(60); eaTradeHandler.TrailStartInPoint(50);
eaTradeHandler.IgnoreTPOnTrail(true); eaTradeHandler.IgnoreTPOnTrail(true);
eaTradeHandler.TrailBasedOnProfit(true); eaTradeHandler.TrailBasedOnProfit(true);
@@ -274,7 +275,8 @@ bool InitialEA()
// //
bool useXTest = false; bool useXTest = false;
bool useXDTD = true; bool useXDTD = false;
bool useXCHKM = true;
// //
// EURUSD ... // EURUSD ...
@@ -316,6 +318,37 @@ bool InitialEA()
RegisterStrategy(eurusdXTDTStrategy); RegisterStrategy(eurusdXTDTStrategy);
} }
//
// XCHKM ...
if (useXCHKM)
{
//
XSCXCHKMStrategy *eurusdXCHKMStrategy;
eurusdXCHKMStrategy = new XSCXCHKMStrategy(
eurusdSymbol,
PERIOD_M5,
eaVolume,
eaR2R, // R2R ...
eaSlippage,
magicNumber,
true, // Ignore Signal Execution
false, // Use TP SL Point
false, // Use Max
eaTPPoint, // TP
eaSLPoint, // SL
eaIgnoreTP,
eaIgnoreSL,
eaAllowLong,
eaAllowShort,
eaMaxAllowedLongs, // Max Longs
eaMaxAllowedShorts // Max Shorts
);
eurusdXCHKMStrategy.SetAlertLogAlerts(true);
eurusdXCHKMStrategy.SetAlertEnableAlerts(true);
eurusdXCHKMStrategy.AddSignalEventHandler(OnSignalRecieved);
RegisterStrategy(eurusdXCHKMStrategy);
}
// //
// XTest ... // XTest ...
if (useXTest) if (useXTest)
File diff suppressed because it is too large Load Diff
@@ -56,24 +56,16 @@ input ENUM_TIMEFRAMES lcPeriod = NULL; // Time Period
input group "Hind"; input group "Hind";
input ENUM_X_PERIOD_METHOD hcMethod = X_PERIOD_AUTO; // How to Find Period input ENUM_X_PERIOD_METHOD hcMethod = X_PERIOD_AUTO; // How to Find Period
input ENUM_TIMEFRAMES hcPeriod = NULL; // Time Period input ENUM_TIMEFRAMES hcPeriod = NULL; // Time Period
// //
// Presentation ... // Presentation ...
input group "Presentation"; input group "Presentation";
// //
// Current ...
input bool showCurrent = true; // Show Current Cycle input bool showCurrent = true; // Show Current Cycle
//
// Short ...
input bool showShort = true; // Show Short Cycle input bool showShort = true; // Show Short Cycle
//
// Medium ...
input bool showMedium = true; // Show Medium Cycle input bool showMedium = true; // Show Medium Cycle
//
// Long ...
input bool showLong = true; // Show Long Cycle input bool showLong = true; // Show Long Cycle
//
// Hind ...
input bool showHind = true; // Show Hind Cycle input bool showHind = true; // Show Hind Cycle
// //
File diff suppressed because it is too large Load Diff