diff --git a/Classes/x-saherelm.x121.setup.xea.mq5 b/Classes/x-saherelm.x121.setup.xea.mq5 index 093d32ab..99f687ac 100644 --- a/Classes/x-saherelm.x121.setup.xea.mq5 +++ b/Classes/x-saherelm.x121.setup.xea.mq5 @@ -331,6 +331,14 @@ struct XTradeInfo false, // Include Score ... false // Include False Conditions ... ); + double cBullishScore = 0; + double cBearishScore = 0; + cConditions.GenerateScore( + cBullishScore, + cBearishScore // + ); + + // string sConditionsStr = sConditions .GenerateSummary( false, // Only Commons ... @@ -338,6 +346,14 @@ struct XTradeInfo false, // Include Score ... false // Include False Conditions ... ); + double sBullishScore = 0; + double sBearishScore = 0; + sConditions.GenerateScore( + sBullishScore, + sBearishScore // + ); + + // string mConditionsStr = mConditions .GenerateSummary( false, // Only Commons ... @@ -345,6 +361,14 @@ struct XTradeInfo false, // Include Score ... false // Include False Conditions ... ); + double mBullishScore = 0; + double mBearishScore = 0; + mConditions.GenerateScore( + mBullishScore, + mBearishScore // + ); + + // string lConditionsStr = lConditions .GenerateSummary( false, // Only Commons ... @@ -352,6 +376,14 @@ struct XTradeInfo false, // Include Score ... false // Include False Conditions ... ); + double lBullishScore = 0; + double lBearishScore = 0; + lConditions.GenerateScore( + lBullishScore, + lBearishScore // + ); + + // string hConditionsStr = hConditions .GenerateSummary( false, // Only Commons ... @@ -359,6 +391,14 @@ struct XTradeInfo false, // Include Score ... false // Include False Conditions ... ); + double hBullishScore = 0; + double hBearishScore = 0; + hConditions.GenerateScore( + hBullishScore, + hBearishScore // + ); + + // // int age = GetAge(); @@ -392,23 +432,33 @@ struct XTradeInfo "Conditions" + "\n" + "-------------" + "\n" + "-------------" + "\n" + - "CURRENT [" + ToString(cConditions.period) + "]" + "\n" + + "CURRENT [" + ToString(cConditions.period) + "]" + "\n" + "\n" + + "Bullish: " + ToString(cBullishScore) + "\n" + + "Bearish: " + ToString(cBearishScore) + "\n" + "-------------" + "\n" + cConditionsStr + "\n" + "-------------" + "\n" + - "SHORT [" + ToString(sConditions.period) + "]" + "\n" + + "SHORT [" + ToString(sConditions.period) + "]" + "\n" + "\n" + + "Bullish: " + ToString(sBullishScore) + "\n" + + "Bearish: " + ToString(sBearishScore) + "\n" + "-------------" + "\n" + sConditionsStr + "\n" + "-------------" + "\n" + - "MEDIUM [" + ToString(mConditions.period) + "]" + "\n" + + "MEDIUM [" + ToString(mConditions.period) + "]" + "\n" + "\n" + + "Bullish: " + ToString(mBullishScore) + "\n" + + "Bearish: " + ToString(mBearishScore) + "\n" + "-------------" + "\n" + mConditionsStr + "\n" + "-------------" + "\n" + - "LONG [" + ToString(lConditions.period) + "]" + "\n" + + "LONG [" + ToString(lConditions.period) + "]" + "\n" + "\n" + + "Bullish: " + ToString(lBullishScore) + "\n" + + "Bearish: " + ToString(lBearishScore) + "\n" + "-------------" + "\n" + lConditionsStr + "\n" + "-------------" + "\n" + - "HIND [" + ToString(hConditions.period) + "]" + "\n" + + "HIND [" + ToString(hConditions.period) + "]" + "\n" + "\n" + + "Bullish: " + ToString(hBullishScore) + "\n" + + "Bearish: " + ToString(hBearishScore) + "\n" + "-------------" + "\n" + hConditionsStr + "\n" + // @@ -963,7 +1013,7 @@ public: bool result = false; // - string content = item.ToString(); + string content = item.ToString(true); result = IsValid(content); if (!result) {