From c24dd6fe2a0e791d28f02df38c96fbf456016a23 Mon Sep 17 00:00:00 2001 From: Hadi Khazaee Asl Date: Fri, 19 Sep 2025 15:28:09 +0330 Subject: [PATCH] last works on XFIMAEA Specially Focused on Backtester ... --- .../x-saherelm.x-backtester.expert.class.mq5 | 2 +- Experts/x-saherelm.xfima.backtester.ea.mq5 | 2 +- Experts/x-saherelm.xfima.ea.mq5 | 2 +- .../Classes/x-saherelm.xfima.expert.class.mq5 | 0 .../x-saherelm.xfima.signaller.class.mq5 | 0 compile.cmd | 3 +- package.json | 1 + prepareXFIMAEA.js | 31 +++++++++++++++++++ x-mql-project.tools.js | 1 + 9 files changed, 38 insertions(+), 4 deletions(-) rename {XFIMA => XFIMAEA}/Classes/x-saherelm.xfima.expert.class.mq5 (100%) rename {XFIMA => XFIMAEA}/Classes/x-saherelm.xfima.signaller.class.mq5 (100%) create mode 100644 prepareXFIMAEA.js diff --git a/Classes/x-saherelm.x-backtester.expert.class.mq5 b/Classes/x-saherelm.x-backtester.expert.class.mq5 index eb1fbb8f..c6e57bd7 100644 --- a/Classes/x-saherelm.x-backtester.expert.class.mq5 +++ b/Classes/x-saherelm.x-backtester.expert.class.mq5 @@ -2094,7 +2094,7 @@ class XCBackTesterEA : public XCBase : entry - reward; // - string comment = ShortName + "_POS_" + ToXString(dir); + string comment = eaLogSuffix + "_POS_" + ToXString(dir); // if (isBullish) diff --git a/Experts/x-saherelm.xfima.backtester.ea.mq5 b/Experts/x-saherelm.xfima.backtester.ea.mq5 index 0a14d72b..0a341e21 100644 --- a/Experts/x-saherelm.xfima.backtester.ea.mq5 +++ b/Experts/x-saherelm.xfima.backtester.ea.mq5 @@ -27,7 +27,7 @@ #include "../Classes/x-saherelm.x-backtester.expert.class.mq5" #include "../Classes/x-saherelm.x-market.pattern.class.mq5" #include "../Classes/x-saherelm.x-poi.drawer.class.mq5" -#include "../XFIMA/Classes/x-saherelm.xfima.signaller.class.mq5" +#include "../XFIMAEA/Classes/x-saherelm.xfima.signaller.class.mq5" // // Definitions ... diff --git a/Experts/x-saherelm.xfima.ea.mq5 b/Experts/x-saherelm.xfima.ea.mq5 index 0e980bff..64054827 100644 --- a/Experts/x-saherelm.xfima.ea.mq5 +++ b/Experts/x-saherelm.xfima.ea.mq5 @@ -24,7 +24,7 @@ // // Importts ... -#include "../XFIMA/Classes/x-saherelm.xfima.expert.class.mq5" +#include "../XFIMAEA/Classes/x-saherelm.xfima.expert.class.mq5" // // Inputs ... diff --git a/XFIMA/Classes/x-saherelm.xfima.expert.class.mq5 b/XFIMAEA/Classes/x-saherelm.xfima.expert.class.mq5 similarity index 100% rename from XFIMA/Classes/x-saherelm.xfima.expert.class.mq5 rename to XFIMAEA/Classes/x-saherelm.xfima.expert.class.mq5 diff --git a/XFIMA/Classes/x-saherelm.xfima.signaller.class.mq5 b/XFIMAEA/Classes/x-saherelm.xfima.signaller.class.mq5 similarity index 100% rename from XFIMA/Classes/x-saherelm.xfima.signaller.class.mq5 rename to XFIMAEA/Classes/x-saherelm.xfima.signaller.class.mq5 diff --git a/compile.cmd b/compile.cmd index d70eb774..5d730624 100644 --- a/compile.cmd +++ b/compile.cmd @@ -1,6 +1,7 @@ @echo off - set METAEDITOR="C:\Program Files\MetaTrader 5 General\MetaEditor64.exe" + @REM set METAEDITOR="C:\Program Files\MetaTrader 5 General\MetaEditor64.exe" + set METAEDITOR="C:\Program Files\MetaTrader 5 Main\MetaEditor64.exe" set "LOGFILE=%~dpn1.log" if "%~1"=="" ( diff --git a/package.json b/package.json index f3ebc380..59448092 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "compileHelpers": "npm run mqlHelper helpers", "compileClasses": "npm run mqlHelper classes", "compileIndicators": "npm run mqlHelper indicators", + "repackXFIMAEA": "node prepareXFIMAEA.js", "repackXCATBEA": "node prepareXCATBEA.js", "repackXOM1EA": "node prepareXOM1EA.js" }, diff --git a/prepareXFIMAEA.js b/prepareXFIMAEA.js new file mode 100644 index 00000000..b1dd0809 --- /dev/null +++ b/prepareXFIMAEA.js @@ -0,0 +1,31 @@ +// +// Import Requirements ... +const XProjectTools = require("./x-mql-project.tools"); + +// +// define constants ... +const projectName = "XFIMAEA"; + +// +// Projects Resources ... +const projectResources = [ + "Libraries/*", // Required Libraries + "Classes/*", // Required Classes + "XFIMAEA/*", // XOM1EA Projects ... + "Indicators/x-saherelm.xfima", // Required Indicators + "Indicators/x-saherelm.x121.xct", // Required Indicators + "Helpers/x-saherelm.xfima.helper", // Indicator's Helpers Classes + "Experts/x-saherelm.xfima.backtester.ea", // Expert Advisers + "Experts/x-saherelm.xfima.ea", // Expert Advisers +]; + +// +run(); + +/** + * Main Project Function ... + */ +async function run() { + // + await XProjectTools.prepareProject(projectName, projectResources); +} diff --git a/x-mql-project.tools.js b/x-mql-project.tools.js index 69536d03..de891e03 100644 --- a/x-mql-project.tools.js +++ b/x-mql-project.tools.js @@ -26,6 +26,7 @@ const workspacePaths = [ "Libraries", // Required Libraries "XCATBEA", // XCATBEA Projects ... "XOM1EA", // XOM1EA Projects ... + "XFIMAEA", // XOM1EA Projects ... ]; //