This commit is contained in:
2024-12-28 23:28:14 +03:30
parent c2cd52bf6b
commit 408422dcfc
20 changed files with 12042 additions and 3459 deletions
@@ -37,6 +37,7 @@ struct X121SMCStrategyTestSignalConditions
//
double sl;
double target;
ENUM_X_DIRECTION dir;
ENUM_X_POSITION_TYPES type;
@@ -64,6 +65,7 @@ struct X121SMCStrategyTestSignalConditions
{
//
sl = 0;
target = 0;
//
dir = X_DIRECTION_NONE;
File diff suppressed because it is too large Load Diff
@@ -37,6 +37,7 @@ struct X121SMCStrategyXPVDPSignalConditions
//
double sl;
double target;
ENUM_X_DIRECTION dir;
ENUM_X_POSITION_TYPES type;
@@ -68,6 +69,7 @@ struct X121SMCStrategyXPVDPSignalConditions
{
//
sl = 0;
target = 0;
//
dir = X_DIRECTION_NONE;
@@ -37,6 +37,7 @@ struct X121SMCStrategyXPVOBSignalConditions
//
double sl;
double target;
ENUM_X_DIRECTION dir;
ENUM_X_POSITION_TYPES type;
@@ -73,6 +74,7 @@ struct X121SMCStrategyXPVOBSignalConditions
{
//
sl = 0;
target = 0;
//
dir = X_DIRECTION_NONE;
@@ -37,6 +37,7 @@ struct X121SMCStrategyXPVSUPDEMSignalConditions
//
double sl;
double target;
ENUM_X_DIRECTION dir;
ENUM_X_POSITION_TYPES type;
@@ -72,6 +73,7 @@ struct X121SMCStrategyXPVSUPDEMSignalConditions
{
//
sl = 0;
target = 0;
//
dir = X_DIRECTION_NONE;
+103 -18
View File
@@ -37,6 +37,7 @@ struct X121SMCStrategyXTWPVSignalConditions
//
double sl;
double target;
ENUM_X_DIRECTION dir;
ENUM_X_POSITION_TYPES type;
@@ -47,6 +48,18 @@ struct X121SMCStrategyXTWPVSignalConditions
datetime setupTime;
datetime triggerTime;
//
int peakRepeat;
double farPeak;
double middlePeak;
double nearPeak;
//
int valeRepeat;
double farVale;
double middleVale;
double nearVale;
//
// Constructor ...
X121SMCStrategyXTWPVSignalConditions()
@@ -64,6 +77,7 @@ struct X121SMCStrategyXTWPVSignalConditions
{
//
sl = 0;
target = 0;
//
dir = X_DIRECTION_NONE;
@@ -160,6 +174,17 @@ struct X121SMCStrategyXTWPVSignalConditions
*/
void ExtensionClean()
{
//
peakRepeat = 0;
farPeak = 0;
middlePeak = 0;
nearPeak = 0;
//
valeRepeat = 0;
farVale = 0;
middleVale = 0;
nearVale = 0;
}
//
@@ -368,28 +393,29 @@ bool DetectX121SMCXTWPVSiganlSetup(
// Setup Conditions ...
//
isBullish =
//
false
//
;
// Detect Market Trend ...
// ENUM_X_DIRECTION trend;
// bool hasTrend = verificationCycleHelper
// .DetectTrend(trend);
// bool hasBullishTrend = hasTrend &&
// IsBullish(trend);
// bool hasBearishTrend = hasTrend &&
// IsBearish(trend);
// result = hasBullishTrend ||
// hasBearishTrend;
// if (!result)
// {
// return result;
// }
//
isBearish =
//
false
//
;
// Check Exists Valid Peaks or Vales ...
//
result = isBullish ||
isBearish;
if (!result)
{
//
// Clean Conditions for Regenerate ...
//
return result;
}
@@ -613,17 +639,54 @@ bool DetectX121SMCXTWPVSiganlTrigger(
//
// Trigger Conditions ...
//
// Check VWap State ...
//
bool isVWapBullishState = triggerConditions.x121Conditions.isVWapBullishState;
bool isVWapBearishState = triggerConditions.x121Conditions.isVWapBearishState;
//
isBullish =
IsBullish(setupDir) &&
isVWapBullishState;
//
isBearish =
IsBearish(setupDir) &&
isVWapBearishState;
//
result = isBullish ||
isBearish;
if (!result)
{
return result;
}
//
// Waitings For Sar Switched to Direction ...
//
double sar = triggerConditions.x121Conditions.sarBuffer[1];
//
bool isSarSwitchedToBullish = triggerConditions.x121Conditions.isSarSwitchedToBullish;
bool isSarSwitchedToBearish = triggerConditions.x121Conditions.isSarSwitchedToBearish;
//
isBullish =
//
false
isBullish &&
isSarSwitchedToBullish
//
;
//
isBearish =
//
false
isBearish &&
isSarSwitchedToBearish
//
;
@@ -647,10 +710,32 @@ bool DetectX121SMCXTWPVSiganlTrigger(
}
//
// Detect Nearest FVG or Supply Zone For Traget ...
//
// Select Source State ...
XPOIState state = triggerState;
//
double target = CalculateTarget(
cBar,
state,
setupDir //
);
//
result = target > 0;
if (!result)
{
return result;
}
//
conditions.target = target;
conditions.triggerTime = cTime;
conditions.sl = isBullish
? 0
: 0;
? sar
: sar;
conditions.type = isBullish
? X_POSITION_TYPE_LONG
: X_POSITION_TYPE_SHORT;
@@ -37,6 +37,7 @@ struct X121SMCStrategyXVWPBSignalConditions
//
double sl;
double target;
ENUM_X_DIRECTION dir;
ENUM_X_POSITION_TYPES type;
@@ -64,6 +65,7 @@ struct X121SMCStrategyXVWPBSignalConditions
{
//
sl = 0;
target = 0;
//
dir = X_DIRECTION_NONE;