Last ...

X121SMCEA/Libraries/x-121.smc.lib.mq5

@@ -32,6 +32,10 @@
 //
 // Specific Identifier(s) of XStrategy ...
 string X121SMCStrategyToken = "X121SMC";
+string X121SMCOBStrategyToken = "X121SMCOB";
+string X121SMCSUPDEMStrategyToken = "X121SMCSUPDEM";
+string X121SMCConditionsToken = "X121SMCConditions";
+string X121SMCMarketStructureToken = "X121SMCMarketStructure";
 
 //
 // Condition Structure ...
@@ -51,6 +55,7 @@ struct X121SMCStrategyConditions
 
     //
     XZone supplyZone;
+    XZone bearishOrderBlock;
 
     //
     XZone bearishOrderBlocks[];
@@ -64,6 +69,7 @@ struct X121SMCStrategyConditions
 
     //
     XZone demandZone;
+    XZone bullishOrderBlock;
 
     //
     XZone bullishOrderBlocks[];
@@ -96,6 +102,7 @@ struct X121SMCStrategyConditions
 
         //
         supplyZone.Clean();
+        bearishOrderBlock.Clean();
 
         //
         Clean(bearishFVGs);
@@ -103,6 +110,7 @@ struct X121SMCStrategyConditions
 
         //
         demandZone.Clean();
+        bearishOrderBlock.Clean();
 
         //
         Clean(bullishFVGs);
@@ -125,6 +133,7 @@ struct X121SMCStrategyConditions
     {
         //
         demandZone.Clean();
+        bullishOrderBlock.Clean();
 
         //
         Clean(supports);
@@ -139,6 +148,7 @@ struct X121SMCStrategyConditions
     {
         //
         supplyZone.Clean();
+        bearishOrderBlock.Clean();
 
         //
         Clean(swingHighs);
@@ -273,15 +283,24 @@ struct X121SMCStrategyConditions
         if (fullTag)
         {
             //
-            result = X121SMCStrategyToken + "_" +
-                     "Conditions_" +
-                     symbol + "_" +
-                     ToString(period) + "_" +
-                     ToFormatString(time);
+            result =
+                //
+                symbol + "," +
+                ToString(period) + "," +
+                ToFormatString(time) + "_" +
+                demandZone.GetTag() + "," +
+                supplyZone.GetTag() + "_" +
+                bullishOrderBlock.GetTag() + "," +
+                bearishOrderBlock.GetTag()
+                //
+                ;
+
+            //
+            result = X121SMCConditionsToken + "_" + ToMD5(result);
         }
         else
         {
-            result = X121SMCStrategyToken;
+            result = X121SMCConditionsToken;
         }
 
         //
@@ -299,6 +318,10 @@ struct X121SMCMarketStructure
     XZone demandZone;
     XZone supplyZone;
 
+    //
+    XZone bullishOrderBlock;
+    XZone bearishOrderBlock;
+
     //
     XZone demandZones[];
     XZone supplyZones[];
@@ -346,6 +369,27 @@ struct X121SMCMarketStructure
         Clean(bullishMomentumBars);
         Clean(bullishRejectionBars);
     }
+
+    //
+    string GetTag()
+    {
+        //
+        string result = NULL;
+
+        //
+        result =
+            //
+            demandZone.GetTag() + "," +
+            supplyZone.GetTag() + "_" +
+            bullishOrderBlock.GetTag() + "," +
+            bearishOrderBlock.GetTag()
+            //
+            ;
+        result = X121SMCMarketStructureToken + "_" + ToMD5(X121SMCMarketStructureToken);
+
+        //
+        return result;
+    }
 };
 
 //