saherelm/MQL5Data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

last works ... add new Ocillators ...

Browse Source
This commit is contained in:
saherelm
2025-03-28 07:24:05 +03:30
parent c00704b83b
commit b2c585bc93
11 changed files with 3380 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
X121SMCEA/Strategy/x-121.smc.strategy.class.mq5
+233 -3
View File
@@ -27,6 +27,7 @@
#include "../Classes/x-121.smc.market.cycle.helper.class.mq5"
//
#include "../Signals/x-121.smc.xich.signal.class.mq5"
#include "../Signals/x-121.smc.xwz.signal.class.mq5"
//
@@ -42,8 +43,11 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
//
// Props ...
bool useXWZSignal;
bool useXICHSignal;
bool useXWZSignalGuard;
bool useXICHSignalGuard;
XCX121SMCXWZSignalDetector *mXWZSignalDetector;
XCX121SMCXICHSignalDetector *mXICHSignalDetector;
X121SMCStrategySignalProviderData cycleProvider;
//
@@ -64,6 +68,12 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
_symbol,
_period //
);
//
mXICHSignalDetector = new XCX121SMCXICHSignalDetector(
_symbol,
_period //
);
}
//
@@ -121,6 +131,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
//
ZeroMemory(mXWZSignalDetector);
ZeroMemory(mXICHSignalDetector);
//
cycleProvider.Destroy();
@@ -203,9 +214,9 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
//
bool hasXWZSignal = false;
bool hasXICHSignal = false;
//
// XSupDemOBS Signal ...
X121SMCStrategyXWZSignalConditions mXWZConditions;
if (useXWZSignal && !hasSignal)
{
@@ -217,6 +228,18 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
hasSignal = hasXWZSignal;
}
//
X121SMCStrategyXICHSignalConditions mXICHConditions;
if (useXICHSignal && !hasSignal)
{
//
hasXICHSignal = DetectXICHSignal(
conditions,
mXICHConditions //
);
hasSignal = hasXICHSignal;
}
//
result = hasSignal;
if (!result)
@@ -400,6 +423,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
//
mXWZConditions.Clean();
mXICHConditions.Clean();
//
return result;
@@ -455,6 +479,34 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
Clean(xwzGuards);
}
//
// XICH Guard Detection ...
if (useXICHSignal &&
useXICHSignalGuard)
{
//
X121SMCGuard xichGuards[];
bool hasGuard = mXICHSignalDetector.DetectGuards(
xichGuards,
positions,
cycleProvider //
);
//
if (hasGuard)
{
//
Copy(
xichGuards,
guards,
false //
);
}
//
Clean(xichGuards);
}
//
count = ArraySize(guards);
result = IsValidSize(count);
@@ -676,6 +728,180 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
return result;
}
//
// XICH Signal ...
bool DetectXICHSignal(
X121SMCStrategyConditions &conditions,
X121SMCStrategyXICHSignalConditions &xICHConditions //
)
{
//
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();
//
datetime cTime = TimeCurrent();
//
ENUM_X_121_SMC_PROVIDERS provider = X_121_SMC_PROVIDER_XICH;
string providerStr = ToString(provider);
//
// Detect Setup Conditions ...
datetime setupTime = mXICHSignalDetector.mConditions.setupTime;
bool isSetuped = mXICHSignalDetector.mConditions.IsSetuped();
ENUM_X_DIRECTION setupDir = mXICHSignalDetector.mConditions.dir;
if (!isSetuped)
{
//
// Detect Signal Setup ...
isSetuped = mXICHSignalDetector.DetectSignalSetup(
cycleProvider //
);
//
setupDir = mXICHSignalDetector.mConditions.dir;
setupTime = mXICHSignalDetector.mConditions.setupTime;
//
if (isSetuped)
{
//
int items = mXICHSignalDetector
.AddConditionsIfNotExists();
//
mXICHSignalDetector.mConditions.Clean();
}
}
//
int conditionsCount = ArraySize(mXICHSignalDetector.mConditionsCollection);
result = IsValidSize(conditionsCount);
if (!result)
{
return result;
}
//
// Looking For Conditions ...
int selectedIndex = 0;
X121SMCStrategyXICHSignalConditions mTmpConditions[];
Copy(
mXICHSignalDetector.mConditionsCollection,
mTmpConditions //
);
X121SMCStrategyXICHSignalConditions 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 = mXICHSignalDetector
.DetectSignalTrigger(
mTmpConditions[i],
cycleProvider //
);
//
result = canTrigger;
if (!result)
{
//
bool isISetuped = mTmpConditions[i].IsSetuped();
if (!isISetuped)
{
//
ArrayRemove(
mXICHSignalDetector.mConditionsCollection,
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(
mXICHSignalDetector.mConditionsCollection,
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;
//
Copy(
mConditions.targets,
conditions.targets //
);
//
xICHConditions = mConditions;
//
mConditions.Clean();
//
return result;
}
//
// Private ...
private:
@@ -691,9 +917,13 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
void InitialHelpers()
{
//
useXWZSignal = true;
useXWZSignal = false;
useXWZSignalGuard = false;
//
useXICHSignal = true;
useXICHSignalGuard = false;
//
string symbol = GetSymbol();
ENUM_TIMEFRAMES period = GetPeriod();
@@ -865,7 +1095,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
x121Inputs.xichInputs.showChikouSpan = showAll || true;
x121Inputs.xichInputs.showSenkouSpanA = showAll || true;
x121Inputs.xichInputs.showSenkouSpanB = showAll || true;
x121Inputs.xichInputs.showKumo = showAll || false;
x121Inputs.xichInputs.showKumo = showAll || true;
//
// Initialize Cycle Helpers ...