saherelm/MQL5Data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply 1r1 EURUSD Level 1 Fix ...

Browse Source
This commit is contained in:
saherelm
2024-08-23 22:05:24 +03:30
parent f9f1baa4a7
commit f52241934e
7 changed files with 39130 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Helpers/x-saherelm.xchhk.helper.mq5
+350
View File
@@ -4703,6 +4703,356 @@ public:
return result;
}
//
// Check Cycles Switched to Bullish or not ...
bool IsCyclesSwitchedToBullish(
int barIndex, // Bar Index
ENUM_X_MARKET_CYCLES &cycles[] //
)
{
//
bool result = false;
//
int cyclesCount = ArraySize(cycles);
result = IsValidSize(cyclesCount);
if (!result)
{
return result;
}
//
int cIndex = barIndex;
int pIndex = cIndex + 1;
//
XOHCL cBars[];
XOHCL pBars[];
for (int i = 0; i < cyclesCount; i++)
{
//
XOHCL iCBar;
XOHCL iPBar;
//
switch (cycles[i])
{
//
// CURRENT ...
case X_MARKET_CYCLE_UNKNOWN:
result = CAsOHCL(iCBar, cIndex);
break;
//
// SHORT ...
case X_MARKET_CYCLE_SHORT:
result = SAsOHCL(iCBar, cIndex);
break;
//
// MEDIUM ...
case X_MARKET_CYCLE_MEDIUM:
result = MAsOHCL(iCBar, cIndex);
break;
//
// LONG ...
case X_MARKET_CYCLE_LONG:
result = LAsOHCL(iCBar, cIndex);
break;
//
// HIND ...
case X_MARKET_CYCLE_HIND:
result = HAsOHCL(iCBar, cIndex);
break;
}
if (!result)
{
break;
}
AddRef(
iCBar,
cBars //
);
//
switch (cycles[i])
{
//
// CURRENT ...
case X_MARKET_CYCLE_UNKNOWN:
result = CAsOHCL(iPBar, pIndex);
break;
//
// SHORT ...
case X_MARKET_CYCLE_SHORT:
result = SAsOHCL(iPBar, pIndex);
break;
//
// MEDIUM ...
case X_MARKET_CYCLE_MEDIUM:
result = MAsOHCL(iPBar, pIndex);
break;
//
// LONG ...
case X_MARKET_CYCLE_LONG:
result = LAsOHCL(iPBar, pIndex);
break;
//
// HIND ...
case X_MARKET_CYCLE_HIND:
result = HAsOHCL(iPBar, pIndex);
break;
}
if (!result)
{
break;
}
AddRef(
iPBar,
pBars //
);
}
//
int cBarsCount = ArraySize(cBars);
int pBarsCount = ArraySize(pBars);
result =
//
IsValidSize(cBarsCount) &&
cBarsCount == cyclesCount &&
//
IsValidSize(pBarsCount) &&
pBarsCount == cyclesCount
//
;
if (!result)
{
return result;
}
//
bool isCIndexBullish = true;
for (int i = 0; i < cBarsCount; i++)
{
isCIndexBullish = isCIndexBullish && cBars[i].IsBullish();
}
//
bool isPIndexBullish = true;
for (int i = 0; i < pBarsCount; i++)
{
isPIndexBullish = isPIndexBullish && pBars[i].IsBullish();
}
//
result = isCIndexBullish &&
!isPIndexBullish;
//
return result;
}
//
// Check Cycles Switched to Bearish or not ...
bool IsCyclesSwitchedToBearish(
int barIndex, // Bar Index
ENUM_X_MARKET_CYCLES &cycles[] //
)
{
//
bool result = false;
//
int cyclesCount = ArraySize(cycles);
result = IsValidSize(cyclesCount);
if (!result)
{
return result;
}
//
int cIndex = barIndex;
int pIndex = cIndex + 1;
//
XOHCL cBars[];
XOHCL pBars[];
for (int i = 0; i < cyclesCount; i++)
{
//
XOHCL iCBar;
XOHCL iPBar;
//
switch (cycles[i])
{
//
// CURRENT ...
case X_MARKET_CYCLE_UNKNOWN:
result = CAsOHCL(iCBar, cIndex);
break;
//
// SHORT ...
case X_MARKET_CYCLE_SHORT:
result = SAsOHCL(iCBar, cIndex);
break;
//
// MEDIUM ...
case X_MARKET_CYCLE_MEDIUM:
result = MAsOHCL(iCBar, cIndex);
break;
//
// LONG ...
case X_MARKET_CYCLE_LONG:
result = LAsOHCL(iCBar, cIndex);
break;
//
// HIND ...
case X_MARKET_CYCLE_HIND:
result = HAsOHCL(iCBar, cIndex);
break;
}
if (!result)
{
break;
}
AddRef(
iCBar,
cBars //
);
//
switch (cycles[i])
{
//
// CURRENT ...
case X_MARKET_CYCLE_UNKNOWN:
result = CAsOHCL(iPBar, pIndex);
break;
//
// SHORT ...
case X_MARKET_CYCLE_SHORT:
result = SAsOHCL(iPBar, pIndex);
break;
//
// MEDIUM ...
case X_MARKET_CYCLE_MEDIUM:
result = MAsOHCL(iPBar, pIndex);
break;
//
// LONG ...
case X_MARKET_CYCLE_LONG:
result = LAsOHCL(iPBar, pIndex);
break;
//
// HIND ...
case X_MARKET_CYCLE_HIND:
result = HAsOHCL(iPBar, pIndex);
break;
}
if (!result)
{
break;
}
AddRef(
iPBar,
pBars //
);
}
//
int cBarsCount = ArraySize(cBars);
int pBarsCount = ArraySize(pBars);
result =
//
IsValidSize(cBarsCount) &&
cBarsCount == cyclesCount &&
//
IsValidSize(pBarsCount) &&
pBarsCount == cyclesCount
//
;
if (!result)
{
return result;
}
//
bool isCIndexBearish = true;
for (int i = 0; i < cBarsCount; i++)
{
isCIndexBearish = isCIndexBearish && cBars[i].IsBearish();
}
//
bool isPIndexBearish = true;
for (int i = 0; i < pBarsCount; i++)
{
isPIndexBearish = isPIndexBearish && pBars[i].IsBearish();
}
//
result = isCIndexBearish &&
!isPIndexBearish;
//
return result;
}
//
// Check All Cycles Switched to Bullish or not ...
bool IsSwitchedToBullish(
int barIndex // Bar Index
)
{
//
bool result = false;
//
ENUM_X_MARKET_CYCLES cycles[];
int cyclesCount = GetAllMarketCycles(cycles);
result = IsValidSize(cyclesCount);
if (!result)
{
return result;
}
//
result = IsCyclesSwitchedToBullish(
barIndex,
cycles //
);
//
return result;
}
//
// Check All Cycles Switched to Bearish or not ...
bool IsSwitchedToBearish(
int barIndex // Bar Index
)
{
//
bool result = false;
//
ENUM_X_MARKET_CYCLES cycles[];
int cyclesCount = GetAllMarketCycles(cycles);
result = IsValidSize(cyclesCount);
if (!result)
{
return result;
}
//
result = IsCyclesSwitchedToBearish(
barIndex,
cycles //
);
//
return result;
}
//
// Conditions ...
Indicators/decision_candles_colored.mq5
+114
View File
@@ -0,0 +1,114 @@
//+------------------------------------------------------------------+
//| Decision_Candles_Colored.mq5 |
//| Copyright 2021, MetaQuotes Ltd. |
//| https://www.mql5.com |
//+------------------------------------------------------------------+
#property copyright "Mohamed"
#property link "https://www.mql5.com/en/code/50992"
#property version "1.10"
#property strict
#property indicator_chart_window
#property indicator_buffers 8
#property indicator_plots 2
#property indicator_type1 DRAW_CANDLES
#property indicator_color1 clrBlue, clrAqua
#property indicator_style1 STYLE_SOLID
#property indicator_width1 1
#property indicator_type2 DRAW_CANDLES
#property indicator_color2 clrRed, clrDarkOrange
#property indicator_style2 STYLE_SOLID
#property indicator_width2 1
input double dcpercent = 50; // Decision Candle Body/range Percentage
double buff0[];
double buff1[];
double buff2[];
double buff3[];
double buff4[];
double buff5[];
double buff6[];
double buff7[];
//+------------------------------------------------------------------+
//| Custom indicator initialization function |
//+------------------------------------------------------------------+
int OnInit()
{
//--- indicator buffers mapping
IndicatorSetString(INDICATOR_SHORTNAME, "DCandles");
SetIndexBuffer(0, buff0, INDICATOR_DATA);
SetIndexBuffer(1, buff1, INDICATOR_DATA);
SetIndexBuffer(2, buff2, INDICATOR_DATA);
SetIndexBuffer(3, buff3, INDICATOR_DATA);
SetIndexBuffer(4, buff4, INDICATOR_DATA);
SetIndexBuffer(5, buff5, INDICATOR_DATA);
SetIndexBuffer(6, buff6, INDICATOR_DATA);
SetIndexBuffer(7, buff7, INDICATOR_DATA);
for(int in = 0; in < 8; in++)PlotIndexSetInteger(in, PLOT_SHOW_DATA, false);
//---
return(INIT_SUCCEEDED);
}
//+------------------------------------------------------------------+
//| Custom indicator iteration function |
//+------------------------------------------------------------------+
int OnCalculate(const int rates_total,
const int prev_calculated,
const datetime &time[],
const double &open[],
const double &high[],
const double &low[],
const double &close[],
const long &tick_volume[],
const long &volume[],
const int &spread[])
{
//---
int start = prev_calculated;
if(start >= rates_total)start = rates_total - 1;
if(start < 0)start = 0;
for(int i = start; i < rates_total; i++)
{
buff0[i] = EMPTY_VALUE;
buff1[i] = EMPTY_VALUE;
buff2[i] = EMPTY_VALUE;
buff3[i] = EMPTY_VALUE;
buff4[i] = EMPTY_VALUE;
buff5[i] = EMPTY_VALUE;
buff6[i] = EMPTY_VALUE;
buff7[i] = EMPTY_VALUE;
bool DC = (high[i] - low[i]) * dcpercent / 100 <= fabs(close[i] - open[i]);
bool up = DC && close[i] > open[i];
bool dn = DC && close[i] < open[i];
if(up)
{
buff0[i] = open[i];
buff1[i] = high[i];
buff2[i] = low[i];
buff3[i] = close[i];
}
if(dn)
{
buff4[i] = open[i];
buff5[i] = high[i];
buff6[i] = low[i];
buff7[i] = close[i];
}
}
//--- return value of prev_calculated for next call
return(rates_total);
}
//+------------------------------------------------------------------+
Parsers/AMarkets/EURUSD/2019/x-saherelm.xch.amarkets.eurusd.2019.long.parser.mq5
+13391 -2
View File
File diff suppressed because it is too large Load Diff
Parsers/AMarkets/EURUSD/2019/x-saherelm.xch.amarkets.eurusd.2019.short.parser.mq5
+12613 -2
View File
File diff suppressed because it is too large Load Diff
Parsers/AMarkets/EURUSD/Olds/x-saherelm.xch.amarkets.eurusd.olds.long.parser.mq5
+5045 -2
View File
File diff suppressed because it is too large Load Diff
Parsers/AMarkets/EURUSD/Olds/x-saherelm.xch.amarkets.eurusd.olds.short.parser.mq5
+7604 -2
View File
File diff suppressed because it is too large Load Diff
Strategies/x-saherelm.xch.che.strategy.mq5
+13 -5
View File
@@ -350,6 +350,14 @@ public:
//
// Detecting Signals ...
//
bool isCHHKFullSwitchedToBullish =
chhkHelper.IsSwitchedToBullish(cIndex);
//
bool isCHHKFullSwitchedToBearish =
chhkHelper.IsSwitchedToBearish(cIndex);
//
result = hasLong || hasShort;
if (!result)
@@ -650,11 +658,11 @@ private:
chhkInputs.ignoreShadows = true;
//
chhkInputs.showCurrent = false;
chhkInputs.showShort = false;
chhkInputs.showMedium = false;
chhkInputs.showLong = false;
chhkInputs.showHind = false;
chhkInputs.showCurrent = true;
chhkInputs.showShort = true;
chhkInputs.showMedium = true;
chhkInputs.showLong = true;
chhkInputs.showHind = true;
//
chhkHelper = new XSCXCHHKHelper();