last ...

Classes/x-saherelm.xea.class.mq5

@@ -582,10 +582,13 @@ public:
             DoGuards(guards);
         }
 
+        //
+        XSignal signals[];
+
         //
         // Second Check for Position Management or Equity Management
         // Actions like Supports or etc ...
-        bool isIgnored = HandleStateManagement();
+        bool isIgnored = HandleStateManagement(signals);
         if (isIgnored)
         {
             return;
@@ -594,7 +597,6 @@ public:
         //
         // Second Check For Signals ...
         // then Execute Signals if Provided ...
-        XSignal signals[];
         int signalsCount = RequestForSignal(signals);
         if (signalsCount <= 0)
         {
@@ -740,7 +742,7 @@ public:
     //
     // Handle Position(s)/ Order(s) or EQM Supporting Action ...
     // if returns false, prevent for process Tick ...
-    virtual bool HandleStateManagement()
+    virtual bool HandleStateManagement(XSignal &signals[])
     {
         return false;
     }
@@ -929,38 +931,11 @@ protected:
     )
     {
         //
-        double result = 0;
-
-        //
-        int positionsCount = ArraySize(positions);
-        if (positionsCount <= 0)
-        {
-            return result;
-        }
-
-        //
-        bool isHedgingEnable = mMinProfitPerTrade > 0 && mMinProfitPerVolumeFactor > 0;
-        if (!isHedgingEnable)
-        {
-            return result;
-        }
-
-        //
-        for (int i = 0; i < positionsCount; i++)
-        {
-            //
-            XPosition iPosition = positions[i];
-
-            //
-            if (mMinProfitPerTrade > 0 && mMinProfitPerVolumeFactor > 0)
-            {
-                //
-                result +=
-                    ((iPosition.volume / mMinProfitPerVolumeFactor) *
-                     mMinProfitPerTrade) +
-                    (-1 * iPosition.swap);
-            }
-        }
+        double result = SpecifiedCalculateRequiredProfitForHedge(
+            positions,
+            mMinProfitPerTrade,
+            mMinProfitPerVolumeFactor //
+        );
 
         //
         return result;
@@ -973,24 +948,7 @@ protected:
     )
     {
         //
-        double result = 0;
-
-        //
-        int positionsCount = ArraySize(positions);
-        if (positionsCount <= 0)
-        {
-            return result;
-        }
-
-        //
-        for (int i = 0; i < positionsCount; i++)
-        {
-            //
-            XPosition iPosition = positions[i];
-
-            //
-            result += iPosition.profit;
-        }
+        double result = SpecifiedCalculatePositionsProfit(positions);
 
         //
         return result;