This commit is contained in:
2024-06-24 12:03:00 +03:30
parent 3acd8d355f
commit cc69a8f22d
2 changed files with 2 additions and 24 deletions
-20
View File
@@ -3373,25 +3373,6 @@ public:
mAllowSymbolHedgeOnForce = value; mAllowSymbolHedgeOnForce = value;
} }
//
double ForceCloseOnEuityDiff()
{
return mForceCloseOnEuityDiff;
}
//
void ForceCloseOnEuityDiff(double value)
{
//
if (value < 0)
{
value = 0;
}
//
mForceCloseOnEuityDiff = value;
}
// //
double MinFreeMargingForHandleForce() double MinFreeMargingForHandleForce()
{ {
@@ -4490,7 +4471,6 @@ private:
double mMaxDrawdownForce; // Force Handling State on Drawdown for Guard double mMaxDrawdownForce; // Force Handling State on Drawdown for Guard
bool mAllowSymbolHedgeOnForce; // Allow Symbol Hedging on Force States bool mAllowSymbolHedgeOnForce; // Allow Symbol Hedging on Force States
double mMinFreeMargingForHandleForce; // Min Free Margin for Force States double mMinFreeMargingForHandleForce; // Min Free Margin for Force States
double mForceCloseOnEuityDiff; // Force Close On Equity Differential
// //
XTradeHandler *mTradeHandler; // Handle all Event which related to Signals and Positions XTradeHandler *mTradeHandler; // Handle all Event which related to Signals and Positions
+2 -4
View File
@@ -111,11 +111,10 @@ input double x121EAMaxAllowedRecoveryVolume = 0.08; // Max Allowed Recovery Sign
// //
input group "Hedging"; input group "Hedging";
input int x121EARestingAfterHedge = 3000; // Resting Seconds After Hedge input int x121EARestingAfterHedge = 3000; // Resting Seconds After Hedge
input double x121EAForceCloseProfit = 15; // Close All Positions Regardless of Policies when Profit Reached input double x121EAForceCloseProfit = 5; // Close All Positions Regardless of Policies when Profit Reached
input double x121EAMaxDrawdownForce = 5; // Max Drawdown Force State for Handling Guards input double x121EAMaxDrawdownForce = 5; // Max Drawdown Force State for Handling Guards
input int x121EAMaxPositionsForce = 10; // Max Number of Positions Force State for Handling Guards input int x121EAMaxPositionsForce = 10; // Max Number of Positions Force State for Handling Guards
input double x121EAMinFreeMargingForHandleForce = 800; // Min Free Margin for Force States input double x121EAMinFreeMargingForHandleForce = 800; // Min Free Margin for Force States
input double x121EAForceCloseOnEuityDiff = 15; // Force Close On Equity Differential
input bool x121EAAllowSymbolHedgeOnForce = false; // Allow Symbol Hedging on Force States input bool x121EAAllowSymbolHedgeOnForce = false; // Allow Symbol Hedging on Force States
input double x121EAMinRequiredProfitPerTrade = 0.2; // Minimum Required Profit for Hedging input double x121EAMinRequiredProfitPerTrade = 0.2; // Minimum Required Profit for Hedging
input double x121EAMinRequiredProfitPerVolumeFactor = 0.01; // Minimum Required Profit for Hedging Per Volume input double x121EAMinRequiredProfitPerVolumeFactor = 0.01; // Minimum Required Profit for Hedging Per Volume
@@ -383,9 +382,8 @@ bool InitialEA()
x121EA.MaxDrawdownForce(x121EAMaxDrawdownForce); x121EA.MaxDrawdownForce(x121EAMaxDrawdownForce);
x121EA.MaxPositionsForce(x121EAMaxPositionsForce); x121EA.MaxPositionsForce(x121EAMaxPositionsForce);
x121EA.AllowSymbolHedgeOnForce(x121EAAllowSymbolHedgeOnForce); x121EA.AllowSymbolHedgeOnForce(x121EAAllowSymbolHedgeOnForce);
x121EA.ForceCloseOnEuityDiff(x121EAMinFreeMargingForHandleForce);
x121EA.MinFreeMargingForHandleForce(x121EAForceCloseOnEuityDiff);
x121EA.MinRequiredProfitPerTrade(x121EAMinRequiredProfitPerTrade); x121EA.MinRequiredProfitPerTrade(x121EAMinRequiredProfitPerTrade);
x121EA.MinFreeMargingForHandleForce(x121EAMinFreeMargingForHandleForce);
x121EA.MinRequiredProfitPerVolumeFactor(x121EAMinRequiredProfitPerVolumeFactor); x121EA.MinRequiredProfitPerVolumeFactor(x121EAMinRequiredProfitPerVolumeFactor);
// //