last works ...

This commit is contained in:
2024-05-24 11:46:15 +03:30
parent dc4ee66b83
commit 7a50508816
10 changed files with 1515 additions and 567 deletions
+177 -1
View File
@@ -479,6 +479,12 @@ public:
bool isCloseUnderSlow;
bool isCloseOverVerifier;
bool isCloseUnderVerifier;
bool isFastCrossedOverSlow;
bool isFastCrossedUnderSlow;
bool isFastCrossedOverVerifier;
bool isFastCrossedUnderVerifier;
bool isSlowCrossedOverVerifier;
bool isSlowCrossedUnderVerifier;
//
// XSTR ...
@@ -491,8 +497,10 @@ public:
// XCHE ...
bool isCHEInLong;
bool isCHEInStrongLong;
bool isCHESwitchedInStrongLong;
bool isCHEInShort;
bool isCHEInStrongShort;
bool isCHESwitchedInStrongShort;
//
// XOSC ...
@@ -1190,6 +1198,24 @@ public:
{
bullScore++;
}
if (isFastCrossedOverSlow)
{
//
bullScore++;
bearScore--;
}
if (isFastCrossedOverVerifier)
{
//
bullScore++;
bearScore--;
}
if (isSlowCrossedOverVerifier)
{
//
bullScore++;
bearScore--;
}
//
// BEARISH ...
@@ -1217,6 +1243,60 @@ public:
{
bearScore++;
}
if (isFastCrossedUnderSlow)
{
//
bullScore--;
bearScore++;
}
if (isFastCrossedUnderVerifier)
{
//
bullScore--;
bearScore++;
}
if (isSlowCrossedUnderVerifier)
{
//
bullScore--;
bearScore++;
}
//
// XCHE ...
if (isCHEInLong)
{
bullScore++;
}
if (isCHEInStrongLong)
{
//
bullScore++;
bearScore--;
}
if (isCHESwitchedInStrongLong)
{
//
bullScore++;
bearScore--;
}
if (isCHEInShort)
{
//
bearScore++;
}
if (isCHEInStrongShort)
{
//
bullScore--;
bearScore++;
}
if (isCHESwitchedInStrongShort)
{
//
bullScore--;
bearScore++;
}
//
// XOSC ...
@@ -1563,8 +1643,10 @@ public:
//
ToString("isCHEInLong", isCHEInLong, ignoreFalseConditions) +
ToString("isCHEInStrongLong", isCHEInStrongLong, ignoreFalseConditions) +
ToString("isCHESwitchedInStrongLong", isCHESwitchedInStrongLong, ignoreFalseConditions) +
ToString("isCHEInShort", isCHEInShort, ignoreFalseConditions) +
ToString("isCHEInStrongShort", isCHEInStrongShort, ignoreFalseConditions) +
ToString("isCHESwitchedInStrongShort", isCHESwitchedInStrongShort, ignoreFalseConditions) +
""
//
;
@@ -1607,6 +1689,12 @@ public:
ToString("isCloseUnderSlow", isCloseUnderSlow, ignoreFalseConditions) +
ToString("isCloseOverVerifier", isCloseOverVerifier, ignoreFalseConditions) +
ToString("isCloseUnderVerifier", isCloseUnderVerifier, ignoreFalseConditions) +
ToString("isFastCrossedOverSlow", isFastCrossedOverSlow, ignoreFalseConditions) +
ToString("isFastCrossedUnderSlow", isFastCrossedUnderSlow, ignoreFalseConditions) +
ToString("isFastCrossedOverVerifier", isFastCrossedOverVerifier, ignoreFalseConditions) +
ToString("isFastCrossedUnderVerifier", isFastCrossedUnderVerifier, ignoreFalseConditions) +
ToString("isSlowCrossedOverVerifier", isSlowCrossedOverVerifier, ignoreFalseConditions) +
ToString("isSlowCrossedUnderVerifier", isSlowCrossedUnderVerifier, ignoreFalseConditions) +
""
//
;
@@ -2135,29 +2223,63 @@ public:
NotEmpty(che.GetLongExit1(curr))
//
;
bool isCHEInLongPrev =
//
NotEmpty(che.GetLongExit1(prev))
//
;
bool isCHEInStrongLong =
//
isCHEInLong &&
NotEmpty(che.GetLongExit2(curr))
//
;
bool isCHEInStrongLongPrev =
//
isCHEInLongPrev &&
NotEmpty(che.GetLongExit2(prev))
//
;
bool isCHEInShort =
//
NotEmpty(che.GetShortExit1(curr))
//
;
bool isCHEInShortPrev =
//
NotEmpty(che.GetShortExit1(prev))
//
;
bool isCHEInStrongShort =
//
isCHEInShort &&
NotEmpty(che.GetShortExit2(curr))
//
;
bool isCHEInStrongShortPrev =
//
isCHEInShortPrev &&
NotEmpty(che.GetShortExit2(prev))
//
;
//
conditions.isCHEInLong = isCHEInLong;
conditions.isCHEInShort = isCHEInShort;
conditions.isCHEInStrongLong = isCHEInStrongLong;
conditions.isCHESwitchedInStrongLong =
//
isCHEInStrongLong &&
!isCHEInStrongLongPrev
//
;
conditions.isCHEInShort = isCHEInShort;
conditions.isCHEInStrongShort = isCHEInStrongShort;
conditions.isCHESwitchedInStrongShort =
//
isCHEInStrongShort &&
!isCHEInStrongShortPrev
//
;
//
// XMC ...
@@ -2247,6 +2369,54 @@ public:
//
;
//
bool isFastCrossedOverSlow =
//
conditions.mcFasts[curr] > conditions.mcSlows[curr] &&
conditions.mcFasts[prev] <= conditions.mcSlows[prev]
//
;
//
bool isFastCrossedUnderSlow =
//
conditions.mcFasts[curr] < conditions.mcSlows[curr] &&
conditions.mcFasts[prev] >= conditions.mcSlows[prev]
//
;
//
bool isFastCrossedOverVerifier =
//
conditions.mcFasts[curr] > conditions.mcVerifiers[curr] &&
conditions.mcFasts[prev] <= conditions.mcVerifiers[prev]
//
;
//
bool isFastCrossedUnderVerifier =
//
conditions.mcFasts[curr] < conditions.mcVerifiers[curr] &&
conditions.mcFasts[prev] >= conditions.mcVerifiers[prev]
//
;
//
bool isSlowCrossedOverVerifier =
//
conditions.mcSlows[curr] > conditions.mcVerifiers[curr] &&
conditions.mcSlows[prev] <= conditions.mcVerifiers[prev]
//
;
//
bool isSlowCrossedUnderVerifier =
//
conditions.mcSlows[curr] < conditions.mcVerifiers[curr] &&
conditions.mcSlows[prev] >= conditions.mcVerifiers[prev]
//
;
//
conditions.isFastOverSlow = isFastOverSlow;
conditions.isFastUnderSlow = isFastUnderSlow;
@@ -2260,6 +2430,12 @@ public:
conditions.isCloseUnderSlow = isCloseUnderSlow;
conditions.isCloseOverVerifier = isCloseOverVerifier;
conditions.isCloseUnderVerifier = isCloseUnderVerifier;
conditions.isFastCrossedOverSlow = isFastCrossedOverSlow;
conditions.isFastCrossedUnderSlow = isFastCrossedUnderSlow;
conditions.isFastCrossedOverVerifier = isFastCrossedOverVerifier;
conditions.isFastCrossedUnderVerifier = isFastCrossedUnderVerifier;
conditions.isSlowCrossedOverVerifier = isSlowCrossedOverVerifier;
conditions.isSlowCrossedUnderVerifier = isSlowCrossedUnderVerifier;
//
// XICH ...