resolved 14 sls from 2022 till 2024.07 - 8 Long 6 Short ...
This commit is contained in:
@@ -41,6 +41,7 @@
|
||||
#include "../Helpers/x-saherelm.xosc.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xvlm.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xhtd.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xchma.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xatsl.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xdmnt.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xasct.helper.mq5"
|
||||
@@ -79,6 +80,7 @@ struct XTestInputs
|
||||
XOSCInputs oscInputs; // XOSC Inputs
|
||||
XVLMInputs vlmInputs; // XVLM Inputs
|
||||
XSLNInputs slnInputs; // XSLN Inputs
|
||||
XCHMAInputs chmaInputs; // XCHMA Inputs
|
||||
XATSLInputs atslInputs; // XATSL Inputs
|
||||
XDMNTInputs dmntInputs; // XDMNT Inputs
|
||||
XASCTInputs asctInputs; // XASCT Inputs
|
||||
@@ -123,6 +125,7 @@ struct XTestInputs
|
||||
XOSCInputs &_oscInputs, // XOSC Inputs
|
||||
XVLMInputs &_vlmInputs, // XVLM Inputs
|
||||
XSLNInputs &_slnInputs, // XSLN Inputs
|
||||
XCHMAInputs &_chmaInputs, // XCHMA Inputs
|
||||
XATSLInputs &_atslInputs, // XATSL Inputs
|
||||
XDMNTInputs &_dmntInputs, // XDMNT Inputs
|
||||
XASCTInputs &_asctInputs, // XASCT Inputs
|
||||
@@ -149,6 +152,7 @@ struct XTestInputs
|
||||
this.mrbInputs = _mrbInputs;
|
||||
this.oscInputs = _oscInputs;
|
||||
this.vlmInputs = _vlmInputs;
|
||||
this.chmaInputs = _chmaInputs;
|
||||
this.atslInputs = _atslInputs;
|
||||
this.dmntInputs = _dmntInputs;
|
||||
this.asctInputs = _asctInputs;
|
||||
@@ -189,6 +193,7 @@ struct XTestInputs
|
||||
vlmInputs.Clean();
|
||||
slnInputs.Clean();
|
||||
htdInputs.Clean();
|
||||
chmaInputs.Clean();
|
||||
asctInputs.Clean();
|
||||
sslcInputs.Clean();
|
||||
hullInputs.Clean();
|
||||
@@ -219,6 +224,7 @@ struct XTestInputs
|
||||
vlmInputs.Default();
|
||||
slnInputs.Default();
|
||||
htdInputs.Default();
|
||||
chmaInputs.Default();
|
||||
asctInputs.Default();
|
||||
sslcInputs.Default();
|
||||
hullInputs.Default();
|
||||
@@ -253,6 +259,13 @@ struct XTestInputs
|
||||
return result;
|
||||
}
|
||||
|
||||
//
|
||||
result = chmaInputs.IsValid();
|
||||
if (!result)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
//
|
||||
result = tdInputs.IsValid();
|
||||
if (!result)
|
||||
@@ -409,6 +422,7 @@ struct XTestConditions
|
||||
XVLMConditions vlmConditions;
|
||||
XHTDConditions htdConditions;
|
||||
XSLNConditions slnConditions;
|
||||
XCHMAConditions chmaConditions;
|
||||
XATSLConditions atslConditions;
|
||||
XASCTConditions asctConditions;
|
||||
XSSLCConditions sslcConditions;
|
||||
@@ -629,7 +643,7 @@ struct XTestConditions
|
||||
mMode,
|
||||
mEntry,
|
||||
volume,
|
||||
0, //mSL,
|
||||
0, // mSL,
|
||||
mTP //
|
||||
);
|
||||
// if (result)
|
||||
@@ -784,6 +798,7 @@ struct XTestConditions
|
||||
vlmConditions.Clean();
|
||||
slnConditions.Clean();
|
||||
htdConditions.Clean();
|
||||
chmaConditions.Clean();
|
||||
atslConditions.Clean();
|
||||
asctConditions.Clean();
|
||||
sslcConditions.Clean();
|
||||
@@ -921,6 +936,14 @@ struct XTestConditions
|
||||
bullishScore += tempBullishScore;
|
||||
bearishScore += tempBearishScore;
|
||||
|
||||
//
|
||||
chmaConditions.GenerateScore(
|
||||
tempBullishScore,
|
||||
tempBearishScore //
|
||||
);
|
||||
bullishScore += tempBullishScore;
|
||||
bearishScore += tempBearishScore;
|
||||
|
||||
//
|
||||
hullConditions.GenerateScore(
|
||||
tempBullishScore,
|
||||
@@ -1007,7 +1030,8 @@ struct XTestConditions
|
||||
string vlmSummary = vlmConditions.GenerateSummary(false, true, false, ignoreFalseConditions);
|
||||
string slnSummary = slnConditions.GenerateSummary(false, true, false, ignoreFalseConditions);
|
||||
string htdSummary = htdConditions.GenerateSummary(false, true, false, ignoreFalseConditions);
|
||||
string atsSummary = atslConditions.GenerateSummary(false, true, false, ignoreFalseConditions);
|
||||
string chmaSummary = chmaConditions.GenerateSummary(false, true, false, ignoreFalseConditions);
|
||||
string atslSummary = atslConditions.GenerateSummary(false, true, false, ignoreFalseConditions);
|
||||
string asctSummary = asctConditions.GenerateSummary(false, true, false, ignoreFalseConditions);
|
||||
string sslcSummary = sslcConditions.GenerateSummary(false, true, false, ignoreFalseConditions);
|
||||
string hullSummary = hullConditions.GenerateSummary(false, true, false, ignoreFalseConditions);
|
||||
@@ -1033,8 +1057,9 @@ struct XTestConditions
|
||||
hullSummary + separator +
|
||||
adxtdSummary + separator +
|
||||
htdSummary + separator +
|
||||
atsSummary + separator +
|
||||
atslSummary + separator +
|
||||
dmntSummary + separator +
|
||||
chmaSummary + separator +
|
||||
""
|
||||
//
|
||||
;
|
||||
@@ -1096,6 +1121,7 @@ public:
|
||||
XSCXSSLCHelper *sslcHelper;
|
||||
XSCXHULLHelper *hullHelper;
|
||||
XSCXATSLHelper *atslHelper;
|
||||
XSCXCHMAHelper *chmaHelper;
|
||||
XSCXDMNTHelper *dmntHelper;
|
||||
XSCXADXTDHelper *adxtdHelper;
|
||||
|
||||
@@ -1127,6 +1153,7 @@ public:
|
||||
delete sslcHelper;
|
||||
delete hullHelper;
|
||||
delete atslHelper;
|
||||
delete chmaHelper;
|
||||
delete dmntHelper;
|
||||
delete adxtdHelper;
|
||||
}
|
||||
@@ -1179,6 +1206,19 @@ public:
|
||||
return result;
|
||||
}
|
||||
|
||||
//
|
||||
// XCHMA ...
|
||||
chmaHelper = new XSCXCHMAHelper();
|
||||
result = chmaHelper.Init(
|
||||
inputs.symbol,
|
||||
inputs.period,
|
||||
inputs.chmaInputs //
|
||||
);
|
||||
if (!result)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
//
|
||||
// XSLN ...
|
||||
slnHelper = new XSCXSLNHelper();
|
||||
@@ -1507,6 +1547,17 @@ public:
|
||||
return result;
|
||||
}
|
||||
|
||||
//
|
||||
result = chmaHelper.GetConditions(
|
||||
conditions.chmaConditions,
|
||||
barIndex,
|
||||
loopback //
|
||||
);
|
||||
if (!result)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
//
|
||||
result = atslHelper.GetConditions(
|
||||
conditions.atslConditions,
|
||||
|
||||
Reference in New Issue
Block a user