test scoring and summarizing implementation ...

This commit is contained in:
2024-06-01 04:19:13 +03:30
parent 753b99411f
commit 55dada7f17
3 changed files with 39 additions and 62 deletions
+1 -42
View File
@@ -38,48 +38,7 @@ public:
// //
// Retrieve Class Token ... // Retrieve Class Token ...
virtual string GetToken() virtual string GetToken();
{
//
string result = NULL;
//
string mType = GetTypeName(this);
//
result = mType;
//
string parts[];
int partsCount = SplitContent(
parts,
result,
" "
//
);
if (partsCount <= 0)
{
//
result = mType;
return result;
}
//
bool hasLastPart = GetLastItem(
result,
parts
//
);
if (!hasLastPart)
{
//
result = mType;
return result;
}
//
return result;
}
protected: protected:
// //
+35 -17
View File
@@ -602,13 +602,13 @@ public:
// //
void GenerateScore( void GenerateScore(
double &bullishScore, // Bullish Score double &bullishScore, // Bullish Score
double &bearishScore, // Bearish Score double &bearishScore, // Bearish Score
double cMarketMultiplier = 1, // Current Market Score Multiplier double cMarketMultiplier = 1, // Current Market Score Multiplier
double sMarketMultiplier = 1.1, // Short Market Score Multiplier double sMarketMultiplier = 1.25, // Short Market Score Multiplier
double mMarketMultiplier = 1.2, // Medium Market Score Multiplier double mMarketMultiplier = 1.5, // Medium Market Score Multiplier
double lMarketMultiplier = 1.6, // Long Market Score Multiplier double lMarketMultiplier = 2, // Long Market Score Multiplier
double hMarketMultiplier = 1.8 // Hind Market Score Multiplier double hMarketMultiplier = 2.5 // Hind Market Score Multiplier
) )
{ {
// //
@@ -694,13 +694,14 @@ public:
} }
// //
virtual string GenerateSummary( string GenerateSummary(
const bool onlySummary = false, // Only Generate Conditions Summary const bool onlySummary = false, // Only Generate Conditions Summary
const bool onlyCyclesSummary = false, // Only Generate Conditions Summary
double cMarketMultiplier = 1, // Current Market Score Multiplier double cMarketMultiplier = 1, // Current Market Score Multiplier
double sMarketMultiplier = 1.1, // Short Market Score Multiplier double sMarketMultiplier = 1.25, // Short Market Score Multiplier
double mMarketMultiplier = 1.2, // Medium Market Score Multiplier double mMarketMultiplier = 1.5, // Medium Market Score Multiplier
double lMarketMultiplier = 1.6, // Long Market Score Multiplier double lMarketMultiplier = 2, // Long Market Score Multiplier
double hMarketMultiplier = 1.8, // Hind Market Score Multiplier double hMarketMultiplier = 2.5, // Hind Market Score Multiplier
const string separator = "\n", // Separator const string separator = "\n", // Separator
string provided = NULL, // Additional Info about Type, Provider and Symbol string provided = NULL, // Additional Info about Type, Provider and Symbol
const bool ignoreFalseConditions = true // Ignore False Conditions const bool ignoreFalseConditions = true // Ignore False Conditions
@@ -751,11 +752,11 @@ public:
; ;
// //
string cMarketConditionsStr = cMarketConditions.GenerateSummary(onlySummary, cMarketMultiplier); string cMarketConditionsStr = cMarketConditions.GenerateSummary(onlyCyclesSummary, cMarketMultiplier);
string sMarketConditionsStr = sMarketConditions.GenerateSummary(onlySummary, sMarketMultiplier); string sMarketConditionsStr = sMarketConditions.GenerateSummary(onlyCyclesSummary, sMarketMultiplier);
string mMarketConditionsStr = mMarketConditions.GenerateSummary(onlySummary, mMarketMultiplier); string mMarketConditionsStr = mMarketConditions.GenerateSummary(onlyCyclesSummary, mMarketMultiplier);
string lMarketConditionsStr = lMarketConditions.GenerateSummary(onlySummary, lMarketMultiplier); string lMarketConditionsStr = lMarketConditions.GenerateSummary(onlyCyclesSummary, lMarketMultiplier);
string hMarketConditionsStr = hMarketConditions.GenerateSummary(onlySummary, hMarketMultiplier); string hMarketConditionsStr = hMarketConditions.GenerateSummary(onlyCyclesSummary, hMarketMultiplier);
// //
result = result =
@@ -779,6 +780,15 @@ public:
// //
return result; return result;
} }
//
// Tools ...
//
string GetToken()
{
return GetSpecificToken(this);
}
}; };
// //
@@ -2801,6 +2811,14 @@ private:
bearishScore // bearishScore //
); );
//
// Generate Summary ...
string summary = conditions.GenerateSummary(
true, // Only Summary ...
true // Only Cycles Summary ...
);
Comment(summary);
// //
ArraySetAsSeries(mBullishScore, false); ArraySetAsSeries(mBullishScore, false);
ArraySetAsSeries(mBearishScore, false); ArraySetAsSeries(mBearishScore, false);
+3 -3
View File
@@ -40,7 +40,7 @@
#include "../Helpers/x-saherelm.xich.helper.mq5" #include "../Helpers/x-saherelm.xich.helper.mq5"
// //
#include "../Classes/x-saherelm.xprovider.class.mq5" #include "../Classes/x-saherelm.xalert.class.mq5"
// //
// Definitions ... // Definitions ...
@@ -2357,7 +2357,7 @@ public:
// //
// Signaller Class Base Implementation ... // Signaller Class Base Implementation ...
class XSignallerDescriptor class XSignallerDescriptor : public XSCBase
{ {
// //
// Public ... // Public ...
@@ -2611,7 +2611,7 @@ public:
// //
// Market Class ... // Market Class ...
class XSCX121Market : XSCBase class XSCX121Market : XSCBaseAlert
{ {
// //
// Public ... // Public ...