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

last ...

Browse Source
This commit is contained in:
saherelm
2025-02-12 10:13:33 +03:30
parent 34b49f8cb9
commit c353e8e543
5 changed files with 89 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Experts/x-saherelm.x-121.smc.ea.mq5
+1 -1
View File
@@ -39,7 +39,7 @@ input string eaLogSuffix = ""; // Log Suffix
// Symbols ... // Symbols ...
input group "Symbols"; input group "Symbols";
input bool eaMultiSymbol = false; // Use Multi Symbol input bool eaMultiSymbol = false; // Use Multi Symbol
input string eaSymbols = "EURUSDb,GBPUSDb,USDJPYb,USDCHFb"; // Trading Symbols input string eaSymbols = "EURUSDb,GBPUSDb,USDCHFb,USDJPYb,XAUUSDb"; // Trading Symbols
// //
// Signalling ... // Signalling ...
X121SMCEA/Classes/x-121.smc.base.strategy.class.mq5
+10
View File
@@ -264,6 +264,9 @@ class XCX121SMCBaseStrategy : public XCBaseAlert
*/ */
virtual void HandleTick() virtual void HandleTick()
{ {
//
DoUnwaitedTicksWork();
// //
// Check State ... // Check State ...
if (IsDisabled()) if (IsDisabled())
@@ -426,6 +429,13 @@ class XCX121SMCBaseStrategy : public XCBaseAlert
return result; return result;
} }
/**
* Update all Requirements without waiting ...
*/
virtual void DoUnwaitedTicksWork()
{
}
/** /**
* Detect SL Candidates based on Strategy and Conditions ... * Detect SL Candidates based on Strategy and Conditions ...
* *
X121SMCEA/Classes/x-121.smc.market.cycle.helper.class.mq5
+15 -32
View File
@@ -605,13 +605,26 @@ class XC121SMCCycleHelper : public XCBase
conditions.time = TimeCurrent(); conditions.time = TimeCurrent();
// //
// Consolidation Zones Implement here ... Update();
//
result = conditions.IsValid();
//
return result;
}
//
// Tools ...
void Update()
{
// //
int czLoopback = 5; int czLoopback = 5;
int maxAllowed = 20; int maxAllowed = 20;
bool isActiveConsolidationZoneBreaked = false; bool isActiveConsolidationZoneBreaked = false;
bool hasActiveConsolidationZone = mActiveConsolidationZone.IsValid(); bool hasActiveConsolidationZone = mActiveConsolidationZone.IsValid();
//
if (hasActiveConsolidationZone) if (hasActiveConsolidationZone)
{ {
// //
@@ -626,33 +639,12 @@ class XC121SMCCycleHelper : public XCBase
mConsolidationZones // mConsolidationZones //
); );
//
Add(
CONSOLIDATION_BREAKED_DETECTED,
events //
);
// //
CleanupArray( CleanupArray(
mConsolidationZones, mConsolidationZones,
maxAllowed // maxAllowed //
); );
// //
// if (GetPeriod() == PERIOD_M5)
// {
// //
// XCConsolidationZoneObject *czObj;
// bool isCreated = mPOIDrawer.CreateConsolidationZone(
// mActiveConsolidationZone,
// czObj //
// );
// if (isCreated)
// {
// mConsolidationObjects.Add(czObj);
// }
// }
// //
mActiveConsolidationZone.Clean(); mActiveConsolidationZone.Clean();
} }
@@ -691,7 +683,7 @@ class XC121SMCCycleHelper : public XCBase
GetPeriod(), GetPeriod(),
upper, upper,
lower, lower,
loopback // czLoopback //
); );
} }
} }
@@ -699,17 +691,8 @@ class XC121SMCCycleHelper : public XCBase
// //
mBar.Clean(); mBar.Clean();
} }
//
result = conditions.IsValid();
//
return result;
} }
//
// Tools ...
// //
// Virtuals ... // Virtuals ...
X121SMCEA/Signals/x-121.smc.xsupdemobs.signal.class.mq5
+8 -54
View File
@@ -454,6 +454,7 @@ class XCX121SMCXSupDemOBSSignalDetector : public XCBase
RemoveDraws(); RemoveDraws();
result = false; result = false;
mConditions.Clean(); mConditions.Clean();
RemoveWorkingZoneDraws();
// //
return result; return result;
@@ -500,6 +501,7 @@ class XCX121SMCXSupDemOBSSignalDetector : public XCBase
RemoveDraws(); RemoveDraws();
result = false; result = false;
mConditions.Clean(); mConditions.Clean();
RemoveWorkingZoneDraws();
// //
return result; return result;
@@ -722,6 +724,7 @@ class XCX121SMCXSupDemOBSSignalDetector : public XCBase
// //
RemoveDraws(); RemoveDraws();
RemoveWorkingZoneDraws();
// //
return result; return result;
@@ -864,6 +867,7 @@ class XCX121SMCXSupDemOBSSignalDetector : public XCBase
// //
RemoveDraws(); RemoveDraws();
RemoveWorkingZoneDraws();
// //
return result; return result;
@@ -1036,6 +1040,7 @@ class XCX121SMCXSupDemOBSSignalDetector : public XCBase
// //
RemoveDraws(); RemoveDraws();
RemoveWorkingZoneDraws();
// //
return result; return result;
@@ -1145,6 +1150,7 @@ class XCX121SMCXSupDemOBSSignalDetector : public XCBase
// //
RemoveDraws(); RemoveDraws();
RemoveWorkingZoneDraws();
// //
return result; return result;
@@ -1564,10 +1570,6 @@ class XCX121SMCXSupDemOBSSignalDetector : public XCBase
// //
RemoveDraws(); RemoveDraws();
RemoveWorkingZoneDraws(); RemoveWorkingZoneDraws();
DrawWorkingZone(
mConditions,
visionCycleHelper.mPOIDrawer //
);
// //
// Set Target Based On Supply or Demand Zone ... // Set Target Based On Supply or Demand Zone ...
@@ -1585,54 +1587,6 @@ class XCX121SMCXSupDemOBSSignalDetector : public XCBase
{ {
target = mConditions.workingZone.quarter3; target = mConditions.workingZone.quarter3;
} }
//
if (hasInsideZone)
{
//
if (hasInsideOB)
{
//
DrawOrderBlock(
insideOB,
visionCycleHelper.mPOIDrawer //
);
}
//
if (hasInsideFVG)
{
//
DrawFairValueGap(
insideFVG,
visionCycleHelper.mPOIDrawer //
);
}
}
//
if (hasRejectedZone)
{
//
if (hasRejectedOB)
{
//
DrawOrderBlock(
rejectedOB,
visionCycleHelper.mPOIDrawer //
);
}
//
if (hasRejectedFVG)
{
//
DrawFairValueGap(
rejectedFVG,
visionCycleHelper.mPOIDrawer //
);
}
}
} }
} }
@@ -1907,8 +1861,8 @@ class XCX121SMCXSupDemOBSSignalDetector : public XCBase
XC121SMCCycleHelper *consolidationCycleHelper, XC121SMCCycleHelper *consolidationCycleHelper,
XC121SMCCycleHelper *visionCycleHelper, XC121SMCCycleHelper *visionCycleHelper,
// //
int maxAllowedSetupAge = 60 // int maxAllowedSetupAge = 60
// //
) )
{ {
// //
X121SMCEA/Strategy/x-121.smc.strategy.class.mq5
+54 -131
View File
@@ -321,23 +321,6 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
if (useXSupDemOBSSignal && if (useXSupDemOBSSignal &&
hasXSupDemOBSSignal) hasXSupDemOBSSignal)
{ {
//
// Re Draw Working Zone ...
mXSupDemONSSignalDetector.RemoveWorkingZoneDraws();
mXSupDemONSSignalDetector.DrawWorkingZone(
mXSupDemOBSConditions,
mVisionCycleHelper.mPOIDrawer //
);
//
// Re Draw Working Zone ...
mXSupDemONSSignalDetector.RemoveDraws();
mXSupDemONSSignalDetector.DrawConditions(
mXSupDemOBSConditions,
mVisionCycleHelper.mPOIDrawer //
);
// //
// Configuring Amount Percent and ETC ... // Configuring Amount Percent and ETC ...
bool ignoreEAVolume = mXSupDemOBSConditions.reward > 0 && bool ignoreEAVolume = mXSupDemOBSConditions.reward > 0 &&
@@ -478,6 +461,60 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
return result; return result;
} }
/**
* Update all Requirements without waiting ...
*/
void DoUnwaitedTicksWork() override
{
//
// Update All Cycle Helpers ...
int zIndex = 0;
int loopback = 7;
//
// Decision ...
mDecisionCycleHelper.Update();
// //
// // Analyse ...
// ENUM_XPOI_EVENTS analysePoiEvents[];
// ENUM_X_CYCLE_EVENTS analyseCycleEvents[];
// X121SMCCycleConditions analyseConditions;
// mAnalyseCycleHelper.GetConditions(
// analyseCycleEvents,
// analysePoiEvents,
// analyseConditions,
// zIndex,
// loopback //
// );
// //
// // Consolidation ...
// ENUM_XPOI_EVENTS consolidationPoiEvents[];
// ENUM_X_CYCLE_EVENTS consolidationCycleEvents[];
// X121SMCCycleConditions consolidationConditions;
// mConsolidationCycleHelper.GetConditions(
// consolidationCycleEvents,
// consolidationPoiEvents,
// consolidationConditions,
// zIndex,
// loopback //
// );
// //
// // Vision ...
// ENUM_XPOI_EVENTS visionPoiEvents[];
// ENUM_X_CYCLE_EVENTS visionCycleEvents[];
// X121SMCCycleConditions visionConditions;
// mVisionCycleHelper.GetConditions(
// visionCycleEvents,
// visionPoiEvents,
// visionConditions,
// zIndex,
// loopback //
// );
}
/** /**
* Customize Strategy Identifier ... * Customize Strategy Identifier ...
*/ */
@@ -882,63 +919,6 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
// //
int requiredPOIS = MaxAllowedRequiredPOIs(); int requiredPOIS = MaxAllowedRequiredPOIs();
//
// Trigger Cycle ...
// mTriggerCycleHelper = new XC121SMCCycleHelper();
// isInited = mTriggerCycleHelper.Init(
// symbol,
// PERIOD_M1,
// x121Inputs,
// requiredPOIS //
// );
// if (isInited)
// {
// //
// // Configure POI Drawer ...
// color bullishColor = clrYellowGreen;
// color bearishColor = clrChocolate;
// //
// // Bars ...
// mTriggerCycleHelper.mPOIDrawer.BarBullishColor(bullishColor);
// mTriggerCycleHelper.mPOIDrawer.BarBearishColor(bearishColor);
// //
// // Swings ...
// mTriggerCycleHelper.mPOIDrawer.SwingLowColor(bullishColor);
// mTriggerCycleHelper.mPOIDrawer.SwingHighColor(bearishColor);
// //
// // Momentum ...
// mTriggerCycleHelper.mPOIDrawer.BullishMomentumBarColor(bullishColor);
// mTriggerCycleHelper.mPOIDrawer.BearishMomentumBarColor(bearishColor);
// //
// // Rejection ...
// mTriggerCycleHelper.mPOIDrawer.BullishRejectionBarColor(bullishColor);
// mTriggerCycleHelper.mPOIDrawer.BearishRejectionBarColor(bearishColor);
// //
// // Support and Resistance ...
// mTriggerCycleHelper.mPOIDrawer.SupportZoneColor(bullishColor);
// mTriggerCycleHelper.mPOIDrawer.ResistanceZoneColor(bearishColor);
// //
// // Demand and Supply ...
// mTriggerCycleHelper.mPOIDrawer.DemandZoneColor(bullishColor);
// mTriggerCycleHelper.mPOIDrawer.SupplyZoneColor(bearishColor);
// //
// // Order Blocks ...
// mTriggerCycleHelper.mPOIDrawer.BullishOrderBlockColor(bullishColor);
// mTriggerCycleHelper.mPOIDrawer.BearishOrderBlockColor(bearishColor);
// //
// // Fair Value Gaps ...
// mTriggerCycleHelper.mPOIDrawer.BullishFVGColor(bullishColor);
// mTriggerCycleHelper.mPOIDrawer.BearishFVGColor(bearishColor);
// }
// //
// Decision Cycle ... // Decision Cycle ...
mDecisionCycleHelper = new XC121SMCCycleHelper(); mDecisionCycleHelper = new XC121SMCCycleHelper();
@@ -1053,63 +1033,6 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
mAnalyseCycleHelper.mPOIDrawer.BearishFVGColor(bearishColor); mAnalyseCycleHelper.mPOIDrawer.BearishFVGColor(bearishColor);
} }
// //
// // Verification Cycle ...
// mVerificationCycleHelper = new XC121SMCCycleHelper();
// isInited = mVerificationCycleHelper.Init(
// symbol,
// PERIOD_M30,
// // x121Inputs,
// requiredPOIS //
// );
// if (isInited)
// {
// //
// // Configure POI Drawer ...
// color bullishColor = clrOliveDrab;
// color bearishColor = clrSteelBlue;
// //
// // Bars ...
// mVerificationCycleHelper.mPOIDrawer.BarBullishColor(bullishColor);
// mVerificationCycleHelper.mPOIDrawer.BarBearishColor(bearishColor);
// //
// // Swings ...
// mVerificationCycleHelper.mPOIDrawer.SwingLowColor(bullishColor);
// mVerificationCycleHelper.mPOIDrawer.SwingHighColor(bearishColor);
// //
// // Momentum ...
// mVerificationCycleHelper.mPOIDrawer.BullishMomentumBarColor(bullishColor);
// mVerificationCycleHelper.mPOIDrawer.BearishMomentumBarColor(bearishColor);
// //
// // Rejection ...
// mVerificationCycleHelper.mPOIDrawer.BullishRejectionBarColor(bullishColor);
// mVerificationCycleHelper.mPOIDrawer.BearishRejectionBarColor(bearishColor);
// //
// // Support and Resistance ...
// mVerificationCycleHelper.mPOIDrawer.SupportZoneColor(bullishColor);
// mVerificationCycleHelper.mPOIDrawer.ResistanceZoneColor(bearishColor);
// //
// // Demand and Supply ...
// mVerificationCycleHelper.mPOIDrawer.DemandZoneColor(bullishColor);
// mVerificationCycleHelper.mPOIDrawer.SupplyZoneColor(bearishColor);
// //
// // Order Blocks ...
// mVerificationCycleHelper.mPOIDrawer.BullishOrderBlockColor(bullishColor);
// mVerificationCycleHelper.mPOIDrawer.BearishOrderBlockColor(bearishColor);
// //
// // Fair Value Gaps ...
// mVerificationCycleHelper.mPOIDrawer.BullishFVGColor(bullishColor);
// mVerificationCycleHelper.mPOIDrawer.BearishFVGColor(bearishColor);
// }
// //
// Consolidation Cycle ... // Consolidation Cycle ...
mConsolidationCycleHelper = new XC121SMCCycleHelper(); mConsolidationCycleHelper = new XC121SMCCycleHelper();