From bd0e6ea14c014ac152c8d52d9b89173a4dfbd279 Mon Sep 17 00:00:00 2001 From: Hadi Khazaee Asl Date: Sun, 9 Feb 2025 23:23:09 +0330 Subject: [PATCH] remove commented unused codes for Cleaning up workSpace ... --- .../x-121.smc.xsupdemobs.signal.lib.mq5 | 384 +++++++----------- 1 file changed, 155 insertions(+), 229 deletions(-) diff --git a/X121SMCEA/Signals/x-121.smc.xsupdemobs.signal.lib.mq5 b/X121SMCEA/Signals/x-121.smc.xsupdemobs.signal.lib.mq5 index a8f522dd..42d41e34 100644 --- a/X121SMCEA/Signals/x-121.smc.xsupdemobs.signal.lib.mq5 +++ b/X121SMCEA/Signals/x-121.smc.xsupdemobs.signal.lib.mq5 @@ -1814,10 +1814,10 @@ bool DetectX121SMCXSupDemOBSSignalSetup( // // Cycle X121Conditions ... - // X121Conditions decisionXConditions = decisionConditions.x121Conditions; - // X121Conditions analyseXConditions = analyseConditions.x121Conditions; - // X121Conditions consolidationXConditions = consolidationConditions.x121Conditions; - // X121Conditions visionXConditions = visionConditions.x121Conditions; + X121Conditions decisionXConditions = decisionConditions.x121Conditions; + X121Conditions analyseXConditions = analyseConditions.x121Conditions; + X121Conditions consolidationXConditions = consolidationConditions.x121Conditions; + X121Conditions visionXConditions = visionConditions.x121Conditions; // // Setup Conditions ... @@ -1838,41 +1838,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup( if (!result) { // - // Clean(triggerPoiEvents); - // Clean(triggerCycleEvents); - Clean(decisionPoiEvents); - Clean(decisionCycleEvents); + Clean(visionPoiEvents); Clean(analysePoiEvents); + Clean(decisionPoiEvents); + Clean(visionCycleEvents); Clean(analyseCycleEvents); - // Clean(verificationPoiEvents); - // Clean(verificationCycleEvents); + Clean(decisionCycleEvents); Clean(consolidationPoiEvents); Clean(consolidationCycleEvents); - Clean(visionPoiEvents); - Clean(visionCycleEvents); // visionState.Clean(); - // triggerState.Clean(); analyseState.Clean(); decisionZBar.Clean(); decisionCBar.Clean(); decisionPBar.Clean(); decisionState.Clean(); visionConditions.Clean(); - // visionXConditions.Clean(); - // verificationState.Clean(); - // triggerConditions.Clean(); analyseConditions.Clean(); + visionXConditions.Clean(); consolidationState.Clean(); - // triggerXConditions.Clean(); - // analyseXConditions.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); - // verificationConditions.Clean(); - // verificationXConditions.Clean(); + analyseXConditions.Clean(); + decisionXConditions.Clean(); consolidationConditions.Clean(); - // consolidationXConditions.Clean(); + consolidationXConditions.Clean(); // return result; @@ -1884,41 +1874,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup( if (!result) { // - // Clean(triggerPoiEvents); - // Clean(triggerCycleEvents); - Clean(decisionPoiEvents); - Clean(decisionCycleEvents); + Clean(visionPoiEvents); Clean(analysePoiEvents); + Clean(decisionPoiEvents); + Clean(visionCycleEvents); Clean(analyseCycleEvents); - // Clean(verificationPoiEvents); - // Clean(verificationCycleEvents); + Clean(decisionCycleEvents); Clean(consolidationPoiEvents); Clean(consolidationCycleEvents); - Clean(visionPoiEvents); - Clean(visionCycleEvents); // visionState.Clean(); - // triggerState.Clean(); analyseState.Clean(); decisionZBar.Clean(); decisionCBar.Clean(); decisionPBar.Clean(); decisionState.Clean(); visionConditions.Clean(); - // visionXConditions.Clean(); - // verificationState.Clean(); - // triggerConditions.Clean(); analyseConditions.Clean(); + visionXConditions.Clean(); consolidationState.Clean(); - // triggerXConditions.Clean(); - // analyseXConditions.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); - // verificationConditions.Clean(); - // verificationXConditions.Clean(); + analyseXConditions.Clean(); + decisionXConditions.Clean(); consolidationConditions.Clean(); - // consolidationXConditions.Clean(); + consolidationXConditions.Clean(); // return result; @@ -1930,41 +1910,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup( if (!result) { // - // Clean(triggerPoiEvents); - // Clean(triggerCycleEvents); - Clean(decisionPoiEvents); - Clean(decisionCycleEvents); + Clean(visionPoiEvents); Clean(analysePoiEvents); + Clean(decisionPoiEvents); + Clean(visionCycleEvents); Clean(analyseCycleEvents); - // Clean(verificationPoiEvents); - // Clean(verificationCycleEvents); + Clean(decisionCycleEvents); Clean(consolidationPoiEvents); Clean(consolidationCycleEvents); - Clean(visionPoiEvents); - Clean(visionCycleEvents); // visionState.Clean(); - // triggerState.Clean(); analyseState.Clean(); decisionZBar.Clean(); decisionCBar.Clean(); decisionPBar.Clean(); decisionState.Clean(); visionConditions.Clean(); - // visionXConditions.Clean(); - // verificationState.Clean(); - // triggerConditions.Clean(); analyseConditions.Clean(); + visionXConditions.Clean(); consolidationState.Clean(); - // triggerXConditions.Clean(); - // analyseXConditions.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); - // verificationConditions.Clean(); - // verificationXConditions.Clean(); + analyseXConditions.Clean(); + decisionXConditions.Clean(); consolidationConditions.Clean(); - // consolidationXConditions.Clean(); + consolidationXConditions.Clean(); // return result; @@ -2175,41 +2145,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup( if (isDestroyed) { // - // Clean(triggerPoiEvents); - // Clean(triggerCycleEvents); - Clean(decisionPoiEvents); - Clean(decisionCycleEvents); + Clean(visionPoiEvents); Clean(analysePoiEvents); + Clean(decisionPoiEvents); + Clean(visionCycleEvents); Clean(analyseCycleEvents); - // Clean(verificationPoiEvents); - // Clean(verificationCycleEvents); + Clean(decisionCycleEvents); Clean(consolidationPoiEvents); Clean(consolidationCycleEvents); - Clean(visionPoiEvents); - Clean(visionCycleEvents); // visionState.Clean(); - // triggerState.Clean(); analyseState.Clean(); decisionZBar.Clean(); decisionCBar.Clean(); decisionPBar.Clean(); decisionState.Clean(); visionConditions.Clean(); - // visionXConditions.Clean(); - // verificationState.Clean(); - // triggerConditions.Clean(); analyseConditions.Clean(); + visionXConditions.Clean(); consolidationState.Clean(); - // triggerXConditions.Clean(); - // analyseXConditions.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); - // verificationConditions.Clean(); - // verificationXConditions.Clean(); + analyseXConditions.Clean(); + decisionXConditions.Clean(); consolidationConditions.Clean(); - // consolidationXConditions.Clean(); + consolidationXConditions.Clean(); // result = false; @@ -2233,41 +2193,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup( if (!result) { // - // Clean(triggerPoiEvents); - // Clean(triggerCycleEvents); - Clean(decisionPoiEvents); - Clean(decisionCycleEvents); + Clean(visionPoiEvents); Clean(analysePoiEvents); + Clean(decisionPoiEvents); + Clean(visionCycleEvents); Clean(analyseCycleEvents); - // Clean(verificationPoiEvents); - // Clean(verificationCycleEvents); + Clean(decisionCycleEvents); Clean(consolidationPoiEvents); Clean(consolidationCycleEvents); - Clean(visionPoiEvents); - Clean(visionCycleEvents); // visionState.Clean(); - // triggerState.Clean(); analyseState.Clean(); decisionZBar.Clean(); decisionCBar.Clean(); decisionPBar.Clean(); decisionState.Clean(); visionConditions.Clean(); - // visionXConditions.Clean(); - // verificationState.Clean(); - // triggerConditions.Clean(); analyseConditions.Clean(); + visionXConditions.Clean(); consolidationState.Clean(); - // triggerXConditions.Clean(); - // analyseXConditions.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); - // verificationConditions.Clean(); - // verificationXConditions.Clean(); + analyseXConditions.Clean(); + decisionXConditions.Clean(); consolidationConditions.Clean(); - // consolidationXConditions.Clean(); + consolidationXConditions.Clean(); // RemoveX121SMCXSupDemOBSDraws(); @@ -2419,41 +2369,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup( if (!result) { // - // Clean(triggerPoiEvents); - // Clean(triggerCycleEvents); - Clean(decisionPoiEvents); - Clean(decisionCycleEvents); + Clean(visionPoiEvents); Clean(analysePoiEvents); + Clean(visionCycleEvents); + Clean(decisionPoiEvents); Clean(analyseCycleEvents); - // Clean(verificationPoiEvents); - // Clean(verificationCycleEvents); + Clean(decisionCycleEvents); Clean(consolidationPoiEvents); Clean(consolidationCycleEvents); - Clean(visionPoiEvents); - Clean(visionCycleEvents); // visionState.Clean(); - // triggerState.Clean(); analyseState.Clean(); decisionZBar.Clean(); decisionCBar.Clean(); decisionPBar.Clean(); decisionState.Clean(); visionConditions.Clean(); - // visionXConditions.Clean(); - // verificationState.Clean(); - // triggerConditions.Clean(); analyseConditions.Clean(); + visionXConditions.Clean(); consolidationState.Clean(); - // triggerXConditions.Clean(); - // analyseXConditions.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); - // verificationConditions.Clean(); - // verificationXConditions.Clean(); + analyseXConditions.Clean(); + decisionXConditions.Clean(); consolidationConditions.Clean(); - // consolidationXConditions.Clean(); + consolidationXConditions.Clean(); // RemoveX121SMCXSupDemOBSDraws(); @@ -2563,7 +2503,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup( // iOBFVG.ob = iOB; iOBFVG.fvg = jFVG; - + // bool isValidOBFVG = iOBFVG.IsValid(); if (isValidOBFVG) @@ -2601,41 +2541,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup( Clean(fvgs); // - // Clean(triggerPoiEvents); - // Clean(triggerCycleEvents); - Clean(decisionPoiEvents); - Clean(decisionCycleEvents); + Clean(visionPoiEvents); Clean(analysePoiEvents); + Clean(decisionPoiEvents); + Clean(visionCycleEvents); Clean(analyseCycleEvents); - // Clean(verificationPoiEvents); - // Clean(verificationCycleEvents); + Clean(decisionCycleEvents); Clean(consolidationPoiEvents); Clean(consolidationCycleEvents); - Clean(visionPoiEvents); - Clean(visionCycleEvents); // visionState.Clean(); - // triggerState.Clean(); analyseState.Clean(); decisionZBar.Clean(); decisionCBar.Clean(); decisionPBar.Clean(); decisionState.Clean(); visionConditions.Clean(); - // visionXConditions.Clean(); - // verificationState.Clean(); - // triggerConditions.Clean(); analyseConditions.Clean(); + visionXConditions.Clean(); consolidationState.Clean(); - // triggerXConditions.Clean(); - // analyseXConditions.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); - // verificationConditions.Clean(); - // verificationXConditions.Clean(); + analyseXConditions.Clean(); + decisionXConditions.Clean(); consolidationConditions.Clean(); - // consolidationXConditions.Clean(); + consolidationXConditions.Clean(); // RemoveX121SMCXSupDemOBSDraws(); @@ -2716,41 +2646,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup( Clean(fvgs); // - // Clean(triggerPoiEvents); - // Clean(triggerCycleEvents); - Clean(decisionPoiEvents); - Clean(decisionCycleEvents); + Clean(visionPoiEvents); Clean(analysePoiEvents); + Clean(visionCycleEvents); + Clean(decisionPoiEvents); Clean(analyseCycleEvents); - // Clean(verificationPoiEvents); - // Clean(verificationCycleEvents); + Clean(decisionCycleEvents); Clean(consolidationPoiEvents); Clean(consolidationCycleEvents); - Clean(visionPoiEvents); - Clean(visionCycleEvents); // visionState.Clean(); - // triggerState.Clean(); analyseState.Clean(); decisionZBar.Clean(); decisionCBar.Clean(); decisionPBar.Clean(); decisionState.Clean(); visionConditions.Clean(); - // visionXConditions.Clean(); - // verificationState.Clean(); - // triggerConditions.Clean(); analyseConditions.Clean(); + visionXConditions.Clean(); consolidationState.Clean(); - // triggerXConditions.Clean(); - // analyseXConditions.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); - // verificationConditions.Clean(); - // verificationXConditions.Clean(); + analyseXConditions.Clean(); + decisionXConditions.Clean(); consolidationConditions.Clean(); - // consolidationXConditions.Clean(); + consolidationXConditions.Clean(); // RemoveX121SMCXSupDemOBSDraws(); @@ -2764,38 +2684,28 @@ bool DetectX121SMCXSupDemOBSSignalSetup( Clean(fvgs); // - // Clean(triggerPoiEvents); - // Clean(triggerCycleEvents); - Clean(decisionPoiEvents); - Clean(decisionCycleEvents); + Clean(visionPoiEvents); Clean(analysePoiEvents); + Clean(visionCycleEvents); + Clean(decisionPoiEvents); Clean(analyseCycleEvents); - // Clean(verificationPoiEvents); - // Clean(verificationCycleEvents); + Clean(decisionCycleEvents); Clean(consolidationPoiEvents); Clean(consolidationCycleEvents); - Clean(visionPoiEvents); - Clean(visionCycleEvents); // visionState.Clean(); - // triggerState.Clean(); analyseState.Clean(); decisionState.Clean(); visionConditions.Clean(); - // visionXConditions.Clean(); - // verificationState.Clean(); - // triggerConditions.Clean(); analyseConditions.Clean(); + visionXConditions.Clean(); consolidationState.Clean(); - // triggerXConditions.Clean(); - // analyseXConditions.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); - // verificationConditions.Clean(); - // verificationXConditions.Clean(); + analyseXConditions.Clean(); + decisionXConditions.Clean(); consolidationConditions.Clean(); - // consolidationXConditions.Clean(); + consolidationXConditions.Clean(); // // Now We Have to Wait for Price Inside Box ... @@ -3001,41 +2911,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup( ZeroMemory(insideFVG); // - // Clean(triggerPoiEvents); - // Clean(triggerCycleEvents); - Clean(decisionPoiEvents); - Clean(decisionCycleEvents); + Clean(visionPoiEvents); Clean(analysePoiEvents); + Clean(visionCycleEvents); + Clean(decisionPoiEvents); Clean(analyseCycleEvents); - // Clean(verificationPoiEvents); - // Clean(verificationCycleEvents); + Clean(decisionCycleEvents); Clean(consolidationPoiEvents); Clean(consolidationCycleEvents); - Clean(visionPoiEvents); - Clean(visionCycleEvents); // visionState.Clean(); - // triggerState.Clean(); analyseState.Clean(); decisionZBar.Clean(); decisionCBar.Clean(); decisionPBar.Clean(); decisionState.Clean(); visionConditions.Clean(); - // visionXConditions.Clean(); - // verificationState.Clean(); - // triggerConditions.Clean(); analyseConditions.Clean(); + visionXConditions.Clean(); consolidationState.Clean(); - // triggerXConditions.Clean(); - // analyseXConditions.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); - // verificationConditions.Clean(); - // verificationXConditions.Clean(); + analyseXConditions.Clean(); + decisionXConditions.Clean(); consolidationConditions.Clean(); - // consolidationXConditions.Clean(); + consolidationXConditions.Clean(); // // Summarize Conditions ... @@ -3149,10 +3049,8 @@ bool DetectX121SMCXSupDemOBSSignalTrigger( string _symbol, ENUM_TIMEFRAMES _period, // - // XC121SMCCycleHelper *triggerCycleHelper, XC121SMCCycleHelper *decisionCycleHelper, XC121SMCCycleHelper *analyseCycleHelper, - // XC121SMCCycleHelper *verificationCycleHelper, XC121SMCCycleHelper *consolidationCycleHelper, XC121SMCCycleHelper *visionCycleHelper, // @@ -3163,6 +3061,20 @@ bool DetectX121SMCXSupDemOBSSignalTrigger( // bool result = false; + // + result = + // + visionCycleHelper != NULL && + analyseCycleHelper != NULL && + decisionCycleHelper != NULL && + consolidationCycleHelper != NULL + // + ; + if (!result) + { + return result; + } + // result = conditions.IsSetuped(); if (!result) @@ -3277,7 +3189,7 @@ bool DetectX121SMCXSupDemOBSSignalTrigger( // // Cycle X121Conditions ... - // X121Conditions decisionXConditions = decisionConditions.x121Conditions; + X121Conditions decisionXConditions = decisionConditions.x121Conditions; // // Trigger Conditions ... @@ -3285,43 +3197,43 @@ bool DetectX121SMCXSupDemOBSSignalTrigger( // // Slopes ... - // // - // bool isRsiSlopeBullish = decisionXConditions.isRsiSlopeBullish; - // bool isStrSlopeBullish = decisionXConditions.isStrSlopeBullish; - // bool isAtrUpperSlopeBullish = decisionXConditions.isAtrUpperSlopeBullish; - // bool isAtrLowerSlopeBullish = decisionXConditions.isAtrLowerSlopeBullish; - // bool isVwapFastSlopeBullish = decisionXConditions.isVwapFastSlopeBullish; - // bool isVwapMidSlopeBullish = decisionXConditions.isVwapMidSlopeBullish; - // bool isVwapSlowSlopeBullish = decisionXConditions.isVwapSlowSlopeBullish; + // + bool isRsiSlopeBullish = decisionXConditions.isRsiSlopeBullish; + bool isStrSlopeBullish = decisionXConditions.isStrSlopeBullish; + bool isAtrUpperSlopeBullish = decisionXConditions.isAtrUpperSlopeBullish; + bool isAtrLowerSlopeBullish = decisionXConditions.isAtrLowerSlopeBullish; + bool isVwapFastSlopeBullish = decisionXConditions.isVwapFastSlopeBullish; + bool isVwapMidSlopeBullish = decisionXConditions.isVwapMidSlopeBullish; + bool isVwapSlowSlopeBullish = decisionXConditions.isVwapSlowSlopeBullish; - // // - // bool isRsiSlopeBearish = decisionXConditions.isRsiSlopeBearish; - // bool isStrSlopeBearish = decisionXConditions.isStrSlopeBearish; - // bool isAtrUpperSlopeBearish = decisionXConditions.isAtrUpperSlopeBearish; - // bool isAtrLowerSlopeBearish = decisionXConditions.isAtrLowerSlopeBearish; - // bool isVwapFastSlopeBearish = decisionXConditions.isVwapFastSlopeBearish; - // bool isVwapMidSlopeBearish = decisionXConditions.isVwapMidSlopeBearish; - // bool isVwapSlowSlopeBearish = decisionXConditions.isVwapSlowSlopeBearish; + // + bool isRsiSlopeBearish = decisionXConditions.isRsiSlopeBearish; + bool isStrSlopeBearish = decisionXConditions.isStrSlopeBearish; + bool isAtrUpperSlopeBearish = decisionXConditions.isAtrUpperSlopeBearish; + bool isAtrLowerSlopeBearish = decisionXConditions.isAtrLowerSlopeBearish; + bool isVwapFastSlopeBearish = decisionXConditions.isVwapFastSlopeBearish; + bool isVwapMidSlopeBearish = decisionXConditions.isVwapMidSlopeBearish; + bool isVwapSlowSlopeBearish = decisionXConditions.isVwapSlowSlopeBearish; - // // - // bool isSlopesBullish = - // isRsiSlopeBullish && - // isStrSlopeBullish && - // isAtrUpperSlopeBullish && - // isAtrLowerSlopeBullish && - // isVwapFastSlopeBullish && - // isVwapMidSlopeBullish && - // isVwapSlowSlopeBullish; + // + bool isSlopesBullish = + isRsiSlopeBullish && + isStrSlopeBullish && + isAtrUpperSlopeBullish && + isAtrLowerSlopeBullish && + isVwapFastSlopeBullish && + isVwapMidSlopeBullish && + isVwapSlowSlopeBullish; - // // - // bool isSlopesBearish = - // isRsiSlopeBearish && - // isStrSlopeBearish && - // isAtrUpperSlopeBearish && - // isAtrLowerSlopeBearish && - // isVwapFastSlopeBearish && - // isVwapMidSlopeBearish && - // isVwapSlowSlopeBearish; + // + bool isSlopesBearish = + isRsiSlopeBearish && + isStrSlopeBearish && + isAtrUpperSlopeBearish && + isAtrLowerSlopeBearish && + isVwapFastSlopeBearish && + isVwapMidSlopeBearish && + isVwapSlowSlopeBearish; // double point = conditions.point; @@ -3378,7 +3290,7 @@ bool DetectX121SMCXSupDemOBSSignalTrigger( // decisionState.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); + decisionXConditions.Clean(); // return result; @@ -3401,8 +3313,8 @@ bool DetectX121SMCXSupDemOBSSignalTrigger( ); // - double iAtr = 0; // decisionConditions.x121Conditions.atrBuffer[1]; - // iAtr *= 1.5; + double iAtr = decisionXConditions.atrBuffer[1]; + iAtr *= 2; // double slsMin = GetMin(sls); @@ -3436,7 +3348,7 @@ bool DetectX121SMCXSupDemOBSSignalTrigger( // decisionState.Clean(); decisionConditions.Clean(); - // decisionXConditions.Clean(); + decisionXConditions.Clean(); // return result; @@ -3447,17 +3359,31 @@ bool DetectX121SMCXSupDemOBSSignalTrigger( bool DetectX121SMCXSupDemOBSGuards( X121SMCGuard &guards[], const XPosition &positions[], - // XC121SMCCycleHelper *triggerCycleHelper, + // XC121SMCCycleHelper *decisionCycleHelper, XC121SMCCycleHelper *analyseCycleHelper, - // XC121SMCCycleHelper *verificationCycleHelper, XC121SMCCycleHelper *consolidationCycleHelper, - XC121SMCCycleHelper *visionCycleHelper // + XC121SMCCycleHelper *visionCycleHelper + // ) { // bool result = false; + // + result = + // + visionCycleHelper != NULL && + analyseCycleHelper != NULL && + decisionCycleHelper != NULL && + consolidationCycleHelper != NULL + // + ; + if (!result) + { + return result; + } + // string provider = ToString(X_121_SMC_PROVIDER_XSUPDEMOBS);