This commit is contained in:
2024-06-23 08:29:09 +03:30
parent de8143585b
commit 96c154701c
2 changed files with 98 additions and 85 deletions
+95 -85
View File
@@ -2409,6 +2409,7 @@ protected:
// //
// TODO: Complete this Later ... // TODO: Complete this Later ...
return result; return result;
// //
// Validate Setups Count ... // Validate Setups Count ...
// int setupsCount = ArraySize(setups); // int setupsCount = ArraySize(setups);
@@ -3529,23 +3530,24 @@ public:
cConditions.Clean(); cConditions.Clean();
// //
cHasSignal = mSetups[i].ProcessMarket( cHasSignal = mSetups[i]
cSignal, .ProcessMarket(
cConditions, cSignal,
cPusher, cConditions,
cProvider, cPusher,
X_MARKET_CYCLE_UNKNOWN, cProvider,
allowSupport, X_MARKET_CYCLE_UNKNOWN,
allowLong, allowSupport,
allowShort, allowLong,
volume, allowShort,
slPoint, volume,
ignoreSL, slPoint,
tpPoint, ignoreSL,
ignoreTP, tpPoint,
0, ignoreTP,
5 // 0,
); 5 //
);
// //
// Short Market ... // Short Market ...
@@ -3558,23 +3560,24 @@ public:
sConditions.Clean(); sConditions.Clean();
// //
sHasSignal = mSetups[i].ProcessMarket( sHasSignal = mSetups[i]
sSignal, .ProcessMarket(
sConditions, sSignal,
sPusher, sConditions,
sProvider, sPusher,
X_MARKET_CYCLE_SHORT, sProvider,
allowSupport, X_MARKET_CYCLE_SHORT,
allowLong, allowSupport,
allowShort, allowLong,
volume, allowShort,
slPoint, volume,
ignoreSL, slPoint,
tpPoint, ignoreSL,
ignoreTP, tpPoint,
0, ignoreTP,
5 // 0,
); 5 //
);
// //
// Medium Market ... // Medium Market ...
@@ -3587,23 +3590,24 @@ public:
mConditions.Clean(); mConditions.Clean();
// //
mHasSignal = mSetups[i].ProcessMarket( mHasSignal = mSetups[i]
mSignal, .ProcessMarket(
mConditions, mSignal,
mPusher, mConditions,
mProvider, mPusher,
X_MARKET_CYCLE_MEDIUM, mProvider,
allowSupport, X_MARKET_CYCLE_MEDIUM,
allowLong, allowSupport,
allowShort, allowLong,
volume, allowShort,
slPoint, volume,
ignoreSL, slPoint,
tpPoint, ignoreSL,
ignoreTP, tpPoint,
0, ignoreTP,
5 // 0,
); 5 //
);
// //
// Long Market ... // Long Market ...
@@ -3616,23 +3620,24 @@ public:
lConditions.Clean(); lConditions.Clean();
// //
lHasSignal = mSetups[i].ProcessMarket( lHasSignal = mSetups[i]
lSignal, .ProcessMarket(
lConditions, lSignal,
lPusher, lConditions,
lProvider, lPusher,
X_MARKET_CYCLE_LONG, lProvider,
allowSupport, X_MARKET_CYCLE_LONG,
allowLong, allowSupport,
allowShort, allowLong,
volume, allowShort,
slPoint, volume,
ignoreSL, slPoint,
tpPoint, ignoreSL,
ignoreTP, tpPoint,
0, ignoreTP,
5 // 0,
); 5 //
);
// //
// Hind Market ... // Hind Market ...
@@ -3645,23 +3650,24 @@ public:
hConditions.Clean(); hConditions.Clean();
// //
hHasSignal = mSetups[i].ProcessMarket( hHasSignal = mSetups[i]
hSignal, .ProcessMarket(
hConditions, hSignal,
hPusher, hConditions,
hProvider, hPusher,
X_MARKET_CYCLE_HIND, hProvider,
allowSupport, X_MARKET_CYCLE_HIND,
allowLong, allowSupport,
allowShort, allowLong,
volume, allowShort,
slPoint, volume,
ignoreSL, slPoint,
tpPoint, ignoreSL,
ignoreTP, tpPoint,
0, ignoreTP,
5 // 0,
); 5 //
);
// //
// Parse Signals and Add them for Executing ... // Parse Signals and Add them for Executing ...
@@ -3676,6 +3682,7 @@ public:
{ {
// //
Print("Current Market Has Signal ..."); Print("Current Market Has Signal ...");
Print(ToString(mSetups[i].cCycle.cycle.period));
} }
// //
@@ -3683,6 +3690,7 @@ public:
{ {
// //
Print("Short Market Has Signal ..."); Print("Short Market Has Signal ...");
Print(ToString(mSetups[i].sCycle.cycle.period));
} }
// //
@@ -3690,6 +3698,7 @@ public:
{ {
// //
Print("Medium Market Has Signal ..."); Print("Medium Market Has Signal ...");
Print(ToString(mSetups[i].mCycle.cycle.period));
} }
// //
@@ -3705,6 +3714,7 @@ public:
{ {
// //
Print("Hind Market Has Signal ..."); Print("Hind Market Has Signal ...");
Print(ToString(mSetups[i].hCycle.cycle.period));
} }
// //
+3
View File
@@ -138,7 +138,9 @@ int OnCalculate(
// //
if (ArrayRange(work, 0) != rates_total) if (ArrayRange(work, 0) != rates_total)
{ {
//
ArrayResize(work, rates_total); ArrayResize(work, rates_total);
ArrayResize(stateBuffer, rates_total);
} }
// //
@@ -153,6 +155,7 @@ int OnCalculate(
work[i][lHi] = high[i]; work[i][lHi] = high[i];
work[i][lLo] = low[i]; work[i][lLo] = low[i];
work[i][trend] = -1; work[i][trend] = -1;
stateBuffer[i] = -1;
continue; continue;
} }