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-17 19:35:30 +03:30
parent 8d24dce5d2
commit 12db68f33e
4 changed files with 147 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documents/BKP/xsupdem/plib.tmp.codes.mq5
+73
View File
@@ -2044,3 +2044,76 @@ bool IsReject(
mObjects.Add(iObj); mObjects.Add(iObj);
} }
} }
//
RemoveDraws();
//
if (hasLastBullishConsolidationZone)
{
//
XCConsolidationZoneObject *iObj;
bool isCreated = visionCycleHelper
.mPOIDrawer
.CreateConsolidationZone(
lastBullishConsolidationZone,
iObj //
);
if (isCreated)
{
mObjects.Add(iObj);
}
}
//
if (hasLastBearishConsolidationZone)
{
//
XCConsolidationZoneObject *iObj;
bool isCreated = visionCycleHelper
.mPOIDrawer
.CreateConsolidationZone(
lastBearishConsolidationZone,
iObj //
);
if (isCreated)
{
mObjects.Add(iObj);
}
}
//
if (hasPrevBullishConsolidationZone)
{
//
XCConsolidationZoneObject *iObj;
bool isCreated = visionCycleHelper
.mPOIDrawer
.CreateConsolidationZone(
prevBullishConsolidationZone,
iObj //
);
if (isCreated)
{
mObjects.Add(iObj);
}
}
//
if (hasPrevBearishConsolidationZone)
{
//
XCConsolidationZoneObject *iObj;
bool isCreated = visionCycleHelper
.mPOIDrawer
.CreateConsolidationZone(
prevBearishConsolidationZone,
iObj //
);
if (isCreated)
{
mObjects.Add(iObj);
}
}
X121SMCEA/Libraries/x-121.smc.guard.lib.mq5
+32
View File
@@ -236,6 +236,7 @@ bool DetectX121SMCGuards(
if (!result) if (!result)
{ {
// //
zBar.Clean();
result = HasChild(guards); result = HasChild(guards);
return result; return result;
} }
@@ -251,6 +252,7 @@ bool DetectX121SMCGuards(
{ {
// //
zBar.Clean(); zBar.Clean();
cBar.Clean();
result = HasChild(guards); result = HasChild(guards);
return result; return result;
} }
@@ -267,6 +269,7 @@ bool DetectX121SMCGuards(
// //
zBar.Clean(); zBar.Clean();
cBar.Clean(); cBar.Clean();
pBar.Clean();
result = HasChild(guards); result = HasChild(guards);
return result; return result;
} }
@@ -284,6 +287,7 @@ bool DetectX121SMCGuards(
zBar.Clean(); zBar.Clean();
cBar.Clean(); cBar.Clean();
pBar.Clean(); pBar.Clean();
ppBar.Clean();
result = HasChild(guards); result = HasChild(guards);
return result; return result;
} }
@@ -319,6 +323,13 @@ bool DetectX121SMCGuards(
pBar.Clean(); pBar.Clean();
ppBar.Clean(); ppBar.Clean();
result = HasChild(guards); result = HasChild(guards);
//
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
//
decisionConditions.Clean();
return result; return result;
} }
@@ -349,6 +360,13 @@ bool DetectX121SMCGuards(
// //
decisionConditions.Clean(); decisionConditions.Clean();
//
Clean(analysePoiEvents);
Clean(analyseCycleEvents);
//
analyseConditions.Clean();
// //
result = HasChild(guards); result = HasChild(guards);
return result; return result;
@@ -388,6 +406,13 @@ bool DetectX121SMCGuards(
// //
analyseConditions.Clean(); analyseConditions.Clean();
//
Clean(consolidationPoiEvents);
Clean(consolidationCycleEvents);
//
consolidationConditions.Clean();
// //
result = HasChild(guards); result = HasChild(guards);
return result; return result;
@@ -434,6 +459,13 @@ bool DetectX121SMCGuards(
// //
consolidationConditions.Clean(); consolidationConditions.Clean();
//
Clean(visionPoiEvents);
Clean(visionCycleEvents);
//
visionConditions.Clean();
// //
result = HasChild(guards); result = HasChild(guards);
return result; return result;
X121SMCEA/Signals/x-121.smc.xwz.signal.class.mq5
+2 -106
View File
@@ -267,10 +267,6 @@ class XCX121SMCXWZSignalDetector : public XCBase
consolidationConditions.Clean(); consolidationConditions.Clean();
consolidationXConditions.Clean(); consolidationXConditions.Clean();
//
RemoveDraws();
RemoveWorkingZoneDraws();
// //
mConditions.Clean(); mConditions.Clean();
@@ -323,10 +319,6 @@ class XCX121SMCXWZSignalDetector : public XCBase
consolidationConditions.Clean(); consolidationConditions.Clean();
consolidationXConditions.Clean(); consolidationXConditions.Clean();
//
RemoveDraws();
RemoveWorkingZoneDraws();
// //
mConditions.Clean(); mConditions.Clean();
@@ -372,10 +364,6 @@ class XCX121SMCXWZSignalDetector : public XCBase
consolidationConditions.Clean(); consolidationConditions.Clean();
consolidationXConditions.Clean(); consolidationXConditions.Clean();
//
RemoveDraws();
RemoveWorkingZoneDraws();
// //
mConditions.Clean(); mConditions.Clean();
@@ -414,12 +402,6 @@ class XCX121SMCXWZSignalDetector : public XCBase
? canLookupShort ? canLookupShort
: false; : false;
//
DrawWorkingZone(
mConditions,
visionCycleHelper.mPOIDrawer //
);
// //
// Here we are Make sure we have Correct: // Here we are Make sure we have Correct:
// - WorkSpace ... // - WorkSpace ...
@@ -474,12 +456,6 @@ class XCX121SMCXWZSignalDetector : public XCBase
return result; return result;
} }
//
DrawConditions(
mConditions,
visionCycleHelper.mPOIDrawer //
);
// //
isBullish = IsBullish(conditionsDir); isBullish = IsBullish(conditionsDir);
isBearish = IsBearish(conditionsDir); isBearish = IsBearish(conditionsDir);
@@ -638,77 +614,6 @@ class XCX121SMCXWZSignalDetector : public XCBase
; ;
} }
//
RemoveDraws();
//
if (hasLastBullishConsolidationZone)
{
//
XCConsolidationZoneObject *iObj;
bool isCreated = visionCycleHelper
.mPOIDrawer
.CreateConsolidationZone(
lastBullishConsolidationZone,
iObj //
);
if (isCreated)
{
mObjects.Add(iObj);
}
}
//
if (hasLastBearishConsolidationZone)
{
//
XCConsolidationZoneObject *iObj;
bool isCreated = visionCycleHelper
.mPOIDrawer
.CreateConsolidationZone(
lastBearishConsolidationZone,
iObj //
);
if (isCreated)
{
mObjects.Add(iObj);
}
}
//
if (hasPrevBullishConsolidationZone)
{
//
XCConsolidationZoneObject *iObj;
bool isCreated = visionCycleHelper
.mPOIDrawer
.CreateConsolidationZone(
prevBullishConsolidationZone,
iObj //
);
if (isCreated)
{
mObjects.Add(iObj);
}
}
//
if (hasPrevBearishConsolidationZone)
{
//
XCConsolidationZoneObject *iObj;
bool isCreated = visionCycleHelper
.mPOIDrawer
.CreateConsolidationZone(
prevBearishConsolidationZone,
iObj //
);
if (isCreated)
{
mObjects.Add(iObj);
}
}
// //
bool isConsolidationZonePassed = bool isConsolidationZonePassed =
isBullish isBullish
@@ -788,12 +693,6 @@ class XCX121SMCXWZSignalDetector : public XCBase
// //
mConditions.UpdateTo(cTime); mConditions.UpdateTo(cTime);
//
DrawConditions(
mConditions,
visionCycleHelper.mPOIDrawer //
);
// //
Clean(visionPoiEvents); Clean(visionPoiEvents);
Clean(analysePoiEvents); Clean(analysePoiEvents);
@@ -1133,10 +1032,6 @@ class XCX121SMCXWZSignalDetector : public XCBase
// //
; ;
//
// TODO: Implement Guards ...
return false;
// //
result = isCycleHelpersValid; result = isCycleHelpersValid;
if (!result) if (!result)
@@ -1235,7 +1130,8 @@ class XCX121SMCXWZSignalDetector : public XCBase
// //
ENUM_X_121_SMC_GUARD_ACTIONS ignoreGuards[1] = { ENUM_X_121_SMC_GUARD_ACTIONS ignoreGuards[1] = {
X_121_SMC_GUARD_ACTION_TRAIL_STOP}; X_121_SMC_GUARD_ACTION_TRAIL_STOP //
};
result = DetectX121SMCGuards( result = DetectX121SMCGuards(
provider, provider,
guards, guards,
X121SMCEA/Strategy/x-121.smc.strategy.class.mq5
+40
View File
@@ -594,9 +594,33 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
setupDir = mXWZSignalDetector.mConditions.dir; setupDir = mXWZSignalDetector.mConditions.dir;
setupTime = mXWZSignalDetector.mConditions.setupTime; setupTime = mXWZSignalDetector.mConditions.setupTime;
//
if (!isSetuped)
{
//
mXWZSignalDetector.RemoveDraws();
mXWZSignalDetector.RemoveWorkingZoneDraws();
//
mXWZSignalDetector.DrawWorkingZone(
mXWZSignalDetector.mConditions,
mVisionCycleHelper.mPOIDrawer //
);
//
mXWZSignalDetector.DrawConditions(
mXWZSignalDetector.mConditions,
mVisionCycleHelper.mPOIDrawer //
);
}
// //
if (isSetuped) if (isSetuped)
{ {
//
mXWZSignalDetector.RemoveDraws();
mXWZSignalDetector.RemoveWorkingZoneDraws();
// //
int items = mXWZSignalDetector int items = mXWZSignalDetector
.AddConditionsIfNotExists(); .AddConditionsIfNotExists();
@@ -669,6 +693,22 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
// //
if (canTrigger) if (canTrigger)
{ {
//
mXWZSignalDetector.RemoveDraws();
mXWZSignalDetector.RemoveWorkingZoneDraws();
//
mXWZSignalDetector.DrawWorkingZone(
mTmpConditions[i],
mVisionCycleHelper.mPOIDrawer //
);
//
mXWZSignalDetector.DrawConditions(
mTmpConditions[i],
mVisionCycleHelper.mPOIDrawer //
);
// //
selectedIndex = i; selectedIndex = i;
mConditions = mTmpConditions[i]; mConditions = mTmpConditions[i];