This commit is contained in:
2024-07-01 00:53:55 +03:30
parent f5f358e497
commit 378f6e2bdb
5 changed files with 448 additions and 283 deletions
+112 -6
View File
@@ -2847,6 +2847,7 @@ struct X121SignalGenerator
int result = 0;
//
// 1
// XTD ...
bool isTDPassed =
//
@@ -2860,6 +2861,7 @@ struct X121SignalGenerator
}
//
// 2
// XHK ...
bool isHKPassed =
//
@@ -2878,6 +2880,7 @@ struct X121SignalGenerator
}
//
// 3
// XCHE ...
bool isCHEPassed =
//
@@ -2893,6 +2896,7 @@ struct X121SignalGenerator
}
//
// 4
// XICH ...
bool isICHPassed =
//
@@ -2920,6 +2924,7 @@ struct X121SignalGenerator
}
//
// 5
// XSTR ...
bool isSTRPassed =
//
@@ -2933,6 +2938,7 @@ struct X121SignalGenerator
}
//
// 6
// XMRB ...
bool isMRBPassed =
//
@@ -2946,6 +2952,7 @@ struct X121SignalGenerator
}
//
// 7
// XVLM ...
bool isVLMPassed =
//
@@ -2960,6 +2967,7 @@ struct X121SignalGenerator
}
//
// 8
// XSSLC ...
bool isSSLCPassed =
//
@@ -2973,6 +2981,7 @@ struct X121SignalGenerator
}
//
// 9
// XHULL ...
bool isHULLPassed =
//
@@ -2988,6 +2997,7 @@ struct X121SignalGenerator
}
//
// 10
// XADX ...
bool isADXTDPassed =
//
@@ -3002,8 +3012,9 @@ struct X121SignalGenerator
}
//
// 11
// XMC ...
bool isMATDPassed =
bool isMCPassed =
//
((conditions.mcConditions.isBullish ||
conditions.mcConditions.isSwitchedToBullish)
@@ -3024,7 +3035,49 @@ struct X121SignalGenerator
conditions.mcConditions.isSARSwitchedToBullish)
//
;
if (isMATDPassed)
if (isMCPassed)
{
result++;
}
//
// 12
// XSLN ...
bool isXSLNPassed =
//
(conditions.slnConditions.isBullish ||
conditions.slnConditions.isSwitchedToBullish)
//
;
if (isXSLNPassed)
{
result++;
}
//
// 13
// XHTD ...
bool isXHTDPassed =
//
(conditions.htdConditions.isBullish ||
conditions.htdConditions.isSwitchedToBullish)
//
;
if (isXHTDPassed)
{
result++;
}
//
// 14
// XATSL ...
bool isXATSLPassed =
//
(conditions.atslConditions.isBullish ||
conditions.atslConditions.isSwitchedToBullish)
//
;
if (isXATSLPassed)
{
result++;
}
@@ -3036,7 +3089,7 @@ struct X121SignalGenerator
//
bool IsConditionsValidForLong(
X121SetupConditions &conditions, // Conditions
int verifications = 2 // Number of Verifications
int verifications = 10 // Number of Verifications
)
{
//
@@ -3103,6 +3156,7 @@ struct X121SignalGenerator
int result = 0;
//
// 1
// XTD ...
bool isTDPassed =
//
@@ -3116,6 +3170,7 @@ struct X121SignalGenerator
}
//
// 2
// XHK ...
bool isHKPassed =
//
@@ -3134,6 +3189,7 @@ struct X121SignalGenerator
}
//
// 3
// XCHE ...
bool isCHEPassed =
//
@@ -3149,6 +3205,7 @@ struct X121SignalGenerator
}
//
// 4
// XICH ...
bool isICHPassed =
//
@@ -3176,6 +3233,7 @@ struct X121SignalGenerator
}
//
// 5
// XSTR ...
bool isSTRPassed =
//
@@ -3189,6 +3247,7 @@ struct X121SignalGenerator
}
//
// 6
// XMRB ...
bool isMRBPassed =
//
@@ -3202,6 +3261,7 @@ struct X121SignalGenerator
}
//
// 7
// XVLM ...
bool isVLMPassed =
//
@@ -3216,6 +3276,7 @@ struct X121SignalGenerator
}
//
// 8
// XSSLC ...
bool isSSLCPassed =
//
@@ -3229,6 +3290,7 @@ struct X121SignalGenerator
}
//
// 9
// XHULL ...
bool isHULLPassed =
//
@@ -3244,6 +3306,7 @@ struct X121SignalGenerator
}
//
// 10
// XADX ...
bool isADXTDPassed =
//
@@ -3258,8 +3321,9 @@ struct X121SignalGenerator
}
//
// 11
// XMC ...
bool isMATDPassed =
bool isMCPassed =
//
((conditions.mcConditions.isBearish ||
conditions.mcConditions.isSwitchedToBearish)
@@ -3280,7 +3344,49 @@ struct X121SignalGenerator
conditions.mcConditions.isSARSwitchedToBearish)
//
;
if (isMATDPassed)
if (isMCPassed)
{
result++;
}
//
// 12
// XSLN ...
bool isXSLNPassed =
//
(conditions.slnConditions.isBearish ||
conditions.slnConditions.isSwitchedToBearish)
//
;
if (isXSLNPassed)
{
result++;
}
//
// 13
// XHTD ...
bool isXHTDPassed =
//
(conditions.htdConditions.isBearish ||
conditions.htdConditions.isSwitchedToBearish)
//
;
if (isXHTDPassed)
{
result++;
}
//
// 14
// XATSL ...
bool isXATSLPassed =
//
(conditions.atslConditions.isBearish ||
conditions.atslConditions.isSwitchedToBearish)
//
;
if (isXATSLPassed)
{
result++;
}
@@ -3292,7 +3398,7 @@ struct X121SignalGenerator
//
bool IsConditionsValidForShort(
X121SetupConditions &conditions, // Conditions
int verifications = 2 // Number of Verifications
int verifications = 10 // Number of Verifications
)
{
//