saherelm/MQL5Data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup and refocused workspace for using on XCATBEA Projects ...

Browse Source
This commit is contained in:
saherelm
2025-05-28 15:20:54 +03:30
parent 4c6be67a2d
commit 72e8b34da5
32 changed files with 18021 additions and 6061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Experts/xcatb.test.ea.mq5
+6 -78
View File
@@ -26,9 +26,8 @@
#include "../Classes/x-saherelm.x-trade.class.mq5"
#include "../Classes/x-saherelm.x-volume.class.mq5"
#include "../Helpers/x-saherelm.x121.xcatb.helper.mq5"
#include "../Libraries/x-saherelm.common.lib.mq5"
#include "../Libraries/x-saherelm.x121.xcatb.lib.mq5"
#include "../XCAEA/Classes/xcaea.x-trade.manager.class.mq5"
#include "../XCATBEA/Classes/xcatbea.x-trade.manager.class.mq5"
#include "../XCATBEA/Libraries/xcatbea.signaller.lib.mq5"
//
#define ShortName "XCATBEA"
@@ -97,7 +96,7 @@ input bool eaAllowTrade = true;
input bool eaAllowLongs = true; // Allow Long Trades
input bool eaAllowShorts = true; // Allow Short Trades
input string eaSessions = ""; // Active Sessions
input ENUM_XCAEA_TRADE_RESTRICTION_PERIOD eaRestrictionsPeriod = XCAEA_TRADE_RESTRICATION_NONE; // Restrictions Period
input ENUM_XCATBEA_TRADE_RESTRICTION_PERIOD eaRestrictionsPeriod = XCATBEA_TRADE_RESTRICATION_NONE; // Restrictions Period
input int eaMaxAllowedTPs = 0; // Max Allowed TP(s) in Restrictions Period
input int eaMaxAllowedSLs = 0; // Max Allowed SL(s) in Restrictions Period
input int eaMaxAllowedTrades = 0; // Max Allowed Trades in Restrictions Period
@@ -145,8 +144,8 @@ X121XCatbInputs eaInputs;
XTimeTracker eaTimeTracker;
XCX121XCatbHelper *eaHelper;
XCBarAnalyser *eaBarAnalyser;
XCXCAEATradeManager *eaTradeManager;
XCAEAStrategyConditions eaConditions;
XCXCATBEATradeManager *eaTradeManager;
XCATBEAStrategyConditions eaConditions;
//
// Event Handlers ...
@@ -299,77 +298,6 @@ void OnTick()
// Check Trigger Block Detected or Not ...
if (tradeUsingTriggerBlock)
{
//
// XTriggerBlock iTB;
// X121XCatbConditions iConditions;
// has = DetectTriggerBlock(
// //
// _Symbol,
// _Period,
// //
// iTB,
// //
// eaDrawer,
// eaBarAnalyser,
// //
// // Required Buffers ...
// eaHelper.atrBuffer,
// eaHelper.rsiBuffer,
// eaHelper.adxBuffer,
// eaHelper.adxpBuffer,
// eaHelper.adxnBuffer,
// eaHelper.peakBuffer,
// eaHelper.valeBuffer,
// eaHelper.deltaBuffer,
// eaHelper.sarBuffer,
// eaHelper.sarStateBuffer,
// eaHelper.trendBuffer,
// eaHelper.trendStateBuffer,
// eaHelper.atrUpperBuffer,
// eaHelper.atrLowerBuffer,
// eaHelper.sBarOpenBuffer,
// eaHelper.sBarCloseBuffer,
// eaHelper.hkSBarOpenBuffer,
// eaHelper.hkSBarCloseBuffer,
// eaHelper.peakGoldenBuffer,
// eaHelper.valeGoldenBuffer,
// eaHelper.deltaSignalBuffer,
// eaHelper.bullishVolumeSignalBuffer,
// eaHelper.bearishVolumeSignalBuffer,
// //
// cBarIndex,
// //
// // Signalling ...
// eaInputs.signalR2R,
// eaInputs.slAtrMultiplier,
// //
// // Configs ...
// eaInputs.rsiOBLevel,
// eaInputs.rsiOSLevel,
// eaInputs.adxThreshold,
// //
// // Validators ...
// eaInputs.forceObBarType,
// eaInputs.forceOBFVGBarType,
// eaInputs.forceHasSwing,
// eaInputs.forceHasFLiquidity,
// eaInputs.forceHasRLiquidity,
// eaInputs.validateGapSequence,
// eaInputs.validateBlockEdgeBreakout,
// //
// // Filters ...
// eaInputs.filterBasedOnPV,
// eaInputs.filterBasedOnSar,
// eaInputs.filterBasedOnRSI,
// eaInputs.filterBasedOnADX,
// eaInputs.filterBasedOnATR,
// eaInputs.filterBasedOnTrend,
// eaInputs.filterBasedOnDelta,
// eaInputs.filterBasedOnVolume,
// eaInputs.filterBasedOnSignalBar,
// eaInputs.filterBasedOnHKSignalBar //
// );
//
// Define Requirements ...
XTriggerBlock iTB;
@@ -869,7 +797,7 @@ void InitRequirements()
//
// EA Trae Manager ...
eaTradeManager = new XCXCAEATradeManager(
eaTradeManager = new XCXCATBEATradeManager(
eaTrade //
);
eaTradeManager.SaveTrades(true);