Last Works ...

X121SMCEA/Classes/x-121.smc.base.strategy.class.mq5

@@ -369,21 +369,39 @@ class XCX121SMCBaseStrategy : public XCBaseAlert
 
         //
         // Trigger ...
-        ENUM_XPOI_EVENTS triggerPOIEvents[];
-        mTriggerPOIDetector.Update(triggerPOIEvents);
-        mTriggerPOIDetector.GetState(mTriggerPOIState);
+        ENUM_XPOI_EVENTS mTriggerEvents[];
+        mTriggerDetector.Update(mTriggerEvents);
+        mTriggerDetector.GetState(mTriggerState);
+
+        //
+        // Decision ...
+        ENUM_XPOI_EVENTS mDecisionEvents[];
+        mDecisionDetector.Update(mDecisionEvents);
+        mDecisionDetector.GetState(mDecisionState);
 
         //
         // Analyse ...
-        ENUM_XPOI_EVENTS analysePOIEvents[];
-        mAnalysePOIDetector.Update(analysePOIEvents);
-        mAnalysePOIDetector.GetState(mAnalysePOIState);
+        ENUM_XPOI_EVENTS mAnalyseEvents[];
+        mAnalyseDetector.Update(mAnalyseEvents);
+        mAnalyseDetector.GetState(mAnalyseState);
 
         //
-        // Trigger ...
-        ENUM_XPOI_EVENTS visionPOIEvents[];
-        mVisionPOIDetector.Update(visionPOIEvents);
-        mVisionPOIDetector.GetState(mVisionPOIState);
+        // Verification ...
+        ENUM_XPOI_EVENTS mVerificationEvents[];
+        mVerificationDetector.Update(mVerificationEvents);
+        mVerificationDetector.GetState(mVerificationState);
+
+        //
+        // Consolidation ...
+        ENUM_XPOI_EVENTS mConsolidationEvents[];
+        mConsolidationDetector.Update(mConsolidationEvents);
+        mConsolidationDetector.GetState(mConsolidationState);
+
+        //
+        // Vision ...
+        ENUM_XPOI_EVENTS mVisionEvents[];
+        mVisionDetector.Update(mVisionEvents);
+        mVisionDetector.GetState(mVisionState);
 
         //
         // Check Current Processing Tick has Signal or not ...
@@ -474,14 +492,20 @@ class XCX121SMCBaseStrategy : public XCBaseAlert
 
     //
     // Point Of Interests ...
-    XCPOIDetector *mTriggerPOIDetector;
-    XCPOIDetector *mAnalysePOIDetector;
-    XCPOIDetector *mVisionPOIDetector;
+    XCPOIDetector *mVisionDetector;
+    XCPOIDetector *mConsolidationDetector;
+    XCPOIDetector *mVerificationDetector;
+    XCPOIDetector *mAnalyseDetector;
+    XCPOIDetector *mDecisionDetector;
+    XCPOIDetector *mTriggerDetector;
 
     //
-    XPOIState mTriggerPOIState;
-    XPOIState mAnalysePOIState;
-    XPOIState mVisionPOIState;
+    XPOIState mVisionState;
+    XPOIState mConsolidationState;
+    XPOIState mVerificationState;
+    XPOIState mAnalyseState;
+    XPOIState mDecisionState;
+    XPOIState mTriggerState;
 
     //
     XCPOIDrawer *mPOIDrawer; // POI Drawer Class ...
@@ -1522,32 +1546,58 @@ class XCX121SMCBaseStrategy : public XCBaseAlert
 
         //
         // Trigger ...
-        mTriggerPOIDetector = new XCPOIDetector(
+        mTriggerDetector = new XCPOIDetector(
             symbol,
-            period //
+            PERIOD_M1 //
         );
-        mTriggerPOIDetector.MaxNumberOfRequiredPOIs(poiRequired);
-        mTriggerPOIDetector.Init();
+        mTriggerDetector.MaxNumberOfRequiredPOIs(poiRequired);
+        mTriggerDetector.Init();
+
+        //
+        // Decision ...
+        mDecisionDetector = new XCPOIDetector(
+            symbol,
+            PERIOD_M5 //
+        );
+        mDecisionDetector.MaxNumberOfRequiredPOIs(poiRequired);
+        mDecisionDetector.Init();
 
         //
         // Analyse ...
-        ENUM_TIMEFRAMES analysePeriod = GetAnalysePeriod(period);
-        mAnalysePOIDetector = new XCPOIDetector(
+        mAnalyseDetector = new XCPOIDetector(
             symbol,
-            analysePeriod //
+            PERIOD_M15 //
         );
-        mAnalysePOIDetector.MaxNumberOfRequiredPOIs(poiRequired);
-        mAnalysePOIDetector.Init();
+        mAnalyseDetector.MaxNumberOfRequiredPOIs(poiRequired);
+        mAnalyseDetector.Init();
+
+        //
+        // Verification ...
+        mVerificationDetector = new XCPOIDetector(
+            symbol,
+            PERIOD_M30 //
+        );
+        mVerificationDetector.MaxNumberOfRequiredPOIs(poiRequired);
+        mVerificationDetector.Init();
+
+        //
+        // Consolidation ...
+        mConsolidationDetector = new XCPOIDetector(
+            symbol,
+            PERIOD_H1 //
+        );
+        mConsolidationDetector.MaxNumberOfRequiredPOIs(poiRequired);
+        mConsolidationDetector.Init();
 
         //
         // Vision ...
-        ENUM_TIMEFRAMES visionPeriod = GetVisionPeriod(period);
-        mVisionPOIDetector = new XCPOIDetector(
+        mVisionDetector = new XCPOIDetector(
             symbol,
-            visionPeriod //
+            PERIOD_H4 //
         );
-        mVisionPOIDetector.MaxNumberOfRequiredPOIs(poiRequired);
-        mVisionPOIDetector.Init();
+        mVisionDetector.MaxNumberOfRequiredPOIs(poiRequired);
+        mVisionDetector.Init();
+
 
         //
     }
@@ -1558,9 +1608,12 @@ class XCX121SMCBaseStrategy : public XCBaseAlert
     void DeInit()
     {
         //
-        delete mTriggerPOIDetector;
-        delete mAnalysePOIDetector;
-        delete mVisionPOIDetector;
+        delete mVisionDetector;
+        delete mConsolidationDetector;
+        delete mVerificationDetector;
+        delete mAnalyseDetector;
+        delete mDecisionDetector;
+        delete mTriggerDetector;
 
         //
         delete mPOIDrawer;