This commit is contained in:
2025-02-09 09:31:34 +03:30
parent 8799d7713d
commit 42fec0e906
9 changed files with 1830 additions and 1785 deletions
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -1678,7 +1678,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
X121SMCStrategyXSupDemOBSSignalConditions &conditions,
//
XC121SMCCycleHelper *triggerCycleHelper,
// XC121SMCCycleHelper *triggerCycleHelper,
XC121SMCCycleHelper *decisionCycleHelper,
XC121SMCCycleHelper *analyseCycleHelper,
XC121SMCCycleHelper *verificationCycleHelper,
@@ -1722,20 +1722,20 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
// Trigger ...
ENUM_XPOI_EVENTS triggerPoiEvents[];
ENUM_X_CYCLE_EVENTS triggerCycleEvents[];
X121SMCCycleConditions triggerConditions;
result = triggerCycleHelper.GetConditions(
triggerCycleEvents,
triggerPoiEvents,
triggerConditions,
zIndex,
loopback //
);
if (!result)
{
return result;
}
// ENUM_XPOI_EVENTS triggerPoiEvents[];
// ENUM_X_CYCLE_EVENTS triggerCycleEvents[];
// X121SMCCycleConditions triggerConditions;
// result = triggerCycleHelper.GetConditions(
// triggerCycleEvents,
// triggerPoiEvents,
// triggerConditions,
// zIndex,
// loopback //
// );
// if (!result)
// {
// return result;
// }
//
// Decision ...
@@ -1824,7 +1824,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
// Cycles POI States ...
XPOIState triggerState = triggerConditions.state;
// XPOIState triggerState = triggerConditions.state;
XPOIState decisionState = decisionConditions.state;
XPOIState analyseState = analyseConditions.state;
XPOIState verificationState = verificationConditions.state;
@@ -1833,7 +1833,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
// Cycle X121Conditions ...
X121Conditions triggerXConditions = triggerConditions.x121Conditions;
// X121Conditions triggerXConditions = triggerConditions.x121Conditions;
X121Conditions decisionXConditions = decisionConditions.x121Conditions;
X121Conditions analyseXConditions = analyseConditions.x121Conditions;
X121Conditions verificationXConditions = verificationConditions.x121Conditions;
@@ -1859,8 +1859,8 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
if (!result)
{
//
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
// Clean(triggerPoiEvents);
// Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
@@ -1874,7 +1874,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
visionState.Clean();
triggerState.Clean();
// triggerState.Clean();
analyseState.Clean();
decisionZBar.Clean();
decisionCBar.Clean();
@@ -1883,10 +1883,10 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
visionConditions.Clean();
visionXConditions.Clean();
verificationState.Clean();
triggerConditions.Clean();
// triggerConditions.Clean();
analyseConditions.Clean();
consolidationState.Clean();
triggerXConditions.Clean();
// triggerXConditions.Clean();
analyseXConditions.Clean();
decisionConditions.Clean();
decisionXConditions.Clean();
@@ -1905,8 +1905,8 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
if (!result)
{
//
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
// Clean(triggerPoiEvents);
// Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
@@ -1920,7 +1920,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
visionState.Clean();
triggerState.Clean();
// triggerState.Clean();
analyseState.Clean();
decisionZBar.Clean();
decisionCBar.Clean();
@@ -1929,10 +1929,10 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
visionConditions.Clean();
visionXConditions.Clean();
verificationState.Clean();
triggerConditions.Clean();
// triggerConditions.Clean();
analyseConditions.Clean();
consolidationState.Clean();
triggerXConditions.Clean();
// triggerXConditions.Clean();
analyseXConditions.Clean();
decisionConditions.Clean();
decisionXConditions.Clean();
@@ -1951,8 +1951,8 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
if (!result)
{
//
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
// Clean(triggerPoiEvents);
// Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
@@ -1966,7 +1966,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
visionState.Clean();
triggerState.Clean();
// triggerState.Clean();
analyseState.Clean();
decisionZBar.Clean();
decisionCBar.Clean();
@@ -1975,10 +1975,10 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
visionConditions.Clean();
visionXConditions.Clean();
verificationState.Clean();
triggerConditions.Clean();
// triggerConditions.Clean();
analyseConditions.Clean();
consolidationState.Clean();
triggerXConditions.Clean();
// triggerXConditions.Clean();
analyseXConditions.Clean();
decisionConditions.Clean();
decisionXConditions.Clean();
@@ -2196,8 +2196,8 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
if (isDestroyed)
{
//
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
// Clean(triggerPoiEvents);
// Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
@@ -2211,7 +2211,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
visionState.Clean();
triggerState.Clean();
// triggerState.Clean();
analyseState.Clean();
decisionZBar.Clean();
decisionCBar.Clean();
@@ -2220,10 +2220,10 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
visionConditions.Clean();
visionXConditions.Clean();
verificationState.Clean();
triggerConditions.Clean();
// triggerConditions.Clean();
analyseConditions.Clean();
consolidationState.Clean();
triggerXConditions.Clean();
// triggerXConditions.Clean();
analyseXConditions.Clean();
decisionConditions.Clean();
decisionXConditions.Clean();
@@ -2254,8 +2254,8 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
if (!result)
{
//
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
// Clean(triggerPoiEvents);
// Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
@@ -2269,7 +2269,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
visionState.Clean();
triggerState.Clean();
// triggerState.Clean();
analyseState.Clean();
decisionZBar.Clean();
decisionCBar.Clean();
@@ -2278,10 +2278,10 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
visionConditions.Clean();
visionXConditions.Clean();
verificationState.Clean();
triggerConditions.Clean();
// triggerConditions.Clean();
analyseConditions.Clean();
consolidationState.Clean();
triggerXConditions.Clean();
// triggerXConditions.Clean();
analyseXConditions.Clean();
decisionConditions.Clean();
decisionXConditions.Clean();
@@ -2299,7 +2299,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
// Re Draw Working Zone ...
RemoveX121SMCXSupDemOBSWorkingZoneDraws();
// RemoveX121SMCXSupDemOBSWorkingZoneDraws();
DrawX121SMCXSupDemOBSWorkingZone(
conditions,
visionCycleHelper.mPOIDrawer //
@@ -2440,8 +2440,8 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
if (!result)
{
//
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
// Clean(triggerPoiEvents);
// Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
@@ -2455,7 +2455,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
visionState.Clean();
triggerState.Clean();
// triggerState.Clean();
analyseState.Clean();
decisionZBar.Clean();
decisionCBar.Clean();
@@ -2464,10 +2464,10 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
visionConditions.Clean();
visionXConditions.Clean();
verificationState.Clean();
triggerConditions.Clean();
// triggerConditions.Clean();
analyseConditions.Clean();
consolidationState.Clean();
triggerXConditions.Clean();
// triggerXConditions.Clean();
analyseXConditions.Clean();
decisionConditions.Clean();
decisionXConditions.Clean();
@@ -2613,8 +2613,8 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
Clean(fvgs);
//
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
// Clean(triggerPoiEvents);
// Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
@@ -2628,7 +2628,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
visionState.Clean();
triggerState.Clean();
// triggerState.Clean();
analyseState.Clean();
decisionZBar.Clean();
decisionCBar.Clean();
@@ -2637,10 +2637,10 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
visionConditions.Clean();
visionXConditions.Clean();
verificationState.Clean();
triggerConditions.Clean();
// triggerConditions.Clean();
analyseConditions.Clean();
consolidationState.Clean();
triggerXConditions.Clean();
// triggerXConditions.Clean();
analyseXConditions.Clean();
decisionConditions.Clean();
decisionXConditions.Clean();
@@ -2728,8 +2728,8 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
Clean(fvgs);
//
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
// Clean(triggerPoiEvents);
// Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
@@ -2743,7 +2743,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
visionState.Clean();
triggerState.Clean();
// triggerState.Clean();
analyseState.Clean();
decisionZBar.Clean();
decisionCBar.Clean();
@@ -2752,10 +2752,10 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
visionConditions.Clean();
visionXConditions.Clean();
verificationState.Clean();
triggerConditions.Clean();
// triggerConditions.Clean();
analyseConditions.Clean();
consolidationState.Clean();
triggerXConditions.Clean();
// triggerXConditions.Clean();
analyseXConditions.Clean();
decisionConditions.Clean();
decisionXConditions.Clean();
@@ -2776,8 +2776,8 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
Clean(fvgs);
//
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
// Clean(triggerPoiEvents);
// Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
@@ -2791,16 +2791,16 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
visionState.Clean();
triggerState.Clean();
// triggerState.Clean();
analyseState.Clean();
decisionState.Clean();
visionConditions.Clean();
visionXConditions.Clean();
verificationState.Clean();
triggerConditions.Clean();
// triggerConditions.Clean();
analyseConditions.Clean();
consolidationState.Clean();
triggerXConditions.Clean();
// triggerXConditions.Clean();
analyseXConditions.Clean();
decisionConditions.Clean();
decisionXConditions.Clean();
@@ -3013,8 +3013,8 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
ZeroMemory(insideFVG);
//
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
// Clean(triggerPoiEvents);
// Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
@@ -3028,7 +3028,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
//
visionState.Clean();
triggerState.Clean();
// triggerState.Clean();
analyseState.Clean();
decisionZBar.Clean();
decisionCBar.Clean();
@@ -3037,10 +3037,10 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
visionConditions.Clean();
visionXConditions.Clean();
verificationState.Clean();
triggerConditions.Clean();
// triggerConditions.Clean();
analyseConditions.Clean();
consolidationState.Clean();
triggerXConditions.Clean();
// triggerXConditions.Clean();
analyseXConditions.Clean();
decisionConditions.Clean();
decisionXConditions.Clean();
@@ -3161,7 +3161,7 @@ bool DetectX121SMCXSupDemOBSSignalTrigger(
string _symbol,
ENUM_TIMEFRAMES _period,
//
XC121SMCCycleHelper *triggerCycleHelper,
// XC121SMCCycleHelper *triggerCycleHelper,
XC121SMCCycleHelper *decisionCycleHelper,
XC121SMCCycleHelper *analyseCycleHelper,
XC121SMCCycleHelper *verificationCycleHelper,
@@ -3459,7 +3459,7 @@ bool DetectX121SMCXSupDemOBSSignalTrigger(
bool DetectX121SMCXSupDemOBSGuards(
X121SMCGuard &guards[],
const XPosition &positions[],
XC121SMCCycleHelper *triggerCycleHelper,
// XC121SMCCycleHelper *triggerCycleHelper,
XC121SMCCycleHelper *decisionCycleHelper,
XC121SMCCycleHelper *analyseCycleHelper,
XC121SMCCycleHelper *verificationCycleHelper,
@@ -3473,28 +3473,28 @@ bool DetectX121SMCXSupDemOBSGuards(
//
string provider = ToString(X_121_SMC_PROVIDER_XSUPDEMOBS);
//
result = DetectX121SMCGuards(
provider,
guards,
positions,
triggerCycleHelper,
decisionCycleHelper,
analyseCycleHelper,
verificationCycleHelper,
consolidationCycleHelper,
visionCycleHelper,
//
true, // CloseOnTPNear Guard ...
true, // CloseLongsOnBearishTrend Guard ...
true, // CloseShortsOnBullishTrend Guard ...
true, // CloseAllWeekend Guard ...
true, // PartialCloseOnTrendChange Guard ...
true, // TrailStop Guard ...
true, // TrailTarget Guard ...
true // Hedge Guard ...
//
);
// //
// result = DetectX121SMCGuards(
// provider,
// guards,
// positions,
// // triggerCycleHelper,
// decisionCycleHelper,
// analyseCycleHelper,
// verificationCycleHelper,
// consolidationCycleHelper,
// visionCycleHelper,
// //
// true, // CloseOnTPNear Guard ...
// true, // CloseLongsOnBearishTrend Guard ...
// true, // CloseShortsOnBullishTrend Guard ...
// true, // CloseAllWeekend Guard ...
// true, // PartialCloseOnTrendChange Guard ...
// true, // TrailStop Guard ...
// true, // TrailTarget Guard ...
// true // Hedge Guard ...
// //
// );
//
return result;