gavindiaz/mql5
1
0
Fork 0
mirror of https://github.com/softwaredevelop/mql5.git synced 2026-08-26 02:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(indicators): Updated to use new Calculator with ENUM_MA_TYPE

Browse Source
This commit is contained in:
Toh4iem9
2026-01-16 20:29:31 +01:00
parent 7d0bddc736
commit ab63865f8c
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Indicators/MyIndicators/Bollinger_Bands_PercentB.mq5
+16 -18
View File
@@ -1,11 +1,11 @@
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| Bollinger_Bands_PercentB.mq5 | //| Bollinger_Bands_PercentB.mq5 |
//| Copyright 2025, xxxxxxxx| //| Copyright 2026, xxxxxxxx|
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
#property copyright "Copyright 2025, xxxxxxxx" #property copyright "Copyright 2026, xxxxxxxx"
#property version "1.10" // Optimized for incremental calculation #property version "2.00" // Updated to use new Calculator with ENUM_MA_TYPE
#property description "Bollinger Bands %B. Shows the position of price relative to the bands." #property description "Bollinger Bands %B. Shows the position of price relative to the bands."
#property description "Includes a selectable price source with Heikin Ashi options." #property description "Includes extended MA types and Heikin Ashi options."
#property indicator_separate_window #property indicator_separate_window
#property indicator_buffers 1 #property indicator_buffers 1
@@ -25,9 +25,9 @@
#property indicator_width1 1 #property indicator_width1 1
//--- Input Parameters --- //--- Input Parameters ---
input int InpPeriod = 20; input int InpPeriod = 20;
input double InpDeviation = 2.0; input double InpDeviation = 2.0;
input ENUM_MA_METHOD InpMethodMA = MODE_SMA; input ENUM_MA_TYPE InpMAType = SMA; // Updated type
input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_CLOSE_STD; input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_CLOSE_STD;
//--- Indicator Buffers --- //--- Indicator Buffers ---
@@ -44,13 +44,14 @@ double BufferPrice_Internal[]; // To store the price from calculator
CBollingerBandsCalculator *g_calculator; CBollingerBandsCalculator *g_calculator;
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| Custom indicator initialization function. | //| OnInit |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
int OnInit() int OnInit()
{ {
SetIndexBuffer(0, BufferPercentB, INDICATOR_DATA); SetIndexBuffer(0, BufferPercentB, INDICATOR_DATA);
ArraySetAsSeries(BufferPercentB, false); ArraySetAsSeries(BufferPercentB, false);
//--- Factory Logic
if(InpSourcePrice <= PRICE_HA_CLOSE) if(InpSourcePrice <= PRICE_HA_CLOSE)
{ {
g_calculator = new CBollingerBandsCalculator_HA(); g_calculator = new CBollingerBandsCalculator_HA();
@@ -62,8 +63,9 @@ int OnInit()
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("%%B(%d, %.2f)", InpPeriod, InpDeviation)); IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("%%B(%d, %.2f)", InpPeriod, InpDeviation));
} }
//--- Initialize with new Enum
if(CheckPointer(g_calculator) == POINTER_INVALID || if(CheckPointer(g_calculator) == POINTER_INVALID ||
!g_calculator.Init(InpPeriod, InpDeviation, InpMethodMA)) !g_calculator.Init(InpPeriod, InpDeviation, InpMAType))
{ {
Print("Failed to initialize Bollinger Bands Calculator."); Print("Failed to initialize Bollinger Bands Calculator.");
return(INIT_FAILED); return(INIT_FAILED);
@@ -76,7 +78,7 @@ int OnInit()
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| Custom indicator deinitialization function. | //| OnDeinit |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
void OnDeinit(const int reason) void OnDeinit(const int reason)
{ {
@@ -90,7 +92,7 @@ void OnDeinit(const int reason)
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| Custom indicator iteration function. | //| OnCalculate |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
int OnCalculate(const int rates_total, const int prev_calculated, const datetime&[], const double &open[], const double &high[], const double &low[], const double &close[], const long&[], const long&[], const int&[]) int OnCalculate(const int rates_total, const int prev_calculated, const datetime&[], const double &open[], const double &high[], const double &low[], const double &close[], const long&[], const long&[], const int&[])
{ {
@@ -105,18 +107,15 @@ int OnCalculate(const int rates_total, const int prev_calculated, const datetime
ArrayResize(BufferMA_Internal, rates_total); ArrayResize(BufferMA_Internal, rates_total);
} }
ENUM_APPLIED_PRICE price_type; ENUM_APPLIED_PRICE price_type = (InpSourcePrice <= PRICE_HA_CLOSE) ?
if(InpSourcePrice <= PRICE_HA_CLOSE) (ENUM_APPLIED_PRICE)(-(int)InpSourcePrice) :
price_type = (ENUM_APPLIED_PRICE)(-(int)InpSourcePrice); (ENUM_APPLIED_PRICE)InpSourcePrice;
else
price_type = (ENUM_APPLIED_PRICE)InpSourcePrice;
//--- Step 1: Run the main calculation (Incremental) //--- Step 1: Run the main calculation (Incremental)
g_calculator.Calculate(rates_total, prev_calculated, price_type, open, high, low, close, g_calculator.Calculate(rates_total, prev_calculated, price_type, open, high, low, close,
BufferMA_Internal, BufferUpper_Internal, BufferLower_Internal); BufferMA_Internal, BufferUpper_Internal, BufferLower_Internal);
//--- Step 2: Get the source price array from the calculator //--- Step 2: Get the source price array from the calculator
// This is already calculated incrementally inside the calculator
g_calculator.GetPriceBuffer(BufferPrice_Internal); g_calculator.GetPriceBuffer(BufferPrice_Internal);
//--- Step 3: Calculate the final %B value (Optimized Loop) //--- Step 3: Calculate the final %B value (Optimized Loop)
@@ -141,4 +140,3 @@ int OnCalculate(const int rates_total, const int prev_calculated, const datetime
return(rates_total); return(rates_total);
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//+------------------------------------------------------------------+