last resolve stops ...

Classes/x-saherelm.x121.setup.class.mq5

@@ -2132,8 +2132,13 @@ struct X121SignalGenerator
                     //
                     (
                         //
-                        conditions.mcConditions.isFastUnderSlow ||
+                        (conditions.mcConditions.isFastUnderSlow ||
-                        conditions.mcConditions.isFastUnderVerifier            
+                         conditions.mcConditions.isFastUnderVerifier)
+                        //
+                        ||
+                        //
+                        (!conditions.mcConditions.isSARBullish &&
+                         !conditions.mcConditions.isSARBearish)
                         //
                         )
                     //
@@ -2145,8 +2150,10 @@ struct X121SignalGenerator
                 (
                     //
                     (
+                        //
                         conditions.ichConditions.isClosedUnderKijunSen &&
                         conditions.ichConditions.isTenkanSenOverKijunSen
+                        //
                         )
                     //
                     ||
@@ -2181,6 +2188,43 @@ struct X121SignalGenerator
                 //
                 ||
                 //
+                // XPV ...
+                (
+                    //
+                    conditions.pvConditions.isNewPeak &&
+                    conditions.pvConditions.isNewPeakOverLast &&
+                    conditions.pvConditions.isFiboIncreased &&
+                    conditions.pvConditions.isCloseOverFib1 &&
+                    conditions.pvConditions.isCloseOverFib2 &&
+                    conditions.pvConditions.isCloseOverFib3 &&
+                    conditions.pvConditions.isCloseOverFib4 &&
+                    conditions.pvConditions.isCloseOverFib5 &&
+                    (
+                        //
+                        (
+                            //
+                            conditions.pvConditions.isSCBullish &&
+                            conditions.pvConditions.isSCHHBullish &&
+                            conditions.pvConditions.isSCLLBullish &&
+                            //
+                            conditions.pvConditions.isHCBullish &&
+                            conditions.pvConditions.isHCHHBullish &&
+                            conditions.pvConditions.isHCLLBullish &&
+                            //
+                            !conditions.pvConditions.isMCBullish &&
+                            !conditions.pvConditions.isMCLLBullish &&
+                            //
+                            !conditions.pvConditions.isLCBullish &&
+                            !conditions.pvConditions.isLCLLBullish &&
+                            //
+                            )
+                        //
+                        )
+                    //
+                    )
+                //
+                ||
+                //
                 // XCHMA ...
                 (
                     //
@@ -2195,7 +2239,7 @@ struct X121SignalGenerator
                             //
                             (
                                 //
-                            conditions.chmaConditions.isCFastUnderSlow ||
+                                conditions.chmaConditions.isCFastUnderSlow &&
                                 conditions.chmaConditions.isSFastUnderSlow
                                 //
                                 )
@@ -2204,7 +2248,7 @@ struct X121SignalGenerator
                             //
                             (
                                 //
-                            conditions.chmaConditions.isSFastUnderSlow ||
+                                conditions.chmaConditions.isSFastUnderSlow &&
                                 conditions.chmaConditions.isMFastUnderSlow
                                 //
                                 )
@@ -2213,7 +2257,7 @@ struct X121SignalGenerator
                             //
                             (
                                 //
-                            conditions.chmaConditions.isMFastUnderSlow ||
+                                conditions.chmaConditions.isMFastUnderSlow &&
                                 conditions.chmaConditions.isLFastUnderSlow
                                 //
                                 )
@@ -2222,7 +2266,7 @@ struct X121SignalGenerator
                             //
                             (
                                 //
-                            conditions.chmaConditions.isLFastUnderSlow ||
+                                conditions.chmaConditions.isLFastUnderSlow &&
                                 conditions.chmaConditions.isHFastUnderSlow
                                 //
                                 )
@@ -2230,8 +2274,8 @@ struct X121SignalGenerator
                             ||
                             (
                                 //
-                            conditions.chmaConditions.isCFastUnderSlow ||
+                                conditions.chmaConditions.isCFastUnderSlow &&
-                            conditions.chmaConditions.isSFastUnderSlow ||
+                                conditions.chmaConditions.isSFastUnderSlow &&
                                 conditions.chmaConditions.isMFastUnderSlow
                                 //
                                 )
@@ -2240,9 +2284,9 @@ struct X121SignalGenerator
                             //
                             (
                                 //
-                            conditions.chmaConditions.isCFastUnderSlow ||
+                                conditions.chmaConditions.isCFastUnderSlow &&
-                            conditions.chmaConditions.isSFastUnderSlow ||
+                                conditions.chmaConditions.isSFastUnderSlow &&
-                            conditions.chmaConditions.isMFastUnderSlow ||
+                                conditions.chmaConditions.isMFastUnderSlow &&
                                 conditions.chmaConditions.isLFastUnderSlow
                                 //
                                 )
@@ -2251,10 +2295,10 @@ struct X121SignalGenerator
                             //
                             (
                                 //
-                            conditions.chmaConditions.isCFastUnderSlow ||
+                                conditions.chmaConditions.isCFastUnderSlow &&
-                            conditions.chmaConditions.isSFastUnderSlow ||
+                                conditions.chmaConditions.isSFastUnderSlow &&
-                            conditions.chmaConditions.isMFastUnderSlow ||
+                                conditions.chmaConditions.isMFastUnderSlow &&
-                            conditions.chmaConditions.isLFastUnderSlow ||
+                                conditions.chmaConditions.isLFastUnderSlow &&
                                 conditions.chmaConditions.isHFastUnderSlow
                                 //
                                 )