last works ... add new Ocillators ...

This commit is contained in:
2025-03-28 07:24:05 +03:30
parent c00704b83b
commit b2c585bc93
11 changed files with 3380 additions and 43 deletions
@@ -475,6 +475,9 @@ class XC121SMCCycleHelper : public XCBase
return result;
}
//
// Tools ...
//
bool GeneratePVBox(
XBoxZone &box,
@@ -825,7 +828,7 @@ class XC121SMCCycleHelper : public XCBase
}
//
datetime GetNearestCloseOverX3MAFast(
datetime DetectNearestCloseOverX3MAFast(
XOHCL &bar,
int maxAllowedBars = 20 //
)
@@ -891,7 +894,7 @@ class XC121SMCCycleHelper : public XCBase
}
//
datetime GetNearestCloseUnderX3MAFast(
datetime DetectNearestCloseUnderX3MAFast(
XOHCL &bar,
int maxAllowedBars = 20 //
)
@@ -956,6 +959,94 @@ class XC121SMCCycleHelper : public XCBase
return result;
}
//
bool DetectNearestTenKijCross(
XOHCL &bar,
ENUM_X_DIRECTION &dir,
int barIndex = 0,
int maxAllowedBars = 20 //
)
{
//
bool result = false;
//
bar.Clean();
dir = X_DIRECTION_NONE;
barIndex = NormalizeInt(barIndex, 0);
maxAllowedBars = NormalizeInt(maxAllowedBars, 20);
//
// Looping Through LoopBack Period ...
// for Detecting Result ...
for (int i = barIndex; i < barIndex + maxAllowedBars; i++)
{
//
XOHCL iBar;
result = iBar.Init(
GetSymbol(),
GetPeriod(),
i //
);
if (!result)
{
//
iBar.Clean();
break;
}
//
double iTSen = mX121Helper.xichHelper.GetTenkanSen(i);
double iTSenP = mX121Helper.xichHelper.GetTenkanSen(i + 1);
//
double iKSen = mX121Helper.xichHelper.GetKijunSen(i);
double iKSenP = mX121Helper.xichHelper.GetKijunSen(i + 1);
//
bool isTSenOverKSen = iTSen > iKSen;
bool isTSenOverKSenP = iTSenP > iKSenP;
//
bool isTSenUnderKSen = iTSen < iKSen;
bool isTSenUnderKSenP = iTSenP < iKSenP;
//
//
bool isTSenCrossedOverKSen = isTSenOverKSen &&
!isTSenOverKSenP;
//
bool isTSenCrossedUnderKSen = isTSenUnderKSen &&
!isTSenUnderKSenP;
//
result = isTSenCrossedOverKSen ||
isTSenCrossedUnderKSen;
if (result)
{
//
bar = iBar;
//
dir = isTSenCrossedOverKSen
? X_DIRECTION_BULLISH
: X_DIRECTION_BEARISH;
//
iBar.Clean();
break;
}
//
iBar.Clean();
}
//
return result;
}
//
// Virtuals ...
@@ -3753,6 +3844,9 @@ struct X121SMCStrategyConditionParser
cBar.high < vXConditions.senkouMin &&
vBearishScore > (vBullishScore * 1.5);
//
// ichimokou ...
//
// Bullish Conditions ...
isBullish =
+11
View File
@@ -37,6 +37,7 @@ const string X121SMCStrategyToken = "X121SMC";
//
const string X121SMCXWZToken = "X121XWZ";
const string X121SMCXICHToken = "X121XICH";
//
// X121 SMC Providers ...
@@ -45,6 +46,7 @@ enum ENUM_X_121_SMC_PROVIDERS
//
X_121_SMC_PROVIDER_NONE,
X_121_SMC_PROVIDER_XWZ,
X_121_SMC_PROVIDER_XICH,
};
//
@@ -700,6 +702,11 @@ string ToString(ENUM_X_121_SMC_PROVIDERS value)
case X_121_SMC_PROVIDER_XWZ:
result = X121SMCXWZToken;
break;
//
case X_121_SMC_PROVIDER_XICH:
result = X121SMCXICHToken;
break;
}
//
@@ -729,6 +736,10 @@ ENUM_X_121_SMC_PROVIDERS ParseProvider(string value)
{
result = X_121_SMC_PROVIDER_XWZ;
}
else if (Contains(X121SMCXICHToken, value))
{
result = X_121_SMC_PROVIDER_XICH;
}
//
return result;
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,225 @@
///////////////////////////////////////////////////////
//
// SaherElm IT Center MQL5 X121 SMC Signal Class
// -------------------------------------------------
// Name: XICH
// Description: provide all Signalling functions ...
//
//
// Maintainer:
// ------------
// Hadi Khazaee Asl (hadi_khazaee_asl@yahoo.com)
//
//////////////////////////////////////////////////////
//
// Global Properties ...
#property library
#property copyright "Copyright 2023, SaherElm IT Center"
#property link "https://www.saherelm.ir"
#property version "1.00"
#property strict
//
// Imports ...
// #include "../../Libraries/x-trade.lib"
#include "../Classes/x-121.smc.market.cycle.helper.class.mq5"
#include "../Libraries/x-121.smc.guard.lib.mq5"
#include "../Libraries/x-121.smc.lib.mq5"
//
// Provided Signals Enumeration ...
enum ENUM_X121SMC_XICH_PROVIDERS
{
X121SMC_XICH_PROVIDER_NONE,
X121SMC_XICH_PROVIDER_XTKKUMO,
};
//
// Definitions ...
//
// XICH Signal Conditions ...
struct X121SMCStrategyXICHSignalConditions
{
//
// Props ...
//
string symbol;
ENUM_TIMEFRAMES period;
//
double sl;
ENUM_X_DIRECTION dir;
ENUM_X_POSITION_TYPES type;
//
// Setup Props ...
//
datetime setupTime;
datetime triggerTime;
//
double pivot;
double point;
double sls[];
double targets[];
//
XBoxZone signalBox;
//
ENUM_X121SMC_XICH_PROVIDERS provider;
//
// Constructor ...
X121SMCStrategyXICHSignalConditions()
{
Clean();
}
//
// Tools ...
/**
* Cleaning Up ...
*/
void Clean()
{
//
sl = 0;
//
dir = X_DIRECTION_NONE;
type = X_POSITION_TYPE_NONE;
//
symbol = NULL;
period = NULL;
setupTime = NULL;
triggerTime = NULL;
//
ExtensionClean();
//
ZeroMemory(this);
}
/**
* Check Condition is Setting Up ...
*
* @param dir: ENUM_X_DIRECTION member, Setting Up Direction ...
*
* @return ( bool )
*/
bool IsSetuped()
{
//
bool result = false;
//
result = IsValid(setupTime) &&
HasDirection(dir);
if (!result)
{
return result;
}
//
return result;
}
/**
* Calculate Setup Age ...
*
* @return ( int )
*/
int GetSetupAge()
{
//
int result = 0;
//
if (!IsSetuped())
{
return result;
}
//
result = (int)(TimeCurrent() - setupTime) / PeriodSeconds(period);
//
return result;
}
/**
* Detect How we Can Trigger Signal ...
*
* @return ( bool )
*/
bool CanTrigger()
{
//
bool result = false;
//
result =
//
sl > 0 &&
IsValid(symbol) &&
IsValid(period) &&
IsValid(triggerTime) &&
type != X_POSITION_TYPE_ALL &&
type != X_POSITION_TYPE_NONE
//
;
//
return result;
}
//
// Extensions ...
/**
* Clean Additional Properties ...
*/
void ExtensionClean()
{
//
pivot = 0;
point = 0;
//
Clean(sls);
Clean(targets);
signalBox.Clean();
//
provider = X121SMC_XICH_PROVIDER_NONE;
}
//
//
//
//
void UpdateTo(datetime value = NULL)
{
//
value = NormalizeTime(value);
//
int count = 0;
bool has = false;
}
//
};
//
// Extension Functions ...
//
+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 ...