This commit is contained in:
2025-02-07 18:27:55 +03:30
parent 4e7975859b
commit 1060997f82
5 changed files with 3214 additions and 323 deletions
+240 -256
View File
@@ -27,8 +27,8 @@
#include "../Classes/x-121.smc.market.cycle.helper.class.mq5"
//
#include "../Signals/x-121.smc.x.signal.lib.mq5"
#include "../Signals/x-121.smc.xobs.signal.lib.mq5"
#include "../Signals/x-121.smc.xsupdemobs.signal.lib.mq5"
//
// Definitions ...
@@ -42,8 +42,8 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
public:
//
// Props ...
bool useXSignal;
bool useXOBSSignal;
bool useXSupDemOBSSignal;
//
// Constructor(s) ...
@@ -104,8 +104,8 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
void Destroy() override
{
//
Clean(mXConditionsCollection);
Clean(mX121SMCXOBSConditionsCollection);
Clean(mX121SMCXSupDemOBSConditionsCollection);
//
ZeroMemory(mTriggerCycleHelper);
@@ -200,17 +200,8 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
bool hasSignal = false;
//
bool hasXSignal = false;
bool hasXOBSSignal = false;
//
// X Signal ...
if (useXSignal && !hasSignal)
{
//
hasXSignal = DetectXSignal(conditions);
hasSignal = hasXSignal;
}
bool hasXSupDemOBSSignal = false;
//
// XOBS Signal ...
@@ -221,6 +212,15 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
hasSignal = hasXOBSSignal;
}
//
// XSupDemOBS Signal ...
if (useXSupDemOBSSignal && !hasSignal)
{
//
hasXSupDemOBSSignal = DetectXSupDemOBSSignal(conditions);
hasSignal = hasXSupDemOBSSignal;
}
//
result = hasSignal;
if (!result)
@@ -377,11 +377,11 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
}
//
// X Guard Detection ...
if (useXSignal)
// XOBS Guard Detection ...
if (useXOBSSignal)
{
//
bool hasGuard = DetectX121SMCXGuards(
bool hasGuard = DetectX121SMCXOBSGuards(
guards,
positions,
mTriggerCycleHelper,
@@ -394,11 +394,11 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
}
//
// XOBS Guard Detection ...
if (useXOBSSignal)
// XSupDemOBS Guard Detection ...
if (useXSupDemOBSSignal)
{
//
bool hasGuard = DetectX121SMCXOBSGuards(
bool hasGuard = DetectX121SMCXSupDemOBSGuards(
guards,
positions,
mTriggerCycleHelper,
@@ -448,241 +448,6 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
//
// Signalling Functions ...
//
// X Signal ...
bool DetectXSignal(
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_X;
string providerStr = ToString(provider);
//
// Detect Setup Conditions ...
datetime setupTime = mXConditions.setupTime;
bool isSetuped = mXConditions.IsSetuped();
ENUM_X_DIRECTION setupDir = mXConditions.dir;
if (!isSetuped)
{
//
// Detect Signal Setup ...
isSetuped = DetectX121SMCXSignalSetup(
symbol,
period,
mXConditions,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
//
setupDir = mXConditions.dir;
setupTime = mXConditions.setupTime;
// //
// bool hasPivot = mXConditions.pivotZone.IsValid();
// if (hasPivot)
// {
// //
// XCBaseObject *drawnObjects[];
// int drawnCount = DrawX121SMCXConditions(
// mXConditions,
// drawnObjects,
// mPOIDrawer //
// );
// if (IsValidSize(drawnCount))
// {
// AddObjectsIfNotExists(drawnObjects);
// }
// }
//
if (isSetuped)
{
//
int items = AddX121SMCXConditionsIfNotExists(
mXConditions,
mXConditionsCollection //
);
//
mXConditions.Clean();
}
}
//
int conditionsCount = ArraySize(mXConditionsCollection);
result = IsValidSize(conditionsCount);
if (!result)
{
return result;
}
//
// Looking For Conditions ...
int selectedIndex = 0;
X121SMCStrategyXSignalConditions mTmpConditions[];
Copy(
mXConditionsCollection,
mTmpConditions //
);
X121SMCStrategyXSignalConditions 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 = DetectX121SMCXSignalTrigger(
mTmpConditions[i],
symbol,
period,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
//
result = canTrigger;
if (!result)
{
//
bool isISetuped = mTmpConditions[i].IsSetuped();
if (!isISetuped)
{
//
ArrayRemove(
mXConditionsCollection,
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(
mXConditionsCollection,
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;
}
//
// XOBS Signal ...
bool DetectXOBSSignal(
@@ -901,6 +666,225 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
return result;
}
//
// XSupDemOBS Signal ...
bool DetectXSupDemOBSSignal(
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_XSUPDEMOBS;
string providerStr = ToString(provider);
//
// Detect Setup Conditions ...
datetime setupTime = mX121SMCXSupDemOBSConditions.setupTime;
bool isSetuped = mX121SMCXSupDemOBSConditions.IsSetuped();
ENUM_X_DIRECTION setupDir = mX121SMCXSupDemOBSConditions.dir;
if (!isSetuped)
{
//
// Detect Signal Setup ...
isSetuped = DetectX121SMCXSupDemOBSSignalSetup(
symbol,
period,
mX121SMCXSupDemOBSConditions,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
//
setupDir = mX121SMCXSupDemOBSConditions.dir;
setupTime = mX121SMCXSupDemOBSConditions.setupTime;
//
if (isSetuped)
{
//
int items = AddX121SMCXSupDemOBSConditionsIfNotExists(
mX121SMCXSupDemOBSConditions,
mX121SMCXSupDemOBSConditionsCollection //
);
//
mX121SMCXSupDemOBSConditions.Clean();
}
}
//
int conditionsCount = ArraySize(mX121SMCXSupDemOBSConditionsCollection);
result = IsValidSize(conditionsCount);
if (!result)
{
return result;
}
//
// Looking For Conditions ...
int selectedIndex = 0;
X121SMCStrategyXSupDemOBSSignalConditions mTmpConditions[];
Copy(
mX121SMCXSupDemOBSConditionsCollection,
mTmpConditions //
);
X121SMCStrategyXSupDemOBSSignalConditions 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 = DetectX121SMCXSupDemOBSSignalTrigger(
mTmpConditions[i],
symbol,
period,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
//
result = canTrigger;
if (!result)
{
//
bool isISetuped = mTmpConditions[i].IsSetuped();
if (!isISetuped)
{
//
ArrayRemove(
mX121SMCXSupDemOBSConditionsCollection,
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(
mX121SMCXSupDemOBSConditionsCollection,
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:
@@ -916,8 +900,8 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
void InitialHelpers()
{
//
useXSignal = false;
useXOBSSignal = true;
useXOBSSignal = false;
useXSupDemOBSSignal = true;
//
string symbol = GetSymbol();