Indicators refactor (part 3)

.github/workflows/test-indicators-special.yml

@@ -0,0 +1,65 @@
+---
+name: Test Indicators (Special)
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request:
+    paths:
+      - 'Indicator**'
+      - 'Indicators/Special/**'
+      - '.github/workflows/test-indicators-special.yml'
+  push:
+    paths:
+      - 'Indicator**'
+      - 'Indicators/Special/**'
+      - '.github/workflows/test-indicators-special.yml'
+
+jobs:
+
+  Compile:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Compile
+        uses: fx31337/mql-compile-action@master
+        with:
+          init-platform: true
+          path: 'Indicators/Special/tests'
+          verbose: true
+      - name: Print compiled files
+        run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
+        shell: powershell
+      - name: Upload artifacts (MQL4)
+        uses: actions/upload-artifact@v2
+        with:
+          name: files-ex4
+          path: '**/*.ex4'
+      - name: Upload artifacts (MQL5)
+        uses: actions/upload-artifact@v2
+        with:
+          name: files-ex5
+          path: '**/*.ex5'
+
+  Indicators-Tests-MQL4:
+    defaults:
+      run:
+        shell: bash
+        working-directory: Indicators/tests
+    needs: Compile
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test:
+          - Indi_Custom.test
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: files-ex4
+      - name: Run ${{ matrix.test }}
+        uses: fx31337/mql-tester-action@master
+        with:
+          BtDays: 4-8
+          BtMonths: 1
+          BtYears: 2020
+          TestExpert: ${{ matrix.test }}
+    timeout-minutes: 10

.github/workflows/test-tick.yml

@@ -0,0 +1,58 @@
+---
+name: Test Tick
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request:
+    paths:
+      - 'Tick/**.h'
+      - '.github/workflows/test-tick.yml'
+  push:
+    paths:
+      - 'Tick/**.h'
+      - '.github/workflows/test-tick.yml'
+
+jobs:
+
+  Compile:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Compile
+        uses: fx31337/mql-compile-action@master
+        with:
+          path: 'Tick/tests'
+          verbose: true
+      - name: Print compiled files
+        run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
+        shell: powershell
+      - name: Upload artifacts (MQL4)
+        uses: actions/upload-artifact@v2
+        with:
+          name: files-ex4
+          path: '**/*.ex4'
+      - name: Upload artifacts (MQL5)
+        uses: actions/upload-artifact@v2
+        with:
+          name: files-ex5
+          path: '**/*.ex5'
+
+  Tick-Tests-MQL4:
+    defaults:
+      run:
+        shell: bash
+        working-directory: Tick/tests
+    needs: Compile
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test:
+          - TickManager.test
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: files-ex4
+      - name: Run ${{ matrix.test }}
+        uses: fx31337/mql-tester-action@master
+        with:
+          Script: ${{ matrix.test }}

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Compile
         uses: fx31337/mql-compile-action@master
         with:
-          init-platform: true
+          mt-version: 4.0.0.1349
           verbose: true
       - name: Print compiled files
         run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
@@ -89,6 +89,7 @@ jobs:
           BtDays: 1-8
           BtMonths: 1
           BtYears: 2020
+          MtVersion: 4.0.0.1349
           TestExpert: ${{ matrix.test }}
     timeout-minutes: 10
 

Action.mqh

