This commit is contained in:
2024-12-23 19:18:55 +03:30
parent 72430436bb
commit 7c4cfd4321
9 changed files with 7465 additions and 428 deletions
@@ -487,6 +487,23 @@ class XCX121SMCTestStrategy : public XCX121SMCBaseStrategy
}
conditions.visionConditions.state = mVisionState;
// //
// XPVPivot triggerPivot;
// mTriggerCycleHelper.GetActivePivot(triggerPivot);
// result = triggerPivot.IsValid();
// if (!result)
// {
// return result;
// }
// //
// ClearDraws();
// DrawPivot(
// triggerPivot,
// true, // Draw State ...
// true // Filter By Price ...
// );
//
return result;
}
@@ -520,123 +537,127 @@ class XCX121SMCTestStrategy : public XCX121SMCBaseStrategy
string providerStr = ToString(provider);
//
XPVPivot triggerPivot;
mTriggerCycleHelper.GetActivePivot(triggerPivot);
result = triggerPivot.IsValid();
// Detect Setup Conditions ...
datetime setupTime = mTestConditions.setupTime;
bool isSetuped = mTestConditions.IsSetuped();
ENUM_X_DIRECTION setupDir = mTestConditions.dir;
if (!isSetuped)
{
//
// Detect Signal Setup ...
isSetuped = DetectX121SMCTestSiganlSetup(
symbol,
period,
mTestConditions,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
//
result = isSetuped;
if (!result)
{
return result;
}
//
setupDir = mTestConditions.dir;
setupTime = mTestConditions.setupTime;
}
//
// Draw Conditions Active FVG ...
if (isSetuped)
{
//
XCFVG *iFVG = mTestConditions.activeFVG;
if (iFVG != NULL && iFVG.IsValid())
{
//
ClearDraws();
iFVG.To(cTime);
if (IsBullish(setupDir) && iFVG.IsBullish())
{
//
XCBullishFairValueGapObject *iObj;
bool isCreated = mPOIDrawer.CreateBullishFairValueGap(
iFVG,
iObj //
);
if (isCreated)
{
AddObjectIfNotExists(iObj);
}
}
else if (IsBearish(setupDir) && iFVG.IsBearish())
{
//
XCBearishFairValueGapObject *iObj;
bool isCreated = mPOIDrawer.CreateBearishFairValueGap(
iFVG,
iObj //
);
if (isCreated)
{
AddObjectIfNotExists(iObj);
}
}
}
}
//
// Detect Trigger Conditions ...
bool canTrigger = mTestConditions.CanTrigger();
datetime triggerTime = mTestConditions.triggerTime;
if (!canTrigger)
{
//
// Detect Signal Trigger ...
canTrigger = DetectX121SMCTestSiganlTrigger(
mTestConditions,
symbol,
period,
mTriggerCycleHelper,
mDecisionCycleHelper,
mAnalyseCycleHelper,
mVerificationCycleHelper,
mConsolidationCycleHelper,
mVisionCycleHelper //
);
//
result = canTrigger;
if (!result)
{
return result;
}
//
triggerTime = mTestConditions.triggerTime;
}
//
// Check Signal Direction ...
//
isBullish = IsBullish(setupDir);
isBearish = IsBearish(setupDir);
result = isBullish ||
isBearish;
if (!result)
{
return result;
}
//
ClearDraws();
DrawPivot(
triggerPivot,
true, // Draw State ...
true // Filter By Price ...
);
//
// Detect Setup Conditions ...
// datetime setupTime = mTestConditions.setupTime;
// bool isSetuped = mTestConditions.IsSetuped();
// ENUM_X_DIRECTION setupDir = mTestConditions.dir;
// if (!isSetuped)
// {
// //
// // Detect Signal Setup ...
// isSetuped = DetectX121SMCTestSiganlSetup(
// symbol,
// period,
// mTestConditions,
// mTriggerCycleHelper,
// mDecisionCycleHelper,
// mAnalyseCycleHelper,
// mVerificationCycleHelper,
// mConsolidationCycleHelper,
// mVisionCycleHelper //
// );
// //
// result = isSetuped;
// if (!result)
// {
// return result;
// }
// //
// setupTime = mTestConditions.setupTime;
// }
// //
// ClearDraws();
// CustomStateDrawing(
// mTriggerState,
// true // Filter By Price ...
// );
//
// Detect Trigger Conditions ...
// bool canTrigger = mTestConditions.CanTrigger();
// datetime triggerTime = mTestConditions.triggerTime;
// result = canTrigger;
// if (!canTrigger)
// {
// //
// // Detect Signal Trigger ...
// canTrigger = DetectX121SMCTestSiganlTrigger(
// mTestConditions,
// symbol,
// period,
// mTriggerCycleHelper,
// mDecisionCycleHelper,
// mAnalyseCycleHelper,
// mVerificationCycleHelper,
// mConsolidationCycleHelper,
// mVisionCycleHelper //
// );
// //
// result = canTrigger;
// if (!result)
// {
// return result;
// }
// //
// triggerTime = mTestConditions.triggerTime;
// }
//
// Check Signal Direction ...
// //
// isBullish = IsBullish(setupDir);
// isBearish = IsBearish(setupDir);
//
// result = isBullish ||
// isBearish;
// if (!result)
// {
// return result;
// }
// //
// if (cTime - setupTime > 2400)
// {
// //
// ClearDraws();
// //
// mTestConditions.Clean();
// }
// //
// // Issues Signal on Conditions ...
// conditions.signalDir = setupDir;
// conditions.provider = providerStr;
// conditions.sl = mTestConditions.sl;
// Issues Signal on Conditions ...
conditions.signalDir = setupDir;
conditions.provider = providerStr;
conditions.sl = mTestConditions.sl;
//
mTestConditions.Clean();