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-03-21 10:23:40 +03:30
parent 57bb590094
commit 7970785883
3 changed files with 364 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
X121SMCEA/Classes/x-121.smc.market.cycle.helper.class.mq5
+65 -41
View File
@@ -2640,6 +2640,12 @@ struct X121SMCStrategyConditionParser
// //
bool result = false; bool result = false;
//
// Configure ...
bool forceRetestBox = false;
bool forceHolderBox = false;
bool forceConsolidationZone = false;
// //
// Fil Selected Data ... // Fil Selected Data ...
XPOIState cState; XPOIState cState;
@@ -2755,6 +2761,7 @@ struct X121SMCStrategyConditionParser
IsBearish(iBarPosDir); IsBearish(iBarPosDir);
// //
XBoxZone selectedBox;
XSignalBox iSignalBox; XSignalBox iSignalBox;
count = ArraySize(waitingBoxes); count = ArraySize(waitingBoxes);
has = IsValidSize(count); has = IsValidSize(count);
@@ -2807,18 +2814,41 @@ struct X121SMCStrategyConditionParser
// //
has = has =
isBullish isBullish
? isBarValidForBullish && ? (hasFVG
(hasFVG
? isFVGBullishRejected ? isFVGBullishRejected
: isOBBullishRejected) : isOBBullishRejected)
: isBarValidForBearish && : (hasFVG
(hasFVG
? isFVGBearishRejected ? isFVGBearishRejected
: isOBBearishRejected); : isOBBearishRejected);
//
// Force Using OB ...
if (!has && hasFVG)
{
//
has = isBullish
? isOBBullishRejected
: isOBBearishRejected;
//
selectedBox = iBox.ob;
}
if (has) if (has)
{ {
// //
iSignalBox = iBox; iSignalBox = iBox;
if (!selectedBox.IsValid())
{
//
if (hasFVG)
{
selectedBox = iBox.fvg;
}
else
{
selectedBox = iBox.ob;
}
}
iBox.Clean(); iBox.Clean();
break; break;
} }
@@ -2827,30 +2857,20 @@ struct X121SMCStrategyConditionParser
iBox.Clean(); iBox.Clean();
} }
} }
has = iSignalBox.IsValid(); has =
iSignalBox.IsValid() &&
selectedBox.IsValid();
// //
// Retest Signal ... // Retest Signal ...
int retests = 0; int retests = 0;
if (has) if (has)
{ {
//
bool hasFVG = iSignalBox.fvg.IsValid();
XBoxZone iBox;
if (hasFVG)
{
iBox = iSignalBox.fvg;
}
else
{
iBox = iSignalBox.ob;
}
// //
int iFromIDX = GetBarIndex( int iFromIDX = GetBarIndex(
cBar.symbol, cBar.symbol,
cBar.period, cBar.period,
iBox.from // selectedBox.from //
); );
has = IsValidIndex(iFromIDX); has = IsValidIndex(iFromIDX);
if (has) if (has)
@@ -2870,21 +2890,21 @@ struct X121SMCStrategyConditionParser
// //
bool isBullishRetested = bool isBullishRetested =
// //
iBar.low < iBox.upper && iBar.low < selectedBox.upper &&
iBar.GetDown() > iBox.upper iBar.GetDown() > selectedBox.upper
// //
; ;
// //
bool isBearishRetested = bool isBearishRetested =
// //
iBar.high > iBox.lower && iBar.high > selectedBox.lower &&
iBar.GetUp() < iBox.lower iBar.GetUp() < selectedBox.lower
// //
; ;
// //
has = iBox.IsBullish() has = selectedBox.IsBullish()
? isBullishRetested ? isBullishRetested
: isBearishRetested; : isBearishRetested;
if (has) if (has)
@@ -2896,18 +2916,23 @@ struct X121SMCStrategyConditionParser
iBar.Clean(); iBar.Clean();
} }
} }
//
iBox.Clean();
} }
// //
bool isSignalBoxRetested = retests > 1; bool isSignalBoxRetested =
!forceRetestBox
? retests >= 1
: retests >= 2;
bool hasSignalBox = iSignalBox.IsValid(); bool hasSignalBox = iSignalBox.IsValid();
bool isSignalBoxBullish = IsBullish(iSignalBox.ob.dir); bool isSignalBoxBullish = IsBullish(iSignalBox.ob.dir);
// //
// Check Consolidation Zone ... // Check Consolidation Zone ...
bool hasBullishCZone = true;
bool hasBearishCZone = true;
if (forceConsolidationZone)
{
//
XBoxZone cZone; XBoxZone cZone;
XBoxZone tmpBoxes[]; XBoxZone tmpBoxes[];
if (isSignalBoxBullish) if (isSignalBoxBullish)
@@ -2993,13 +3018,17 @@ struct X121SMCStrategyConditionParser
Clean(tmpBoxes); Clean(tmpBoxes);
// //
bool hasBullishCZone = cZone.IsValid() && hasBullishCZone = cZone.IsValid() &&
cZone.IsBullish(); cZone.IsBullish();
// //
bool hasBearishZone = cZone.IsValid() && hasBearishCZone = cZone.IsValid() &&
cZone.IsBearish(); cZone.IsBearish();
//
cZone.Clean();
}
// //
// Bullish Conditions ... // Bullish Conditions ...
isBullish = isBullish =
@@ -3025,7 +3054,7 @@ struct X121SMCStrategyConditionParser
( (
// //
hasSignalBox && hasSignalBox &&
hasBearishZone && hasBearishCZone &&
!isSignalBoxBullish && !isSignalBoxBullish &&
isSignalBoxRetested && isSignalBoxRetested &&
isBarValidForBearish isBarValidForBearish
@@ -3048,20 +3077,14 @@ struct X121SMCStrategyConditionParser
: X_DIRECTION_BEARISH; : X_DIRECTION_BEARISH;
// //
if (iSignalBox.fvg.IsValid()) box = selectedBox;
{
box = iSignalBox.fvg;
}
else
{
box = iSignalBox.ob;
}
//
box.to = TimeCurrent(); box.to = TimeCurrent();
// //
// Detect Holder Box ... // Detect Holder Box ...
if (forceHolderBox)
{
//
XBoxZone tmpBoxes[]; XBoxZone tmpBoxes[];
if (isBullish) if (isBullish)
{ {
@@ -3206,6 +3229,7 @@ struct X121SMCStrategyConditionParser
holderBox.Clean(); holderBox.Clean();
} }
} }
}
// //
// Check All Conditions ... // Check All Conditions ...
@@ -3220,9 +3244,9 @@ struct X121SMCStrategyConditionParser
zBar.Clean(); zBar.Clean();
cBar.Clean(); cBar.Clean();
pBar.Clean(); pBar.Clean();
cZone.Clean();
cState.Clean(); cState.Clean();
iSignalBox.Clean(); iSignalBox.Clean();
selectedBox.Clean();
ZeroMemory(cHelper); ZeroMemory(cHelper);
cConditions.Clean(); cConditions.Clean();
cStateEvents.Clean(); cStateEvents.Clean();
X121SMCEA/Signals/x-121.smc.xwz.signal.class.mq5
+1 -1
View File
@@ -228,8 +228,8 @@ class XCX121SMCXWZSignalDetector : public XCBase
// Detectiong Signal Boxes ... // Detectiong Signal Boxes ...
hasWaitingBoxes = workingZone hasWaitingBoxes = workingZone
.DetectWaitingBoxes( .DetectWaitingBoxes(
X_CYCLE_CONSOLIDATION,
X_CYCLE_ANALYSE, X_CYCLE_ANALYSE,
X_CYCLE_DECISION,
provider, provider,
zIndex // zIndex //
); );
X121SMCEA/Signals/x-121.smc.xwz.signal.lib.mq5
+96
View File
@@ -662,11 +662,107 @@ struct X121SMCStrategyXWZWorkingZone
iSignalBox.ob = iOBBox; iSignalBox.ob = iOBBox;
iSignalBox.fvg = iFVGBox; iSignalBox.fvg = iFVGBox;
//
// Here We Check Waiting Box Contains Other Zones ...
// Like Support/Resistances ...
bool forceVerification = false;
if (forceVerification)
{
//
XBoxZone iVerificationBox;
XBoxZone tmpBoxes[];
if (isBullish)
{
//
ToBox(
provider.decisionState.supportZones,
tmpBoxes //
);
}
else
{
//
ToBox(
provider.decisionState.resistanceZones,
tmpBoxes //
);
}
has = HasChild(tmpBoxes);
if (has)
{
//
while (HasChild(tmpBoxes))
{
//
idx = GetYoungest(tmpBoxes);
has = IsValidIndex(idx);
if (!has)
{
break;
}
//
// Select Box ...
XBoxZone iBox = tmpBoxes[idx];
ArrayRemove(
tmpBoxes,
idx,
1 //
);
//
// Validate Box ...
bool isValidPassed = !IsBoxValid(
iBox,
barIndex //
);
bool isDirPassed = iBox.dir == iOBBox.dir;
bool isPlacePassed =
IsBoxInside(
iBox,
iOBBox //
)
//
&&
//
(!iFVGBox.IsValid()
? true
: IsBoxInsideOr(
iBox,
iFVGBox //
));
//
has =
isDirPassed &&
isValidPassed &&
isPlacePassed;
if (has)
{
//
iVerificationBox = iBox;
iBox.Clean();
break;
}
//
iBox.Clean();
}
}
has = iVerificationBox.IsValid();
Clean(tmpBoxes);
iVerificationBox.Clean();
}
//
if (has)
{
// //
AddRef( AddRef(
iSignalBox, iSignalBox,
waitingBoxes // waitingBoxes //
); );
}
// //
iSignalBox.Clean(); iSignalBox.Clean();