add hull and sslc into x121 market ...
This commit is contained in:
@@ -27,15 +27,17 @@
|
||||
#include "../Helpers/x-saherelm.xcc.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xct.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xmc.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xdon.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xzg.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xpv.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xtm.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xtd.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xdon.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xstr.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xche.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xosc.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xtm.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xama.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xtd.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xhull.helper.mq5"
|
||||
#include "../Helpers/x-saherelm.xsslc.helper.mq5"
|
||||
|
||||
//
|
||||
#include "../Classes/x-saherelm.xprovider.class.mq5"
|
||||
@@ -99,6 +101,8 @@ public:
|
||||
XSTRInputs strInputs;
|
||||
XDONInputs donInputs;
|
||||
XOSCInputs oscInputs;
|
||||
XHULLInputs hullInputs;
|
||||
XSSLCInputs sslcInputs;
|
||||
|
||||
//
|
||||
X121MCycleInputs cMarketInputs; // Curent Market Inputs
|
||||
@@ -175,8 +179,14 @@ public:
|
||||
{
|
||||
ichInputs.Default();
|
||||
}
|
||||
|
||||
//
|
||||
if (!hullInputs.IsValid())
|
||||
{
|
||||
hullInputs.Default();
|
||||
}
|
||||
if (!sslcInputs.IsValid())
|
||||
{
|
||||
sslcInputs.Default();
|
||||
}
|
||||
if (!tdInputs.IsValid())
|
||||
{
|
||||
tdInputs.Default();
|
||||
@@ -198,6 +208,8 @@ public:
|
||||
cMarketInputs.cheInputs = this.cheInputs;
|
||||
cMarketInputs.ichInputs = this.ichInputs;
|
||||
cMarketInputs.donInputs = this.donInputs;
|
||||
cMarketInputs.hullInputs = this.hullInputs;
|
||||
cMarketInputs.sslcInputs = this.sslcInputs;
|
||||
result = cMarketInputs.Init(
|
||||
this.symbol,
|
||||
this.period,
|
||||
@@ -225,6 +237,8 @@ public:
|
||||
sMarketInputs.cheInputs = this.cheInputs;
|
||||
sMarketInputs.ichInputs = this.ichInputs;
|
||||
sMarketInputs.donInputs = this.donInputs;
|
||||
sMarketInputs.hullInputs = this.hullInputs;
|
||||
sMarketInputs.sslcInputs = this.sslcInputs;
|
||||
result = sMarketInputs.Init(
|
||||
this.symbol,
|
||||
this.period,
|
||||
@@ -252,6 +266,8 @@ public:
|
||||
mMarketInputs.cheInputs = this.cheInputs;
|
||||
mMarketInputs.ichInputs = this.ichInputs;
|
||||
mMarketInputs.donInputs = this.donInputs;
|
||||
mMarketInputs.hullInputs = this.hullInputs;
|
||||
mMarketInputs.sslcInputs = this.sslcInputs;
|
||||
result = mMarketInputs.Init(
|
||||
this.symbol,
|
||||
this.period,
|
||||
@@ -279,6 +295,8 @@ public:
|
||||
lMarketInputs.cheInputs = this.cheInputs;
|
||||
lMarketInputs.ichInputs = this.ichInputs;
|
||||
lMarketInputs.donInputs = this.donInputs;
|
||||
lMarketInputs.hullInputs = this.hullInputs;
|
||||
lMarketInputs.sslcInputs = this.sslcInputs;
|
||||
result = lMarketInputs.Init(
|
||||
this.symbol,
|
||||
this.period,
|
||||
@@ -306,6 +324,8 @@ public:
|
||||
hMarketInputs.cheInputs = this.cheInputs;
|
||||
hMarketInputs.ichInputs = this.ichInputs;
|
||||
hMarketInputs.donInputs = this.donInputs;
|
||||
hMarketInputs.hullInputs = this.hullInputs;
|
||||
hMarketInputs.sslcInputs = this.sslcInputs;
|
||||
result = hMarketInputs.Init(
|
||||
this.symbol,
|
||||
this.period,
|
||||
@@ -351,13 +371,15 @@ public:
|
||||
pvInputs.IsValid() &&
|
||||
mcInputs.IsValid() &&
|
||||
hkInputs.IsValid() &&
|
||||
tdInputs.IsValid() &&
|
||||
mrbInputs.IsValid() &&
|
||||
cheInputs.IsValid() &&
|
||||
strInputs.IsValid() &&
|
||||
donInputs.IsValid() &&
|
||||
oscInputs.IsValid() &&
|
||||
ichInputs.IsValid() &&
|
||||
tdInputs.IsValid() &&
|
||||
hullInputs.IsValid() &&
|
||||
sslcInputs.IsValid() &&
|
||||
//
|
||||
cMarketInputs.IsValid() &&
|
||||
sMarketInputs.IsValid() &&
|
||||
@@ -406,14 +428,15 @@ public:
|
||||
pvInputs.Clean();
|
||||
mcInputs.Clean();
|
||||
hkInputs.Clean();
|
||||
tdInputs.Clean();
|
||||
mrbInputs.Clean();
|
||||
cheInputs.Clean();
|
||||
strInputs.Clean();
|
||||
donInputs.Clean();
|
||||
oscInputs.Clean();
|
||||
ichInputs.Clean();
|
||||
//
|
||||
tdInputs.Clean();
|
||||
hullInputs.Clean();
|
||||
sslcInputs.Clean();
|
||||
//
|
||||
cMarketInputs.Clean();
|
||||
sMarketInputs.Clean();
|
||||
@@ -457,13 +480,15 @@ public:
|
||||
pvInputs.Default();
|
||||
mcInputs.Default();
|
||||
hkInputs.Default();
|
||||
tdInputs.Default();
|
||||
mrbInputs.Default();
|
||||
cheInputs.Default();
|
||||
strInputs.Default();
|
||||
donInputs.Default();
|
||||
oscInputs.Default();
|
||||
ichInputs.Default();
|
||||
tdInputs.Default();
|
||||
hullInputs.Default();
|
||||
sslcInputs.Default();
|
||||
|
||||
//
|
||||
cMarketInputs.Default();
|
||||
@@ -487,6 +512,18 @@ public:
|
||||
result = MathMax(result, ctInputs.Max());
|
||||
result = MathMax(result, ccInputs.Max());
|
||||
result = MathMax(result, tdInputs.Max());
|
||||
result = MathMax(result, zgInputs.Max());
|
||||
result = MathMax(result, pvInputs.Max());
|
||||
result = MathMax(result, mcInputs.Max());
|
||||
result = MathMax(result, hkInputs.Max());
|
||||
result = MathMax(result, mrbInputs.Max());
|
||||
result = MathMax(result, cheInputs.Max());
|
||||
result = MathMax(result, strInputs.Max());
|
||||
result = MathMax(result, donInputs.Max());
|
||||
result = MathMax(result, oscInputs.Max());
|
||||
result = MathMax(result, ichInputs.Max());
|
||||
result = MathMax(result, hullInputs.Max());
|
||||
result = MathMax(result, sslcInputs.Max());
|
||||
|
||||
//
|
||||
return result;
|
||||
@@ -1292,7 +1329,8 @@ struct X121ProviderDescriptor
|
||||
//
|
||||
// Check Waits Until New Bar ...
|
||||
result = !this.provider.CanIgnoreProcess();
|
||||
if (!result) {
|
||||
if (!result)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user