@@ -303,6 +303,7 @@ class Action {
    *   Returns true when the condition is met.
    */
   bool CheckCondition(ENUM_ACTION_CONDITION _cond, DataParamEntry &_args[]) {
+    bool _result = false;
     switch (_cond) {
       case ACTION_COND_IS_ACTIVE:
         // Is active;
@@ -321,8 +322,9 @@ class Action {
         return IsInvalid();
       default:
         logger.Ptr().Error(StringFormat("Invalid Action condition: %s!", EnumToString(_cond), __FUNCTION_LINE__));
-        return false;
+        break;
     }
+    return _result;
   }
   bool CheckCondition(ENUM_ACTION_CONDITION _cond) {
     ARRAY(DataParamEntry, _args);
@@ -338,7 +340,7 @@ class Action {
    *   Returns true when the action has been executed successfully.
    */
   bool ExecuteAction(ENUM_ACTION_ACTION _action, DataParamEntry &_args[]) {
-    bool _result = true;
+    bool _result = false;
     switch (_action) {
       case ACTION_ACTION_DISABLE:
         // Disable action.
@@ -360,7 +362,7 @@ class Action {
         return SetFlags(ACTION_ENTRY_FLAG_IS_INVALID);
       default:
         logger.Ptr().Error(StringFormat("Invalid action of action: %s!", EnumToString(_action), __FUNCTION_LINE__));
-        return false;
+        break;
     }
     return _result;
   }

Buffer/BufferTick.h

@@ -26,14 +26,52 @@
 
 // Includes.
 #include "../BufferStruct.mqh"
+#include "../Chart.enum.h"
+#include "../Storage/IValueStorage.h"
 #include "../Tick.struct.h"
 
+template <typename TV>
+class BufferTickValueStorage : ValueStorage<TV> {
+  // Poiner to buffer to take tick from.
+  BufferTick<TV> *buffer_tick;
+
+  // PRICE_ASK or PRICE_BID.
+  int applied_price;
+
+ public:
+  /**
+   * Constructor.
+   */
+  BufferTickValueStorage(BufferTick<TV> *_buffer_tick, int _applied_price)
+      : buffer_tick(_buffer_tick), applied_price(_applied_price) {}
+
+  /**
+   * Fetches value from a given shift. Takes into consideration as-series flag.
+   */
+  TV Fetch(int _shift) override {
+    Print("BufferTickValueStorage: Fetching " + (applied_price == PRICE_ASK ? "Ask" : "Bid") + " price from shift ",
+          _shift);
+    return 0;
+  }
+
+  /**
+   * Returns number of values available to fetch (size of the values buffer).
+   */
+  int Size() const override { return (int)buffer_tick.Size(); }
+};
+
 /**
  * Class to store struct data.
  */
 template <typename TV>
 class BufferTick : public BufferStruct<TickAB<TV>> {
  protected:
+  // Ask prices ValueStorage proxy.
+  BufferTickValueStorage<TV> *_vs_ask;
+
+  // Bid prices ValueStorage proxy.
+  BufferTickValueStorage<TV> *_vs_bid;
+
  protected:
   /* Protected methods */
 
@@ -42,7 +80,11 @@ class BufferTick : public BufferStruct<TickAB<TV>> {
    *
    * Called on constructor.
    */
-  void Init() { SetOverflowListener(BufferTickOverflowListener, 10); }
+  void Init() {
+    _vs_ask = NULL;
+    _vs_bid = NULL;
+    SetOverflowListener(BufferTickOverflowListener, 10);
+  }
 
  public:
   /* Constructors */
@@ -51,11 +93,43 @@ class BufferTick : public BufferStruct<TickAB<TV>> {
    * Constructor.
    */
   BufferTick() { Init(); }
-  BufferTick(BufferTick& _right) {
+  BufferTick(BufferTick &_right) {
     THIS_REF = _right;
     Init();
   }
 
+  /**
+   * Destructor.
+   */
+  ~BufferTick() {
+    if (_vs_ask != NULL) {
+      delete _vs_ask;
+    }
+    if (_vs_bid != NULL) {
+      delete _vs_bid;
+    }
+  }
+
+  /**
+   * Returns Ask prices ValueStorage proxy.
+   */
+  BufferTickValueStorage<TV> *GetAskValueStorage() {
+    if (_vs_ask == NULL) {
+      _vs_ask = new BufferTickValueStorage<TV>(THIS_PTR, PRICE_ASK);
+    }
+    return _vs_ask;
+  }
+
+  /**
+   * Returns Bid prices ValueStorage proxy.
+   */
+  BufferTickValueStorage<TV> *GetBidValueStorage() {
+    if (_vs_bid == NULL) {
+      _vs_bid = new BufferTickValueStorage<TV>(THIS_PTR, PRICE_BID);
+    }
+    return _vs_bid;
+  }
+
   /* Grouping methods */
 
   /**

Chart.enum.h

@@ -43,9 +43,14 @@ enum ENUM_APPLIED_PRICE {
   PRICE_MEDIAN,     // Median price (H+L)/2
   PRICE_TYPICAL,    // Typical price, (H+L+C)/3
   PRICE_WEIGHTED,   // Weighted close price (H+L+C+C)/4
+  FINAL_APPLIED_PRICE_ENTRY
 };
 #endif
 
+// Additional modes for applied price.
+#define PRICE_ASK ((ENUM_APPLIED_PRICE)128)
+#define PRICE_BID ((ENUM_APPLIED_PRICE)129)
+
 // Defines enumeration for chart parameters.
 enum ENUM_CHART_PARAM {
   CHART_PARAM_NONE = 0,  // None

Chart.mqh

@@ -224,7 +224,7 @@ class Chart : public Market {
    * @return
    *   Returns ChartEntry struct.
    */
-  ChartEntry GetEntry(unsigned int _shift = 0) {
+  ChartEntry GetEntry(int _shift = 0) {
     ChartEntry _chart_entry;
     BarOHLC _ohlc = GetOHLC(_shift);
     if (_ohlc.open > 0) {

Dict.mqh

@@ -205,24 +205,30 @@ class Dict : public DictBase<K, V> {
    * Inserts value into given array of DictSlots.
    */
   bool InsertInto(DictSlotsRef<K, V>& dictSlotsRef, const K key, V value, bool allow_resize) {
-    // Will resize dict if there were performance problems before.
-    if (allow_resize && !dictSlotsRef.IsPerformant()) {
-      if (!GrowUp()) {
-        return false;
-      }
-    }
-
     if (_mode == DictModeUnknown)
       _mode = DictModeDict;
     else if (_mode != DictModeDict) {
       Alert("Warning: Dict already operates as a list, not a dictionary!");
-      DebugBreak();
       return false;
     }
 
     unsigned int position;
     DictSlot<K, V>* keySlot = GetSlotByKey(dictSlotsRef, key, position);
 
+    if (keySlot == NULL && !IsGrowUpAllowed()) {
+      // Resize is prohibited.
+      return false;
+    }
+
+    // Will resize dict if there were performance problems before.
+    if (allow_resize && IsGrowUpAllowed() && !dictSlotsRef.IsPerformant()) {
+      if (!GrowUp()) {
+        return false;
+      }
+      // We now have new positions of slots, so we have to take the corrent slot again.
+      keySlot = GetSlotByKey(dictSlotsRef, key, position);
+    }
+
     if (keySlot == NULL && dictSlotsRef._num_used == ArraySize(dictSlotsRef.DictSlots)) {
       // No DictSlotsRef.DictSlots available.
       if (overflow_listener != NULL) {

DictBase.mqh

@@ -257,6 +257,18 @@ class DictBase {
     // No key found.
   }
 
+  /**
+   * Checks whether overflow listener allows dict to grow up.
+   */
+  bool IsGrowUpAllowed() {
+    if (overflow_listener == NULL) {
+      return true;
+    }
+
+    // Checking if overflow listener allows resize from current to higher number of slots.
+    return overflow_listener(DICT_OVERFLOW_REASON_FULL, Size(), 0);
+  }
+
   /**
    * Moves last slot to given one to fill the hole after removing the value.
    */
@@ -280,6 +292,11 @@ class DictBase {
    */
   const unsigned int Size() { return _DictSlots_ref._num_used; }
 
+  /**
+   * Returns number of all (reserved) DictSlots.
+   */
+  const unsigned int ReservedSize() { return ArraySize(_DictSlots_ref.DictSlots); }
+
   /**
    * Checks whether given key exists in the dictionary.
    */