diff --git a/Classes/x-saherelm.base.class.mq5 b/Classes/x-saherelm.base.class.mq5 index b5be0a68..79113970 100644 --- a/Classes/x-saherelm.base.class.mq5 +++ b/Classes/x-saherelm.base.class.mq5 @@ -39,7 +39,7 @@ public: // // Retrieve Class Token ... virtual string GetToken(); - + // // Protected protected: @@ -60,6 +60,14 @@ string GenerateSpecifiedCommonSummary( // string result = NULL; + // + double bullishScore = 0; + double bearishScore = 0; + mItem.GenerateScore( + bullishScore, + bearishScore // + ); + // result = // @@ -70,6 +78,14 @@ string GenerateSpecifiedCommonSummary( "Symbol: " + mItem.symbol + separator + "Period: " + ToString(mItem.period) + separator + "Time: " + ToString(mItem.time) + separator + + (includeScores + ? "---------------" + separator + + "Scores:" + separator + + "---------------" + separator + + "Bullish: " + ToString(bullishScore) + separator + + "Bearish: " + ToString(bearishScore) + separator + + "---------------" + separator + + : "") + "" // ; diff --git a/Experts/x-test-strategies.ea.mq5 b/Experts/x-test-strategies.ea.mq5 index 4e0f1598..6e1bdeb1 100644 --- a/Experts/x-test-strategies.ea.mq5 +++ b/Experts/x-test-strategies.ea.mq5 @@ -598,6 +598,10 @@ void HandleTimeReport() } } +// +// SIGNAL EVENT Handlers ... +// + // // All Signals from Strategies Comming Here for Execution or // Analyzing ... @@ -653,9 +657,6 @@ void OnSignalRecieved( ); } -// -// Trader Event Handlers for Trade Handling ... - // void OnStopLossTriggered(const XDeal &deal) {