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

prepare x5121 ...

Browse Source
This commit is contained in:
saherelm
2024-05-23 08:37:53 +03:30
parent 25b027d2aa
commit a34e2351da
6 changed files with 658 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Classes/x-saherelm.x121.provider.class.mq5
+29 -116
View File
@@ -46,8 +46,8 @@
enum ENUM_X121_SIGNAL_PROVIDERS
{
//
NONE,
XSP,
X121NONE,
X121XSP,
XTEST,
X786,
X121,
@@ -518,11 +518,6 @@ class X121MarketConditions : public XSCBaseProviderMarketConditions
//
// Public ...
public:
//
string symbol; // Symbol
ENUM_TIMEFRAMES period; // Period
datetime time; // Time
//
// XZG ...
double zigzags[];
@@ -1430,7 +1425,7 @@ public:
)
{
//
if (provider == NONE)
if (provider == X121NONE)
{
return;
}
@@ -1439,8 +1434,8 @@ public:
switch (provider)
{
//
case XSP:
mIsXSPSignalProviderEnable = state;
case X121XSP:
mIsX121XSPSignalProviderEnable = state;
break;
//
@@ -1743,7 +1738,7 @@ private:
bool mIsShortEnable;
//
bool mIsXSPSignalProviderEnable;
bool mIsX121XSPSignalProviderEnable;
bool mIsX92SignalProviderEnable;
bool mIsX786SignalProviderEnable;
bool mIsX121SignalProviderEnable;
@@ -1789,7 +1784,7 @@ private:
signalPusher = 0;
//
bool hasXSPSignal = false;
bool hasX121XSPSignal = false;
bool hasXTESTSignal = false;
bool hasX786Signal = false;
bool hasX121Signal = false;
@@ -1798,20 +1793,20 @@ private:
//
// XPS ...
if (mIsXSPSignalProviderEnable)
if (mIsX121XSPSignalProviderEnable)
{
//
hasXSPSignal = XSPHasSpecifiedLongSignal(
hasX121XSPSignal = X121XSPHasSpecifiedLongSignal(
mConditions //
);
//
if (hasXSPSignal)
if (hasX121XSPSignal)
{
//
if (!IsValid(provider))
{
provider = ToString(XSP);
provider = ToString(X121XSP);
}
//
@@ -1937,7 +1932,7 @@ private:
//
result =
//
hasXSPSignal
hasX121XSPSignal
//
||
//
@@ -1979,7 +1974,7 @@ private:
signalPusher = 0;
//
bool hasXSPSignal = false;
bool hasX121XSPSignal = false;
bool hasXTESTSignal = false;
bool hasX786Signal = false;
bool hasX121Signal = false;
@@ -1987,21 +1982,21 @@ private:
bool hasX92Signal = false;
//
// XSP ...
if (mIsXSPSignalProviderEnable)
// X121XSP ...
if (mIsX121XSPSignalProviderEnable)
{
//
hasXSPSignal = XSPHasSpecifiedShortSignal(
hasX121XSPSignal = X121XSPHasSpecifiedShortSignal(
mConditions //
);
//
if (hasXSPSignal)
if (hasX121XSPSignal)
{
//
if (!IsValid(provider))
{
provider = ToString(XSP);
provider = ToString(X121XSP);
}
//
@@ -2127,7 +2122,7 @@ private:
//
result =
//
hasXSPSignal
hasX121XSPSignal
//
||
//
@@ -2896,10 +2891,10 @@ private:
// Signalling based On Signallers ...
//
// XSP ...
// X121XSP ...
//
bool XSPHasSpecifiedLongSignal(
bool X121XSPHasSpecifiedLongSignal(
X121MarketConditions &mConditions //
)
{
@@ -2930,38 +2925,6 @@ private:
//
bool result = false;
//
double bullishScore = 0;
double bearishScore = 0;
//
mConditions.GenerateScore(
bullishScore,
bearishScore //
);
//
result =
//
mConditions.bars[1].low == mConditions.bars[2].low &&
mConditions.bars[1].low == mConditions.pvVales[1] &&
mConditions.bars[2].low == mConditions.pvVales[2]
//
;
if (result)
{
//
Print("bullishScore: " + ToString(bullishScore));
Print("bearishScore: " + ToString(bearishScore));
//
Print(mConditions.GenerateSummary());
//
Print(mConditions.pvVales[0]);
ArrayPrint(mConditions.pvVales);
}
//
return result;
}
@@ -3003,7 +2966,7 @@ private:
}
//
bool XSPHasSpecifiedShortSignal(
bool X121XSPHasSpecifiedShortSignal(
X121MarketConditions &mConditions //
)
{
@@ -3034,56 +2997,6 @@ private:
//
bool result = false;
// //
// double bullishScore = 0;
// double bearishScore = 0;
// //
// mConditions.GenerateScore(
// bullishScore,
// bearishScore //
// );
//
// result =
// //
// bullishScore < bearishScore &&
// mConditions.zigzags[prev] == mConditions.pvPeaks[prev]
// //
// ;
// //
// for (int i = 1; i < 6; i++)
// {
// //
// X121MarketConditions iConditions;
// GetMarketConditions(iConditions, i);
// //
// double iBullishScore = 0;
// double iBearishScore = 0;
// //
// iConditions.GenerateScore(
// iBullishScore,
// iBearishScore,
// 1);
// //
// bullishScore += iBullishScore;
// bearishScore += iBearishScore;
// }
// //
// result =
// //
// bearishScore > bullishScore &&
// (bullishScore < 0
// ? bearishScore > MathAbs(bullishScore)
// : bearishScore > bullishScore * 2)
// //
// ;
//
return result;
}
@@ -3350,8 +3263,8 @@ void GetAllX121SignalProviders(ENUM_X121_SIGNAL_PROVIDERS &result[])
Clean(result);
//
Add(NONE, result);
Add(XSP, result);
Add(X121NONE, result);
Add(X121XSP, result);
Add(XTEST, result);
Add(X786, result);
Add(X121, result);
@@ -3369,7 +3282,7 @@ string ToString(ENUM_X121_SIGNAL_PROVIDERS value)
ENUM_X121_SIGNAL_PROVIDERS ToX121SignalProvider(string content)
{
//
ENUM_X121_SIGNAL_PROVIDERS result = NONE;
ENUM_X121_SIGNAL_PROVIDERS result = X121NONE;
//
if (!IsValid(content))
@@ -3378,13 +3291,13 @@ ENUM_X121_SIGNAL_PROVIDERS ToX121SignalProvider(string content)
}
//
if (content == ToString(NONE))
if (content == ToString(X121NONE))
{
result = NONE;
result = X121NONE;
}
else if (content == ToString(XSP))
else if (content == ToString(X121XSP))
{
result = XSP;
result = X121XSP;
}
else if (content == ToString(XTEST))
{
Classes/x-saherelm.x121.xmcycle.class.mq5
+2 -7
View File
@@ -319,14 +319,9 @@ public:
//
// Common ...
string prefix; // Cycle Prefix ...
string symbol; // Analysing Symbol ...
ENUM_TIMEFRAMES period; // Analysing Time Frame ...
ENUM_TIMEFRAMES hostPeriod; // Hosting Time Frame ...
ENUM_X_MARKET_CYCLES cycle; // Init Cycle ...
//
datetime time; // Extracting Time ...
//
// Candlestic Conditions ...
bool isLastBullish;
@@ -1088,13 +1083,13 @@ public:
{
//
bullScore++;
bearScore--:
bearScore--;
}
if (isTrendSwitchedToBearish)
{
//
bullScore--;
bearScore++:
bearScore++;
}
//
Classes/x-saherelm.x5.provider.class.mq5
+43 -34
View File
@@ -48,10 +48,10 @@
enum ENUM_X5_SIGNAL_PROVIDERS
{
//
NONE,
X5NONE,
//
// XSP Expert Support Mechanism ...
XSP,
// X5XSP Expert Support Mechanism ...
X5XSP,
//
// XTD ...
XTD,
@@ -2411,7 +2411,7 @@ public:
)
{
//
if (provider == NONE)
if (provider == X5NONE)
{
return;
}
@@ -2420,8 +2420,8 @@ public:
switch (provider)
{
//
case XSP:
mIsXSPSignalProviderEnable = state;
case X5XSP:
mIsX5XSPSignalProviderEnable = state;
break;
//
@@ -2533,6 +2533,15 @@ public:
int curr = barIndex + 1;
int prev = curr + 1;
//
mConditions.symbol = GetSymbol();
mConditions.period = GetPeriod();
mConditions.time = iTime(
mConditions.symbol,
mConditions.period,
barIndex
);
//
GetBars(
mConditions.bars,
@@ -3880,7 +3889,7 @@ private:
bool mIsShortEnable;
//
bool mIsXSPSignalProviderEnable;
bool mIsX5XSPSignalProviderEnable;
bool mIsXTDSignalProviderEnable;
bool mIsXTAMSignalProviderEnable;
bool mIsXSISignalProviderEnable;
@@ -4478,11 +4487,11 @@ private:
}
//
// XSP ...
// X5XSP ...
//
// Common Conditions ...
bool XSPHasLongSignal(
bool X5XSPHasLongSignal(
X5MarketConditions &mConditions //
)
{
@@ -4495,7 +4504,7 @@ private:
//
// Symbol and Type Specific Conditions ...
bool XSPHasSpecifiedLongSignal(
bool X5XSPHasSpecifiedLongSignal(
X5MarketConditions &mConditions //
)
{
@@ -4504,7 +4513,7 @@ private:
//
// Check Common Signal Conditions ...
result = XSPHasLongSignal(mConditions);
result = X5XSPHasLongSignal(mConditions);
if (!result)
{
return result;
@@ -4577,11 +4586,11 @@ private:
}
//
// XSP ...
// X5XSP ...
//
// Common Conditions ...
bool XSPHasShortSignal(
bool X5XSPHasShortSignal(
X5MarketConditions &mConditions //
)
{
@@ -4594,7 +4603,7 @@ private:
//
// Symbol and Type Specific Conditions ...
bool XSPHasSpecifiedShortSignal(
bool X5XSPHasSpecifiedShortSignal(
X5MarketConditions &mConditions //
)
{
@@ -4603,7 +4612,7 @@ private:
//
// Check Common Signal Conditions ...
result = XSPHasShortSignal(mConditions);
result = X5XSPHasShortSignal(mConditions);
if (!result)
{
return result;
@@ -94562,7 +94571,7 @@ private:
signalPusher = 0;
//
bool hasXSPSignal = false;
bool hasX5XSPSignal = false;
bool hasXTDSignal = false;
bool hasXTAMSignal = false;
bool hasXSISignal = false;
@@ -94574,20 +94583,20 @@ private:
//
// XPS ...
if (mIsXSPSignalProviderEnable)
if (mIsX5XSPSignalProviderEnable)
{
//
hasXSPSignal = XSPHasSpecifiedLongSignal(
hasX5XSPSignal = X5XSPHasSpecifiedLongSignal(
mConditions //
);
//
if (hasXSPSignal)
if (hasX5XSPSignal)
{
//
if (!IsValid(provider))
{
provider = ToString(XSP);
provider = ToString(X5XSP);
}
//
@@ -94782,7 +94791,7 @@ private:
//
result =
//
hasXSPSignal
hasX5XSPSignal
//
||
//
@@ -94836,7 +94845,7 @@ private:
signalPusher = 0;
//
bool hasXSPSignal = false;
bool hasX5XSPSignal = false;
bool hasXTDSignal = false;
bool hasXTAMSignal = false;
bool hasXSISignal = false;
@@ -94848,20 +94857,20 @@ private:
//
// XPS ...
if (mIsXSPSignalProviderEnable)
if (mIsX5XSPSignalProviderEnable)
{
//
hasXSPSignal = XSPHasSpecifiedShortSignal(
hasX5XSPSignal = X5XSPHasSpecifiedShortSignal(
mConditions //
);
//
if (hasXSPSignal)
if (hasX5XSPSignal)
{
//
if (!IsValid(provider))
{
provider = ToString(XSP);
provider = ToString(X5XSP);
}
//
@@ -95056,7 +95065,7 @@ private:
//
result =
//
hasXSPSignal
hasX5XSPSignal
//
||
//
@@ -95327,8 +95336,8 @@ void GetAllX5SignalProviders(ENUM_X5_SIGNAL_PROVIDERS &result[])
Clean(result);
//
Add(NONE, result);
Add(XSP, result);
Add(X5NONE, result);
Add(X5XSP, result);
Add(XTD, result);
Add(XTAM, result);
Add(XSI, result);
@@ -95349,7 +95358,7 @@ string ToString(ENUM_X5_SIGNAL_PROVIDERS value)
ENUM_X5_SIGNAL_PROVIDERS ToX5SignalProvider(string content)
{
//
ENUM_X5_SIGNAL_PROVIDERS result = NONE;
ENUM_X5_SIGNAL_PROVIDERS result = X5NONE;
//
if (!IsValid(content))
@@ -95358,13 +95367,13 @@ ENUM_X5_SIGNAL_PROVIDERS ToX5SignalProvider(string content)
}
//
if (content == ToString(NONE))
if (content == ToString(X5NONE))
{
result = NONE;
result = X5NONE;
}
else if (content == ToString(XSP))
else if (content == ToString(X5XSP))
{
result = XSP;
result = X5XSP;
}
else if (content == ToString(XTD))
{
Classes/x-saherelm.xprovider.class.mq5
+5
View File
@@ -61,6 +61,11 @@ class XSCBaseProviderMarketConditions : public XSCBase
public:
//
// Props ...
string symbol; // Symbol
ENUM_TIMEFRAMES period; // Period
datetime time; // Time
//
XOHCL bars[]; // Number of Bars ...
//