last ...
This commit is contained in:
@@ -1018,7 +1018,7 @@ class XCXCAEATradeManager : public XCBaseAlert
|
||||
{
|
||||
//
|
||||
// Handle Risk Free On Targets ...
|
||||
double targets[];
|
||||
XTarget targets[];
|
||||
Copy(
|
||||
trades[idx].signal.targets,
|
||||
targets //
|
||||
@@ -1031,7 +1031,7 @@ class XCXCAEATradeManager : public XCBaseAlert
|
||||
for (int j = 0; j < targetsCount; j++)
|
||||
{
|
||||
//
|
||||
double jTarget = targets[j];
|
||||
XTarget jTarget = targets[j];
|
||||
|
||||
//
|
||||
int appliedTargetIDX = -1;
|
||||
@@ -1053,8 +1053,8 @@ class XCXCAEATradeManager : public XCBaseAlert
|
||||
iPosition.sl == 0
|
||||
? true
|
||||
: isLong
|
||||
? iPosition.sl < jTarget
|
||||
: iPosition.sl > jTarget;
|
||||
? iPosition.sl < jTarget.target
|
||||
: iPosition.sl > jTarget.target;
|
||||
if (!has)
|
||||
{
|
||||
continue;
|
||||
@@ -1062,23 +1062,23 @@ class XCXCAEATradeManager : public XCBaseAlert
|
||||
|
||||
//
|
||||
double targetDelta = isLong
|
||||
? jTarget + (targetDistance * points)
|
||||
: jTarget - (targetDistance * points);
|
||||
? jTarget.target + (targetDistance * points)
|
||||
: jTarget.target - (targetDistance * points);
|
||||
|
||||
//
|
||||
// Can Risk Free ...
|
||||
bool canRF = jTarget > 0 &&
|
||||
bool canRF = jTarget.target > 0 &&
|
||||
(isLong
|
||||
? jTarget > iPosition.entry
|
||||
: jTarget < iPosition.entry) &&
|
||||
? jTarget.target > iPosition.entry
|
||||
: jTarget.target < iPosition.entry) &&
|
||||
(isLong
|
||||
? iPosition.price > targetDelta
|
||||
: iPosition.price < targetDelta);
|
||||
if (canRF)
|
||||
{
|
||||
//
|
||||
double sl = jTarget;
|
||||
double tp = iPosition.tp;
|
||||
double sl = jTarget.target;
|
||||
string comment = "RF On Target ...";
|
||||
bool isModified = trader.Modify(
|
||||
iPosition.ticket,
|
||||
@@ -1097,64 +1097,7 @@ class XCXCAEATradeManager : public XCBaseAlert
|
||||
ToString(iPosition.type) +
|
||||
" Position: " +
|
||||
ToString(iPosition.ticket) +
|
||||
" RF On Traget: " + ToString(jTarget) +
|
||||
" Successfully ...";
|
||||
HandleReportProtector(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Handle Partial Close on Specified Targets ...
|
||||
has = !trades[idx].signal.isPartiallyClosed &&
|
||||
trades[idx].signal.partialCloseOnTPLevel > 0 &&
|
||||
trades[idx].signal.partialCloseMultiplier > 0;
|
||||
if (has)
|
||||
{
|
||||
//
|
||||
// Check Reward Touched ...
|
||||
double iCurrReward = iPosition.CalculateTouchedReward();
|
||||
has = iCurrReward >= trades[idx].signal.partialCloseOnTPLevel;
|
||||
if (has)
|
||||
{
|
||||
//
|
||||
// Check Volume Multiplier ...
|
||||
double volumeMultiplier = trades[idx].signal.partialCloseMultiplier;
|
||||
has = volumeMultiplier > 0 &&
|
||||
volumeMultiplier <= 1;
|
||||
if (has)
|
||||
{
|
||||
//
|
||||
// Do Partial Closing ...
|
||||
double volume = iPosition.volume * volumeMultiplier;
|
||||
|
||||
//
|
||||
// Normalizing Volume ...
|
||||
volume = NormalizeVolume(
|
||||
volume,
|
||||
iPosition.symbol //
|
||||
);
|
||||
|
||||
//
|
||||
string comment = "PC On Target ...";
|
||||
has = trader.ClosePartial(
|
||||
iPosition.ticket,
|
||||
volume,
|
||||
comment //
|
||||
);
|
||||
if (has)
|
||||
{
|
||||
//
|
||||
// Update Model ...
|
||||
trades[idx].signal.isPartiallyClosed = true;
|
||||
|
||||
//
|
||||
string message = prefix +
|
||||
ToString(iPosition.type) +
|
||||
" Position: " +
|
||||
ToString(iPosition.ticket) +
|
||||
" PC (" + ToString(volume) + ") On Traget: " + ToString(iCurrReward) +
|
||||
" RF On Traget: " + ToString(jTarget.target) +
|
||||
" Successfully ...";
|
||||
HandleReportProtector(message);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user