This commit is contained in:
2025-03-21 06:51:15 +03:30
parent 419d697eb8
commit 0459bf2ac4
6 changed files with 2250 additions and 1393 deletions
@@ -173,14 +173,14 @@ class XCX121SMCXWZSignalDetector : public XCBase
double targets[];
double reward = 0;
XBoxZone signalBox;
bool hasTrend = false;
XBoxZone signalHolderBox;
bool hasPriority = false;
double amountPercent = -1;
bool hasSignalBox = false;
bool hasWaitingBoxes = false;
bool hasRewardAmount = false;
bool hasWorkingZoneOveralDirection = false;
ENUM_X_DIRECTION wzOveralDir = X_DIRECTION_NONE;
ENUM_X_DIRECTION trend = X_DIRECTION_NONE;
ENUM_X_DIRECTION signalBoxDir = X_DIRECTION_NONE;
ENUM_X121SMC_XWZ_PRIORITY priority = X121SMC_XWZ_PRIORITY_NONE;
ENUM_X121SMC_XWZ_PROVIDERS signalProvider = X121SMC_XWZ_PROVIDER_NONE;
@@ -216,14 +216,19 @@ class XCX121SMCXWZSignalDetector : public XCBase
provider.MaxAllowedLoopbackForInit(578);
//
// Check Working Zone Overal Direction ...
hasWorkingZoneOveralDirection = workingZone
.DetectOveralDirection(wzOveralDir);
// Check Working Zone Has Trend ...
hasTrend = workingZone.DetectTreand(
X_CYCLE_CONSOLIDATION,
trend,
provider,
zIndex //
);
//
// Detectiong Signal Boxes ...
hasWaitingBoxes = workingZone
.DetectWaitingBoxes(
X_CYCLE_CONSOLIDATION,
X_CYCLE_ANALYSE,
provider,
zIndex //
@@ -282,8 +287,8 @@ class XCX121SMCXWZSignalDetector : public XCBase
//
true, // Draw Supply Zone ...
true, // Draw Demand Zone ...
true // Draw Waiting Zones ...
//
true, // Draw Waiting Zones ...
true // Draw Trend ...
);
}
@@ -471,6 +476,18 @@ class XCX121SMCXWZSignalDetector : public XCBase
//
iAtr = provider.decisionXConditions.atrBuffer[1];
iAtr *= 0;
//
// Prepare Box fro SL ...
iSL = pivot;
Add(
iSL,
sls //
);
//
// Fix rf Reward ...
rfRewar = 2;
}
else if (signalProvider == X121SMC_XWZ_PROVIDER_XREJECTED_BOX)
{
@@ -491,7 +508,7 @@ class XCX121SMCXWZSignalDetector : public XCBase
//
// Fix rf Reward ...
rfRewar = 1;
rfRewar = 2;
}
else if (signalProvider == X121SMC_XWZ_PROVIDER_XACTIVATED_BOX)
{
@@ -512,7 +529,7 @@ class XCX121SMCXWZSignalDetector : public XCBase
//
// Fix rf Reward ...
rfRewar = 1;
rfRewar = 2;
}
else if (signalProvider == X121SMC_XWZ_PROVIDER_XBREAKED_BOX)
{
@@ -533,7 +550,7 @@ class XCX121SMCXWZSignalDetector : public XCBase
//
// Fix rf Reward ...
rfRewar = 1;
rfRewar = 2;
}
//