Updte Clean method for Use ZeroMemory on Collections ...

This commit is contained in:
2025-02-01 19:41:39 +03:30
parent 43837bcf16
commit 8c7bdfa9fa
24 changed files with 3816 additions and 248 deletions
-20
View File
@@ -1220,22 +1220,6 @@ class XCPOIDetector : public XCBaseAlert
//
Clean(mBullishFairValueGaps);
Clean(mBearishFairValueGaps);
//
ArrayFree(mSwingHighs);
ArrayFree(mSwingLows);
ArrayFree(mBullishMomentumBars);
ArrayFree(mBearishMomentumBars);
ArrayFree(mBullishRejectionBars);
ArrayFree(mBearishRejectionBars);
ArrayFree(mSupportZones);
ArrayFree(mResistanceZones);
ArrayFree(mSupplyZones);
ArrayFree(mDemandZones);
ArrayFree(mBullishOrderBlocks);
ArrayFree(mBearishOrderBlocks);
ArrayFree(mBullishFairValueGaps);
ArrayFree(mBearishFairValueGaps);
}
/**
@@ -1250,11 +1234,7 @@ class XCPOIDetector : public XCBaseAlert
*/
void DestroyEventListeners()
{
//
Clean(mEventListeners);
//
ArrayFree(mEventListeners);
}
//
+2 -2
View File
@@ -45,7 +45,7 @@ class XCPOIDrawer : public XCBase
void ~XCPOIDrawer()
{
//
ArrayFree(mTicksZoneSpecs);
Clean(mTicksZoneSpecs);
}
//
@@ -4603,7 +4603,7 @@ class XCPOIDrawer : public XCBase
);
//
ArrayFree(stateObjects);
Clean(stateObjects);
}
//
-11
View File
@@ -598,17 +598,6 @@ class XCTrade : public XCBase
Clean(mOnPartialCloseEventHandlers);
Clean(mPositionsChangedEventHandlers);
Clean(mTradeStateChangedEventHandlers);
//
ArrayFree(mOnModifyEventHandlers);
ArrayFree(mStopLossEventHandlers);
ArrayFree(mTakeProfitEventHandlers);
ArrayFree(mDealsChangedEventHandlers);
ArrayFree(mOnForceCloseEventHandlers);
ArrayFree(mOrdersChangedEventHandlers);
ArrayFree(mOnPartialCloseEventHandlers);
ArrayFree(mPositionsChangedEventHandlers);
ArrayFree(mTradeStateChangedEventHandlers);
}
//
@@ -1247,18 +1247,18 @@ bool DetectX121SMCXOBPVSignalSetup(
{
//
// Cleanup Arrays ...
ArrayFree(triggerPoiEvents);
ArrayFree(triggerCycleEvents);
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
ArrayFree(analysePoiEvents);
ArrayFree(analyseCycleEvents);
ArrayFree(verificationPoiEvents);
ArrayFree(verificationCycleEvents);
ArrayFree(consolidationPoiEvents);
ArrayFree(consolidationCycleEvents);
ArrayFree(visionPoiEvents);
ArrayFree(visionCycleEvents);
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
Clean(analyseCycleEvents);
Clean(verificationPoiEvents);
Clean(verificationCycleEvents);
Clean(consolidationPoiEvents);
Clean(consolidationCycleEvents);
Clean(visionPoiEvents);
Clean(visionCycleEvents);
//
return result;
@@ -1273,18 +1273,18 @@ bool DetectX121SMCXOBPVSignalSetup(
//
// Cleanup Arrays ...
ArrayFree(triggerPoiEvents);
ArrayFree(triggerCycleEvents);
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
ArrayFree(analysePoiEvents);
ArrayFree(analyseCycleEvents);
ArrayFree(verificationPoiEvents);
ArrayFree(verificationCycleEvents);
ArrayFree(consolidationPoiEvents);
ArrayFree(consolidationCycleEvents);
ArrayFree(visionPoiEvents);
ArrayFree(visionCycleEvents);
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
Clean(analyseCycleEvents);
Clean(verificationPoiEvents);
Clean(verificationCycleEvents);
Clean(consolidationPoiEvents);
Clean(consolidationCycleEvents);
Clean(visionPoiEvents);
Clean(visionCycleEvents);
//
return result;
@@ -1505,8 +1505,8 @@ bool DetectX121SMCXOBPVSignalTrigger(
//
// Cleanup Arrays ...
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
//
return result;
@@ -1553,8 +1553,8 @@ bool DetectX121SMCXOBPVSignalTrigger(
//
// Cleanup Arrays ...
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
//
return result;
+6 -6
View File
@@ -476,12 +476,12 @@ class XCX121XATRHelper : public XCBaseHelper
~XCX121XATRHelper()
{
//
ArrayFree(rsiBuffer);
ArrayFree(atrUpperBuffer);
ArrayFree(atrLowerBuffer);
ArrayFree(atrBuffer);
ArrayFree(atrUpperRawBuffer);
ArrayFree(atrLowerRawBuffer);
Clean(rsiBuffer);
Clean(atrUpperBuffer);
Clean(atrLowerBuffer);
Clean(atrBuffer);
Clean(atrUpperRawBuffer);
Clean(atrLowerRawBuffer);
//
mInputs.Clean();
+8 -8
View File
@@ -438,14 +438,14 @@ class XCX121XCHEHelper : public XCBaseHelper
mInputs.Clean();
//
ArrayFree(le1Buffer);
ArrayFree(se1Buffer);
ArrayFree(le2Buffer);
ArrayFree(se2Buffer);
ArrayFree(le1StartBuffer);
ArrayFree(se1StartBuffer);
ArrayFree(le2StartBuffer);
ArrayFree(se2StartBuffer);
Clean(le1Buffer);
Clean(se1Buffer);
Clean(le2Buffer);
Clean(se2Buffer);
Clean(le1StartBuffer);
Clean(se1StartBuffer);
Clean(le2StartBuffer);
Clean(se2StartBuffer);
}
//
+8 -8
View File
@@ -425,14 +425,14 @@ class XCX121XDONHelper : public XCBaseHelper
mInputs.Clean();
//
ArrayFree(donOpenUpperBuffer);
ArrayFree(donOpenLowerBuffer);
ArrayFree(donHighUpperBuffer);
ArrayFree(donHighLowerBuffer);
ArrayFree(donLowUpperBuffer);
ArrayFree(donLowLowerBuffer);
ArrayFree(donCloseUpperBuffer);
ArrayFree(donCloseLowerBuffer);
Clean(donOpenUpperBuffer);
Clean(donOpenLowerBuffer);
Clean(donHighUpperBuffer);
Clean(donHighLowerBuffer);
Clean(donLowUpperBuffer);
Clean(donLowLowerBuffer);
Clean(donCloseUpperBuffer);
Clean(donCloseLowerBuffer);
}
//
+8 -8
View File
@@ -430,14 +430,14 @@ class XCX121XHKHelper : public XCBaseHelper
~XCX121XHKHelper()
{
//
ArrayFree(xhkRawOpenBuffer);
ArrayFree(xhkRawHighBuffer);
ArrayFree(xhkRawLowBuffer);
ArrayFree(xhkRawCloseBuffer);
ArrayFree(xhkSMOpenBuffer);
ArrayFree(xhkSMHighBuffer);
ArrayFree(xhkSMLowBuffer);
ArrayFree(xhkSMCloseBuffer);
Clean(xhkRawOpenBuffer);
Clean(xhkRawHighBuffer);
Clean(xhkRawLowBuffer);
Clean(xhkRawCloseBuffer);
Clean(xhkSMOpenBuffer);
Clean(xhkSMHighBuffer);
Clean(xhkSMLowBuffer);
Clean(xhkSMCloseBuffer);
//
mInputs.Clean();
+13 -13
View File
@@ -533,19 +533,19 @@ class XCX121XPVHelper : public XCBaseHelper
mInputs.Clean();
//
ArrayFree(peaksBuffer);
ArrayFree(valesBuffer);
ArrayFree(sarBuffer);
ArrayFree(cHHBuffer);
ArrayFree(cLLBuffer);
ArrayFree(sHHBuffer);
ArrayFree(sLLBuffer);
ArrayFree(mHHBuffer);
ArrayFree(mLLBuffer);
ArrayFree(lHHBuffer);
ArrayFree(lLLBuffer);
ArrayFree(hHHBuffer);
ArrayFree(hLLBuffer);
Clean(peaksBuffer);
Clean(valesBuffer);
Clean(sarBuffer);
Clean(cHHBuffer);
Clean(cLLBuffer);
Clean(sHHBuffer);
Clean(sLLBuffer);
Clean(mHHBuffer);
Clean(mLLBuffer);
Clean(lHHBuffer);
Clean(lLLBuffer);
Clean(hHHBuffer);
Clean(hLLBuffer);
}
//
+6 -6
View File
@@ -358,12 +358,12 @@ class XCX121XSTRHelper : public XCBaseHelper
mInputs.Clean();
//
ArrayFree(strBuffer);
ArrayFree(atrBuffer);
ArrayFree(strPriceBuffer);
ArrayFree(strUpBuffer);
ArrayFree(strDownBuffer);
ArrayFree(strStateBuffer);
Clean(strBuffer);
Clean(atrBuffer);
Clean(strPriceBuffer);
Clean(strUpBuffer);
Clean(strDownBuffer);
Clean(strStateBuffer);
}
//
+8 -8
View File
@@ -467,14 +467,14 @@ class XCX121XVWAPHelper : public XCBaseHelper
mInputs.Clean();
//
ArrayFree(vwapFastBuffer);
ArrayFree(vwapMidBuffer);
ArrayFree(vwapSlowBuffer);
ArrayFree(vwapVolumeBuffer);
ArrayFree(vwapPriceBuffer);
ArrayFree(vwapFastStateBuffer);
ArrayFree(vwapMidStateBuffer);
ArrayFree(vwapSlowStateBuffer);
Clean(vwapFastBuffer);
Clean(vwapMidBuffer);
Clean(vwapSlowBuffer);
Clean(vwapVolumeBuffer);
Clean(vwapPriceBuffer);
Clean(vwapFastStateBuffer);
Clean(vwapMidStateBuffer);
Clean(vwapSlowStateBuffer);
}
//
+1
View File
@@ -7054,6 +7054,7 @@ void Clean(T &buffer[])
//
ArrayResize(buffer, 0);
ArrayFree(buffer);
ZeroMemory(buffer);
}
template <typename T>
void SpecificClean(T &buffer[])
+16 -16
View File
@@ -7901,7 +7901,7 @@ void FilterPivotState(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -7939,7 +7939,7 @@ void FilterPivotState(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -7977,7 +7977,7 @@ void FilterPivotState(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8015,7 +8015,7 @@ void FilterPivotState(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8057,7 +8057,7 @@ void FilterPivotState(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8095,7 +8095,7 @@ void FilterPivotState(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8133,7 +8133,7 @@ void FilterPivotState(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8171,7 +8171,7 @@ void FilterPivotState(
}
//
ArrayFree(tmp);
Clean(tmp);
}
}
@@ -8267,7 +8267,7 @@ bool DetectPivotStateBoxData(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8318,7 +8318,7 @@ bool DetectPivotStateBoxData(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8369,7 +8369,7 @@ bool DetectPivotStateBoxData(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8420,7 +8420,7 @@ bool DetectPivotStateBoxData(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8475,7 +8475,7 @@ bool DetectPivotStateBoxData(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8526,7 +8526,7 @@ bool DetectPivotStateBoxData(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8577,7 +8577,7 @@ bool DetectPivotStateBoxData(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -8628,7 +8628,7 @@ bool DetectPivotStateBoxData(
}
//
ArrayFree(tmp);
Clean(tmp);
}
//
@@ -501,7 +501,7 @@ class XCX121SMCBaseStrategy : public XCBaseAlert
mGuardBarTracker.Waits();
//
ArrayFree(positions);
Clean(positions);
//
return result;
@@ -868,7 +868,7 @@ class XCX121SMCBaseStrategy : public XCBaseAlert
}
//
ArrayFree(objects);
Clean(objects);
}
//
@@ -970,8 +970,8 @@ class XCX121SMCBaseStrategy : public XCBaseAlert
delete mBarAnalyser;
//
ArrayFree(mTicks);
ArrayFree(mSignalEventHandlers);
Clean(mTicks);
Clean(mSignalEventHandlers);
//
Destroy();
@@ -1629,9 +1629,9 @@ class XC121SMCTradeHandler : public XCBaseAlert
~XC121SMCTradeHandler()
{
//
ArrayFree(mData);
ArrayFree(mSymbolInfos);
ArrayFree(mLastExecutedSignals);
Clean(mData);
Clean(mSymbolInfos);
Clean(mLastExecutedSignals);
//
delete mDrawer;
+2 -2
View File
@@ -65,7 +65,7 @@ class XC121SMCExpert : public XCBaseExpert
// Deconstructor(s) ...
~XC121SMCExpert()
{
ArrayFree(mStrategies);
Clean(mStrategies);
}
//
@@ -2486,7 +2486,7 @@ class XC121SMCExpert : public XCBaseExpert
//
Clean(guards);
ArrayFree(guards);
Clean(guards);
}
//
+15 -15
View File
@@ -1674,21 +1674,21 @@ bool DetectX121SMCGuards(
//
// Release Arrays ...
ArrayFree(ownPositions);
ArrayFree(ownLongPositions);
ArrayFree(ownShortPositions);
ArrayFree(triggerPoiEvents);
ArrayFree(triggerCycleEvents);
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
ArrayFree(analysePoiEvents);
ArrayFree(analyseCycleEvents);
ArrayFree(verificationPoiEvents);
ArrayFree(verificationCycleEvents);
ArrayFree(consolidationPoiEvents);
ArrayFree(consolidationCycleEvents);
ArrayFree(visionPoiEvents);
ArrayFree(visionCycleEvents);
Clean(ownPositions);
Clean(ownLongPositions);
Clean(ownShortPositions);
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
Clean(analyseCycleEvents);
Clean(verificationPoiEvents);
Clean(verificationCycleEvents);
Clean(consolidationPoiEvents);
Clean(consolidationCycleEvents);
Clean(visionPoiEvents);
Clean(visionCycleEvents);
//
count = ArraySize(guards);
+22
View File
@@ -36,8 +36,10 @@ const string X121SMCStrategyToken = "X121SMC";
//
const string X121SMCXToken = "X121X";
const string X121SMCXOBSToken = "X121XOBS";
const string X121SMCXHKPVToken = "X121XHKPV";
const string X121SMCXOBPVToken = "X121XOBPV";
const string X121SMCXIOBPVToken = "X121XIOBPV";
//
// X121 SMC Providers ...
@@ -46,8 +48,10 @@ enum ENUM_X_121_SMC_PROVIDERS
//
X_121_SMC_PROVIDER_NONE,
X_121_SMC_PROVIDER_X,
X_121_SMC_PROVIDER_XOBS,
X_121_SMC_PROVIDER_XHKPV,
X_121_SMC_PROVIDER_XOBPV,
X_121_SMC_PROVIDER_XIOBPV,
};
//
@@ -1655,6 +1659,11 @@ string ToString(ENUM_X_121_SMC_PROVIDERS value)
result = X121SMCXToken;
break;
//
case X_121_SMC_PROVIDER_XOBS:
result = X121SMCXOBSToken;
break;
//
case X_121_SMC_PROVIDER_XHKPV:
result = X121SMCXHKPVToken;
@@ -1664,6 +1673,11 @@ string ToString(ENUM_X_121_SMC_PROVIDERS value)
case X_121_SMC_PROVIDER_XOBPV:
result = X121SMCXOBPVToken;
break;
//
case X_121_SMC_PROVIDER_XIOBPV:
result = X121SMCXIOBPVToken;
break;
}
//
@@ -1693,6 +1707,10 @@ ENUM_X_121_SMC_PROVIDERS ParseProvider(string value)
{
result = X_121_SMC_PROVIDER_X;
}
else if (Contains(X121SMCXOBSToken, value))
{
result = X_121_SMC_PROVIDER_XOBS;
}
else if (Contains(X121SMCXHKPVToken, value))
{
result = X_121_SMC_PROVIDER_XHKPV;
@@ -1701,6 +1719,10 @@ ENUM_X_121_SMC_PROVIDERS ParseProvider(string value)
{
result = X_121_SMC_PROVIDER_XOBPV;
}
else if (Contains(X121SMCXIOBPVToken, value))
{
result = X_121_SMC_PROVIDER_XIOBPV;
}
//
return result;
+28 -28
View File
@@ -1269,18 +1269,18 @@ bool DetectX121SMCXSignalSetup(
{
//
// Cleanup Arrays ...
ArrayFree(triggerPoiEvents);
ArrayFree(triggerCycleEvents);
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
ArrayFree(analysePoiEvents);
ArrayFree(analyseCycleEvents);
ArrayFree(verificationPoiEvents);
ArrayFree(verificationCycleEvents);
ArrayFree(consolidationPoiEvents);
ArrayFree(consolidationCycleEvents);
ArrayFree(visionPoiEvents);
ArrayFree(visionCycleEvents);
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
Clean(analyseCycleEvents);
Clean(verificationPoiEvents);
Clean(verificationCycleEvents);
Clean(consolidationPoiEvents);
Clean(consolidationCycleEvents);
Clean(visionPoiEvents);
Clean(visionCycleEvents);
//
return result;
@@ -1295,18 +1295,18 @@ bool DetectX121SMCXSignalSetup(
//
// Cleanup Arrays ...
ArrayFree(triggerPoiEvents);
ArrayFree(triggerCycleEvents);
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
ArrayFree(analysePoiEvents);
ArrayFree(analyseCycleEvents);
ArrayFree(verificationPoiEvents);
ArrayFree(verificationCycleEvents);
ArrayFree(consolidationPoiEvents);
ArrayFree(consolidationCycleEvents);
ArrayFree(visionPoiEvents);
ArrayFree(visionCycleEvents);
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
Clean(analyseCycleEvents);
Clean(verificationPoiEvents);
Clean(verificationCycleEvents);
Clean(consolidationPoiEvents);
Clean(consolidationCycleEvents);
Clean(visionPoiEvents);
Clean(visionCycleEvents);
//
return result;
@@ -1527,8 +1527,8 @@ bool DetectX121SMCXSignalTrigger(
//
// Cleanup Arrays ...
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
//
return result;
@@ -1575,8 +1575,8 @@ bool DetectX121SMCXSignalTrigger(
//
// Cleanup Arrays ...
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
//
return result;
@@ -1412,18 +1412,18 @@ bool DetectX121SMCXHKPVSignalSetup(
//
// Cleanup Arrays ...
ArrayFree(triggerPoiEvents);
ArrayFree(triggerCycleEvents);
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
ArrayFree(analysePoiEvents);
ArrayFree(analyseCycleEvents);
ArrayFree(verificationPoiEvents);
ArrayFree(verificationCycleEvents);
ArrayFree(consolidationPoiEvents);
ArrayFree(consolidationCycleEvents);
ArrayFree(visionPoiEvents);
ArrayFree(visionCycleEvents);
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
Clean(analyseCycleEvents);
Clean(verificationPoiEvents);
Clean(verificationCycleEvents);
Clean(consolidationPoiEvents);
Clean(consolidationCycleEvents);
Clean(visionPoiEvents);
Clean(visionCycleEvents);
//
return result;
@@ -1438,18 +1438,18 @@ bool DetectX121SMCXHKPVSignalSetup(
//
// Cleanup Arrays ...
ArrayFree(triggerPoiEvents);
ArrayFree(triggerCycleEvents);
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
ArrayFree(analysePoiEvents);
ArrayFree(analyseCycleEvents);
ArrayFree(verificationPoiEvents);
ArrayFree(verificationCycleEvents);
ArrayFree(consolidationPoiEvents);
ArrayFree(consolidationCycleEvents);
ArrayFree(visionPoiEvents);
ArrayFree(visionCycleEvents);
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
Clean(analyseCycleEvents);
Clean(verificationPoiEvents);
Clean(verificationCycleEvents);
Clean(consolidationPoiEvents);
Clean(consolidationCycleEvents);
Clean(visionPoiEvents);
Clean(visionCycleEvents);
//
return result;
@@ -1670,8 +1670,8 @@ bool DetectX121SMCXHKPVSignalTrigger(
//
// Cleanup Arrays ...
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
//
return result;
@@ -1718,8 +1718,8 @@ bool DetectX121SMCXHKPVSignalTrigger(
//
// Cleanup Arrays ...
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
//
return result;
File diff suppressed because it is too large Load Diff
@@ -972,18 +972,18 @@ bool DetectX121SMCXOBPVSignalSetup(
{
//
// Cleanup Arrays ...
ArrayFree(triggerPoiEvents);
ArrayFree(triggerCycleEvents);
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
ArrayFree(analysePoiEvents);
ArrayFree(analyseCycleEvents);
ArrayFree(verificationPoiEvents);
ArrayFree(verificationCycleEvents);
ArrayFree(consolidationPoiEvents);
ArrayFree(consolidationCycleEvents);
ArrayFree(visionPoiEvents);
ArrayFree(visionCycleEvents);
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
Clean(analyseCycleEvents);
Clean(verificationPoiEvents);
Clean(verificationCycleEvents);
Clean(consolidationPoiEvents);
Clean(consolidationCycleEvents);
Clean(visionPoiEvents);
Clean(visionCycleEvents);
//
return result;
@@ -998,18 +998,18 @@ bool DetectX121SMCXOBPVSignalSetup(
//
// Cleanup Arrays ...
ArrayFree(triggerPoiEvents);
ArrayFree(triggerCycleEvents);
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
ArrayFree(analysePoiEvents);
ArrayFree(analyseCycleEvents);
ArrayFree(verificationPoiEvents);
ArrayFree(verificationCycleEvents);
ArrayFree(consolidationPoiEvents);
ArrayFree(consolidationCycleEvents);
ArrayFree(visionPoiEvents);
ArrayFree(visionCycleEvents);
Clean(triggerPoiEvents);
Clean(triggerCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
Clean(analysePoiEvents);
Clean(analyseCycleEvents);
Clean(verificationPoiEvents);
Clean(verificationCycleEvents);
Clean(consolidationPoiEvents);
Clean(consolidationCycleEvents);
Clean(visionPoiEvents);
Clean(visionCycleEvents);
//
return result;
@@ -1230,8 +1230,8 @@ bool DetectX121SMCXOBPVSignalTrigger(
//
// Cleanup Arrays ...
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
//
return result;
@@ -1278,8 +1278,8 @@ bool DetectX121SMCXOBPVSignalTrigger(
//
// Cleanup Arrays ...
ArrayFree(decisionPoiEvents);
ArrayFree(decisionCycleEvents);
Clean(decisionPoiEvents);
Clean(decisionCycleEvents);
//
return result;
File diff suppressed because it is too large Load Diff
+504 -6
View File
@@ -28,8 +28,10 @@
//
#include "../Signals/x-121.smc.x.signal.lib.mq5"
#include "../Signals/x-121.smc.xobs.signal.lib.mq5"
#include "../Signals/x-121.smc.xhkpv.signal.lib.mq5"
#include "../Signals/x-121.smc.xobpv.signal.lib.mq5"
#include "../Signals/x-121.smc.xiobpv.signal.lib.mq5"
//
// Definitions ...
@@ -44,8 +46,10 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
//
// Props ...
bool useXSignal;
bool useXOBSSignal;
bool useXHKPVSignal;
bool useXOBPVSignal;
bool useXIOBPVSignal;
//
// Constructor(s) ...
@@ -68,9 +72,11 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
Destroy();
//
ArrayFree(mXConditionsCollection);
ArrayFree(mXHKPVConditionsCollection);
ArrayFree(mXOBPVConditionsCollection);
Clean(mXConditionsCollection);
Clean(mXOBSConditionsCollection);
Clean(mXHKPVConditionsCollection);
Clean(mXOBPVConditionsCollection);
Clean(mXIOBPVConditionsCollection);
}
//
@@ -197,8 +203,10 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
//
bool hasXSignal = false;
bool hasXOBSSignal = false;
bool hasXHKPVSignal = false;
bool hasXOBPVSignal = false;
bool hasXIOBPVSignal = false;
//
// X Signal ...
@@ -209,6 +217,15 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
hasSignal = hasXSignal;
}
//
// XOBS Signal ...
if (useXOBSSignal && !hasSignal)
{
//
hasXOBSSignal = DetectXOBSSignal(conditions);
hasSignal = hasXOBSSignal;
}
//
// XHKPV Signal ...
if (useXHKPVSignal && !hasSignal)
@@ -227,6 +244,15 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
hasSignal = hasXOBPVSignal;
}
//
// XIOBPV Signal ...
if (useXIOBPVSignal && !hasSignal)
{
//
hasXIOBPVSignal = DetectXIOBPVSignal(conditions);
hasSignal = hasXIOBPVSignal;
}
//
result = hasSignal;
if (!result)
@@ -399,6 +425,23 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
);
}
//
// XOBS Guard Detection ...
if (useXOBSSignal)
{
//
bool hasGuard = DetectX121SMCXOBSGuards(
guards,
positions,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
}
//
// XHKPV Guard Detection ...
if (useXHKPVSignal)
@@ -417,7 +460,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
}
//
// XPZ Guard Detection ...
// XOBPV Guard Detection ...
if (useXOBPVSignal)
{
//
@@ -433,6 +476,23 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
);
}
//
// XIOBPV Guard Detection ...
if (useXIOBPVSignal)
{
//
bool hasGuard = DetectX121SMCXIOBPVGuards(
guards,
positions,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
}
//
count = ArraySize(guards);
result = IsValidSize(count);
@@ -706,6 +766,224 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
return result;
}
//
// XOBS Signal ...
bool DetectXOBSSignal(
X121SMCStrategyConditions &conditions //
)
{
//
bool result = false;
//
bool isBullish = false;
bool isBearish = false;
//
int zIndex = 0;
int cIndex = zIndex + 1;
int pIndex = cIndex + 1;
int ppIndex = pIndex + 1;
//
string symbol = GetSymbol();
ENUM_TIMEFRAMES period = GetPeriod();
//
XOHCL zBar;
result = zBar.Init(
symbol,
period,
zIndex //
);
if (!result)
{
return result;
}
//
XOHCL cBar;
result = cBar.Init(
symbol,
period,
cIndex //
);
if (!result)
{
return result;
}
//
XOHCL pBar;
result = pBar.Init(
symbol,
period,
pIndex //
);
if (!result)
{
return result;
}
//
double cLL = cBar.FindLowest(7, MODE_LOW);
double cHH = cBar.FindHighest(7, MODE_HIGH);
//
datetime cTime = TimeCurrent();
//
ENUM_X_121_SMC_PROVIDERS provider = X_121_SMC_PROVIDER_XOBS;
string providerStr = ToString(provider);
//
// Detect Setup Conditions ...
datetime setupTime = mXOBSConditions.setupTime;
bool isSetuped = mXOBSConditions.IsSetuped();
ENUM_X_DIRECTION setupDir = mXOBSConditions.dir;
if (!isSetuped)
{
//
// Detect Signal Setup ...
isSetuped = DetectX121SMCXOBSSignalSetup(
symbol,
period,
mXOBSConditions,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
//
setupDir = mXOBSConditions.dir;
setupTime = mXOBSConditions.setupTime;
//
if (isSetuped)
{
//
int items = AddX121SMCXOBSConditionsIfNotExists(
mXOBSConditions,
mXOBSConditionsCollection //
);
//
mXOBSConditions.Clean();
}
}
//
int conditionsCount = ArraySize(mXOBSConditionsCollection);
result = IsValidSize(conditionsCount);
if (!result)
{
return result;
}
//
// Looking For Conditions ...
int selectedIndex = 0;
X121SMCStrategyXOBSSignalConditions mTmpConditions[];
Copy(
mXOBSConditionsCollection,
mTmpConditions //
);
X121SMCStrategyXOBSSignalConditions mConditions;
for (int i = 0; i < conditionsCount; i++)
{
//
// Check Triggers ...
bool canTrigger = mTmpConditions[i].CanTrigger();
datetime triggerTime = mTmpConditions[i].triggerTime;
if (!canTrigger)
{
//
// Detect Signal Trigger ...
canTrigger = DetectX121SMCXOBSSignalTrigger(
mTmpConditions[i],
symbol,
period,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
//
result = canTrigger;
if (!result)
{
//
bool isISetuped = mTmpConditions[i].IsSetuped();
if (!isISetuped)
{
//
ArrayRemove(
mXOBSConditionsCollection,
i,
1 //
);
}
continue;
}
//
triggerTime = mTmpConditions[i].triggerTime;
}
//
if (canTrigger)
{
//
selectedIndex = i;
mConditions = mTmpConditions[i];
break;
}
}
//
result = IsValid(mConditions.setupTime) &&
HasDirection(mConditions.dir);
if (!result)
{
return result;
}
//
// Remove Selected Index from Main Collection ...
ArrayRemove(
mXOBSConditionsCollection,
selectedIndex,
1 //
);
//
// Check Signal Direction ...
isBullish = IsBullish(mConditions.dir);
isBearish = IsBearish(mConditions.dir);
result = isBullish ||
isBearish;
if (!result)
{
return result;
}
//
// Issues Signal on Conditions ...
conditions.sl = mConditions.sl;
conditions.provider = providerStr;
conditions.signalDir = mConditions.dir;
conditions.target = mConditions.target;
//
return result;
}
//
// XHKPV Signal ...
bool DetectXHKPVSignal(
@@ -1142,6 +1420,224 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
return result;
}
//
// XIOBPV Signal ...
bool DetectXIOBPVSignal(
X121SMCStrategyConditions &conditions //
)
{
//
bool result = false;
//
bool isBullish = false;
bool isBearish = false;
//
int zIndex = 0;
int cIndex = zIndex + 1;
int pIndex = cIndex + 1;
int ppIndex = pIndex + 1;
//
string symbol = GetSymbol();
ENUM_TIMEFRAMES period = GetPeriod();
//
XOHCL zBar;
result = zBar.Init(
symbol,
period,
zIndex //
);
if (!result)
{
return result;
}
//
XOHCL cBar;
result = cBar.Init(
symbol,
period,
cIndex //
);
if (!result)
{
return result;
}
//
XOHCL pBar;
result = pBar.Init(
symbol,
period,
pIndex //
);
if (!result)
{
return result;
}
//
double cLL = cBar.FindLowest(7, MODE_LOW);
double cHH = cBar.FindHighest(7, MODE_HIGH);
//
datetime cTime = TimeCurrent();
//
ENUM_X_121_SMC_PROVIDERS provider = X_121_SMC_PROVIDER_XIOBPV;
string providerStr = ToString(provider);
//
// Detect Setup Conditions ...
datetime setupTime = mXIOBPVConditions.setupTime;
bool isSetuped = mXIOBPVConditions.IsSetuped();
ENUM_X_DIRECTION setupDir = mXIOBPVConditions.dir;
if (!isSetuped)
{
//
// Detect Signal Setup ...
isSetuped = DetectX121SMCXIOBPVSignalSetup(
symbol,
period,
mXIOBPVConditions,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
//
setupDir = mXIOBPVConditions.dir;
setupTime = mXIOBPVConditions.setupTime;
//
if (isSetuped)
{
//
int items = AddX121SMCXIOBPVConditionsIfNotExists(
mXIOBPVConditions,
mXIOBPVConditionsCollection //
);
//
mXIOBPVConditions.Clean();
}
}
//
int conditionsCount = ArraySize(mXIOBPVConditionsCollection);
result = IsValidSize(conditionsCount);
if (!result)
{
return result;
}
//
// Looking For Conditions ...
int selectedIndex = 0;
X121SMCStrategyXIOBPVSignalConditions mTmpConditions[];
Copy(
mXIOBPVConditionsCollection,
mTmpConditions //
);
X121SMCStrategyXIOBPVSignalConditions mConditions;
for (int i = 0; i < conditionsCount; i++)
{
//
// Check Triggers ...
bool canTrigger = mTmpConditions[i].CanTrigger();
datetime triggerTime = mTmpConditions[i].triggerTime;
if (!canTrigger)
{
//
// Detect Signal Trigger ...
canTrigger = DetectX121SMCXIOBPVSignalTrigger(
mTmpConditions[i],
symbol,
period,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
//
result = canTrigger;
if (!result)
{
//
bool isISetuped = mTmpConditions[i].IsSetuped();
if (!isISetuped)
{
//
ArrayRemove(
mXIOBPVConditionsCollection,
i,
1 //
);
}
continue;
}
//
triggerTime = mTmpConditions[i].triggerTime;
}
//
if (canTrigger)
{
//
selectedIndex = i;
mConditions = mTmpConditions[i];
break;
}
}
//
result = IsValid(mConditions.setupTime) &&
HasDirection(mConditions.dir);
if (!result)
{
return result;
}
//
// Remove Selected Index from Main Collection ...
ArrayRemove(
mXIOBPVConditionsCollection,
selectedIndex,
1 //
);
//
// Check Signal Direction ...
isBullish = IsBullish(mConditions.dir);
isBearish = IsBearish(mConditions.dir);
result = isBullish ||
isBearish;
if (!result)
{
return result;
}
//
// Issues Signal on Conditions ...
conditions.sl = mConditions.sl;
conditions.provider = providerStr;
conditions.signalDir = mConditions.dir;
conditions.target = mConditions.target;
//
return result;
}
//
// Private ...
private:
@@ -1158,8 +1654,10 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
{
//
useXSignal = false;
useXHKPVSignal = true;
useXOBPVSignal = true;
useXOBSSignal = true;
useXHKPVSignal = false;
useXOBPVSignal = false;
useXIOBPVSignal = false;
//
string symbol = GetSymbol();