This commit is contained in:
2025-03-14 17:44:33 +03:30
parent fe7df78f5d
commit a05b8f464d
25 changed files with 32729 additions and 17459 deletions
+1 -124
View File
@@ -31,7 +31,6 @@
#include "../Helpers/x-saherelm.x121.xmas.helper.mq5"
#include "../Helpers/x-saherelm.x121.xpv.helper.mq5"
#include "../Helpers/x-saherelm.x121.xstr.helper.mq5"
#include "../Helpers/x-saherelm.x121.xtrend.helper.mq5"
#include "../Helpers/x-saherelm.x121.xvwap.helper.mq5"
//
@@ -51,7 +50,6 @@ struct X121Inputs
X121XDONInputs xdonInputs;
X121X3MAInputs x3maInputs;
X121XVWAPInputs xvwapInputs;
X121XTRENDInputs xtrendInputs;
//
// Constructor ...
@@ -78,7 +76,6 @@ struct X121Inputs
xcheInputs.Clean();
xdonInputs.Clean();
xvwapInputs.Clean();
xtrendInputs.Clean();
//
ZeroMemory(this);
@@ -100,7 +97,6 @@ struct X121Inputs
xdonInputs.Default();
x3maInputs.Default();
xvwapInputs.Default();
xtrendInputs.Default();
}
/**
@@ -124,8 +120,7 @@ struct X121Inputs
xstrInputs.IsValid() &&
xcheInputs.IsValid() &&
xdonInputs.IsValid() &&
xvwapInputs.IsValid() &&
xtrendInputs.IsValid()
xvwapInputs.IsValid()
//
;
@@ -152,7 +147,6 @@ struct X121Inputs
int xcheMax = xcheInputs.Max();
int xdonMax = xdonInputs.Max();
int xvwapMax = xvwapInputs.Max();
int xtrendMax = xtrendInputs.Max();
//
result = MathMax(xpvMax, xhkMax);
@@ -162,7 +156,6 @@ struct X121Inputs
result = MathMax(result, xcheMax);
result = MathMax(result, xdonMax);
result = MathMax(result, xvwapMax);
result = MathMax(result, xtrendMax);
//
return result;
@@ -2431,7 +2424,6 @@ class XCX121Helper : public XCBase
XCX121XDONHelper *xdonHelper;
XCX121X3MAHelper *x3maHelper;
XCX121XVWAPHelper *xvwapHelper;
XCX121XTRENDHelper *xtrendHelper;
//
// Constructors ...
@@ -2455,7 +2447,6 @@ class XCX121Helper : public XCBase
xcheInputs.Clean();
x3maInputs.Clean();
xvwapInputs.Clean();
xtrendInputs.Clean();
//
delete xccHelper;
@@ -2468,7 +2459,6 @@ class XCX121Helper : public XCBase
delete xdonHelper;
delete x3maHelper;
delete xvwapHelper;
delete xtrendHelper;
//
ZeroMemory(xccHelper);
@@ -2481,7 +2471,6 @@ class XCX121Helper : public XCBase
ZeroMemory(xdonHelper);
ZeroMemory(x3maHelper);
ZeroMemory(xvwapHelper);
ZeroMemory(xtrendHelper);
}
//
@@ -2546,7 +2535,6 @@ class XCX121Helper : public XCBase
xdonInputs = inputs.xdonInputs;
x3maInputs = inputs.x3maInputs;
xvwapInputs = inputs.xvwapInputs;
xtrendInputs = inputs.xtrendInputs;
//
// Initial Helpers ...
@@ -2681,19 +2669,6 @@ class XCX121Helper : public XCBase
return result;
}
//
// XTREND ...
xtrendHelper = new XCX121XTRENDHelper();
result = xtrendHelper.Init(
symbol,
period,
xtrendInputs //
);
if (!result)
{
return result;
}
//
if (inputs.showRSI)
{
@@ -2918,28 +2893,6 @@ class XCX121Helper : public XCBase
return result;
}
//
// XTREND ...
bool GetTrendConditions(
X121XTRENDConditions &conditions, //
int barIndex = 0, //
int loopback = 5 //
)
{
//
bool result = false;
//
result = xtrendHelper.GetConditions(
conditions,
barIndex,
loopback //
);
//
return result;
}
//
void Free()
{
@@ -2952,7 +2905,6 @@ class XCX121Helper : public XCBase
xcheHelper.Free();
xdonHelper.Free();
xvwapHelper.Free();
xtrendHelper.Free();
}
//
@@ -3138,19 +3090,6 @@ class XCX121Helper : public XCBase
return result;
}
//
// XTREND ...
X121XTRENDConditions xtrendConditions;
result = GetTrendConditions(
xtrendConditions,
barIndex,
loopback //
);
if (!result)
{
return result;
}
//
// Fill Volume Buffer ...
for (int i = barIndex; i < barIndex + loopback; i++)
@@ -3422,66 +3361,6 @@ class XCX121Helper : public XCBase
conditions.masLowerBuffer //
);
//
// XTREND ...
//
// Buffers ...
//
Copy(
xtrendConditions.upTrendBuffer,
conditions.upTrendBuffer //
);
//
Copy(
xtrendConditions.downTrendBuffer,
conditions.downTrendBuffer //
);
//
Copy(
xtrendConditions.maBuffer,
conditions.maBuffer //
);
//
Copy(
xtrendConditions.adxBuffer,
conditions.adxBuffer //
);
//
Copy(
xtrendConditions.adxPBuffer,
conditions.adxPBuffer //
);
//
Copy(
xtrendConditions.adxMBuffer,
conditions.adxMBuffer //
);
//
Copy(
xtrendConditions.upTBuffer,
conditions.upTBuffer //
);
//
Copy(
xtrendConditions.downTBuffer,
conditions.downTBuffer //
);
//
conditions.isTrendBullish = xtrendConditions.isTrendBullish;
conditions.isTrendBearish = xtrendConditions.isTrendBearish;
conditions.isTrendSwitchedToBullish = xtrendConditions.isTrendSwitchedToBullish;
conditions.isTrendSwitchedToBearish = xtrendConditions.isTrendSwitchedToBearish;
//
// XATR ...
@@ -4594,7 +4473,6 @@ class XCX121Helper : public XCBase
xdonConditions.Clean();
x3maConditions.Clean();
xvwapConditions.Clean();
xtrendConditions.Clean();
//
Free();
@@ -4628,7 +4506,6 @@ class XCX121Helper : public XCBase
X121XCHEInputs xcheInputs;
X121X3MAInputs x3maInputs;
X121XVWAPInputs xvwapInputs;
X121XTRENDInputs xtrendInputs;
//
int mRSIHandler;
+4 -4
View File
@@ -126,22 +126,22 @@ struct X121XPVInputs
{
//
// Short ...
scMethod = X_PERIOD_NOTHING;
scMethod = X_PERIOD_NONE;
scPeriod = NULL;
//
// Medium ...
mcMethod = X_PERIOD_NOTHING;
mcMethod = X_PERIOD_NONE;
mcPeriod = NULL;
//
// Long ...
lcMethod = X_PERIOD_NOTHING;
lcMethod = X_PERIOD_NONE;
lcPeriod = NULL;
//
// Hind ...
hcMethod = X_PERIOD_NOTHING;
hcMethod = X_PERIOD_NONE;
hcPeriod = NULL;
//