last works ...
This commit is contained in:
@@ -25,7 +25,6 @@
|
||||
|
||||
//
|
||||
#include "../Classes/x-saherelm.xea.class.mq5"
|
||||
#include "../Classes/x-saherelm.xczone.class.mq5"
|
||||
#include "../Classes/x-saherelm.x121.setup.cycle.class.mq5"
|
||||
|
||||
//
|
||||
@@ -1263,9 +1262,13 @@ public:
|
||||
// Check Final Bullish and Bearish Score ...
|
||||
bool isScorePassed =
|
||||
//
|
||||
IsLong(cSignal.type)
|
||||
? mBullishScore > (mBearishScore * 2)
|
||||
: mBearishScore > (mBullishScore * 2)
|
||||
true
|
||||
// isLong
|
||||
// ? mBearishScore > mBullishScore
|
||||
// : mBullishScore > mBearishScore
|
||||
// isLong
|
||||
// ? mBullishScore > (mBearishScore * 2)
|
||||
// : mBearishScore > (mBullishScore * 2)
|
||||
//
|
||||
;
|
||||
|
||||
@@ -1312,9 +1315,13 @@ public:
|
||||
// Check Final Bullish and Bearish Score ...
|
||||
bool isScorePassed =
|
||||
//
|
||||
IsLong(cSignal.type)
|
||||
? mBullishScore > (mBearishScore * 2)
|
||||
: mBearishScore > (mBullishScore * 2)
|
||||
true
|
||||
// isLong
|
||||
// ? mBearishScore > mBullishScore
|
||||
// : mBullishScore > mBearishScore
|
||||
// isLong
|
||||
// ? mBullishScore > (mBearishScore * 2)
|
||||
// : mBearishScore > (mBullishScore * 2)
|
||||
//
|
||||
;
|
||||
|
||||
@@ -1361,9 +1368,13 @@ public:
|
||||
// Check Final Bullish and Bearish Score ...
|
||||
bool isScorePassed =
|
||||
//
|
||||
IsLong(cSignal.type)
|
||||
? mBullishScore > (mBearishScore * 2)
|
||||
: mBearishScore > (mBullishScore * 2)
|
||||
true
|
||||
// isLong
|
||||
// ? mBearishScore > mBullishScore
|
||||
// : mBullishScore > mBearishScore
|
||||
// isLong
|
||||
// ? mBullishScore > (mBearishScore * 2)
|
||||
// : mBearishScore > (mBullishScore * 2)
|
||||
//
|
||||
;
|
||||
|
||||
@@ -1410,9 +1421,13 @@ public:
|
||||
// Check Final Bullish and Bearish Score ...
|
||||
bool isScorePassed =
|
||||
//
|
||||
IsLong(cSignal.type)
|
||||
? mBullishScore > (mBearishScore * 2)
|
||||
: mBearishScore > (mBullishScore * 2)
|
||||
true
|
||||
// isLong
|
||||
// ? mBearishScore > mBullishScore
|
||||
// : mBullishScore > mBearishScore
|
||||
// isLong
|
||||
// ? mBullishScore > (mBearishScore * 2)
|
||||
// : mBearishScore > (mBullishScore * 2)
|
||||
//
|
||||
;
|
||||
|
||||
@@ -1459,9 +1474,13 @@ public:
|
||||
// Check Final Bullish and Bearish Score ...
|
||||
bool isScorePassed =
|
||||
//
|
||||
IsLong(cSignal.type)
|
||||
? mBullishScore > (mBearishScore * 2)
|
||||
: mBearishScore > (mBullishScore * 2)
|
||||
true
|
||||
// isLong
|
||||
// ? mBearishScore > mBullishScore
|
||||
// : mBullishScore > mBearishScore
|
||||
// isLong
|
||||
// ? mBullishScore > (mBearishScore * 2)
|
||||
// : mBearishScore > (mBullishScore * 2)
|
||||
//
|
||||
;
|
||||
|
||||
@@ -1632,41 +1651,12 @@ public:
|
||||
//
|
||||
// Do all State Management here ...
|
||||
|
||||
// //
|
||||
// // Check State Interval ...
|
||||
// static datetime lastStateManaged = NULL;
|
||||
|
||||
// //
|
||||
// datetime cTime = TimeCurrent();
|
||||
// int interval = PeriodSeconds(PERIOD_M3);
|
||||
|
||||
// //
|
||||
// bool canManageState =
|
||||
// //
|
||||
// !IsValid(lastStateManaged)
|
||||
// ? true
|
||||
// : (int)cTime >= (int)lastStateManaged + interval;
|
||||
// //
|
||||
// ;
|
||||
// if (!canManageState)
|
||||
// {
|
||||
// return result;
|
||||
// }
|
||||
|
||||
// //
|
||||
// lastStateManaged = cTime;
|
||||
|
||||
// //
|
||||
// // Retrieve Account Profit ...
|
||||
// double profit = mTrader.Profit();
|
||||
|
||||
// //
|
||||
// // Check EQM Orders and Handle Hedging ...
|
||||
// DoEQMHedge();
|
||||
//
|
||||
DoEQMHedge();
|
||||
|
||||
//
|
||||
// Handle Close All Positions on Specific Time ...
|
||||
HandleEQMCloseOnSpecificTime();
|
||||
DoEQMCloseOnSpecificTime();
|
||||
|
||||
//
|
||||
// if Returns true, Signal Execution failed ...
|
||||
@@ -2074,10 +2064,6 @@ private:
|
||||
//
|
||||
// EQM Functions ...
|
||||
|
||||
//
|
||||
// Check and Hedge ...
|
||||
void DoEQMHedge() {}
|
||||
|
||||
//
|
||||
// Remove Untriggered EQM Orders ...
|
||||
void RemoveEQMOrders()
|
||||
@@ -2309,7 +2295,7 @@ private:
|
||||
|
||||
//
|
||||
// Handle Close Trades on Specific Time ...
|
||||
void HandleEQMCloseOnSpecificTime()
|
||||
void DoEQMCloseOnSpecificTime()
|
||||
{
|
||||
//
|
||||
bool canClose = CanCloseOnTime();
|
||||
|
||||
Reference in New Issue
Block a user