Merge pull request #1 from EA31337/v2.000-dev

Initial implementation of Oscillator strategy
EA31337 · Aug 28, 2023 · cf895d8 · cf895d8
2 parents 25259f4 + 5d289d7
commit cf895d8
Show file tree

Hide file tree

Showing 8 changed files with 240 additions and 127 deletions.
diff --git a/.github/workflows/backtest.yml b/.github/workflows/backtest.yml
@@ -39,14 +39,14 @@ jobs:
           include: .
           init-platform: true
           mt-version: 5.0.0.2361
-          path: Stg_Demo.mq4
+          path: Stg_Oscillator.mq4
           verbose: true
       - name: Compile for MQL5
         uses: fx31337/mql-compile-action@master
         with:
           include: .
           mt-version: 5.0.0.2515
-          path: Stg_Demo.mq5
+          path: Stg_Oscillator.mq5
           verbose: true
       - name: List compiled files
         run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
@@ -77,7 +77,7 @@ jobs:
           OptFormatBrief: true
           OptFormatJson: true
           OptVerbose: true
-          TestExpert: "Stg_Demo"
+          TestExpert: "Stg_Oscillator"
           TestPeriod: M1
           TestReportName: Report-${{ matrix.year }}-${{ matrix.month }}
       - name: Upload results

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -37,14 +37,14 @@ jobs:
           include: .
           init-platform: true
           mt-version: 5.0.0.2361
-          path: Stg_Demo.mq4
+          path: Stg_Oscillator.mq4
           verbose: true
       - name: Compile for MQL5
         uses: fx31337/mql-compile-action@master
         with:
           include: .
           mt-version: 5.0.0.2515
-          path: Stg_Demo.mq5
+          path: Stg_Oscillator.mq5
           verbose: true
       - name: List compiled files
         run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Strategy Demo
+# Strategy Oscillator
 
 [![Status][gha-image-check-master]][gha-link-check-master]
 [![Status][gha-image-compile-master]][gha-link-compile-master]
@@ -8,35 +8,29 @@
 [![Twitter][twitter-image]][twitter-link]
 [![Edit][gh-edit-badge]][gh-edit-link]
 
-Strategy based on the Demo indicator.
-
 ## Description
 
-This is example demo strategy for the demonstration purposes.
+Strategy based on selected oscillator-type single-valued indicators.
 
 ## Dependencies
 
 | Tag      | Framework |
 |:--------:|:---------:|
-| v1.000   | v2.000    |
-| v1.001   | v2.001    |
-| ...      | ...       |
-| v1.012   | v2.012    |
-| v1.013   | v2.013    |
 | v2.000   | v3.000.1  |
+| v2.001   | v3.001.1  |
 
 <!-- Named links -->
 
 [gh-discuss-badge]: https://img.shields.io/badge/Discussions-Q&A-blue.svg?logo=github
 [gh-discuss-link]: https://github.com/EA31337/EA31337-Strategies/discussions
 
 [gh-edit-badge]: https://img.shields.io/badge/GitHub-edit-purple.svg?logo=github
-[gh-edit-link]: https://github.dev/EA31337/Strategy-Demo
+[gh-edit-link]: https://github.dev/EA31337/Strategy-Oscillator
 
-[gha-link-check-master]: https://github.com/EA31337/Strategy-Demo/actions?query=workflow:Check+branch%3Amaster
-[gha-image-check-master]: https://github.com/EA31337/Strategy-Demo/workflows/Check/badge.svg?branch=master
-[gha-link-compile-master]: https://github.com/EA31337/Strategy-Demo/actions?query=workflow:Compile+branch%3Amaster
-[gha-image-compile-master]: https://github.com/EA31337/Strategy-Demo/workflows/Compile/badge.svg?branch=master
+[gha-link-check-master]: https://github.com/EA31337/Strategy-Oscillator/actions?query=workflow:Check+branch%3Amaster
+[gha-image-check-master]: https://github.com/EA31337/Strategy-Oscillator/workflows/Check/badge.svg?branch=master
+[gha-link-compile-master]: https://github.com/EA31337/Strategy-Oscillator/actions?query=workflow:Compile+branch%3Amaster
+[gha-image-compile-master]: https://github.com/EA31337/Strategy-Oscillator/workflows/Compile/badge.svg?branch=master
 
 [license-image]: https://img.shields.io/github/license/EA31337/EA31337-Strategies.svg
 [license-link]: https://tldrlegal.com/license/gnu-general-public-license-v3-(gpl-3)

diff --git a/Stg_Demo.mqh b/Stg_Demo.mqh
diff --git a/Stg_Demo.mq4 → Stg_Oscillator.mq4 b/Stg_Demo.mq4 → Stg_Oscillator.mq4
@@ -6,8 +6,8 @@
 
 /**
  * @file
- * Implements Demo strategy.
+ * Implements Oscillator strategy.
  */
 
 // Includes the main code.
-#include "Stg_Demo.mq5"
+#include "Stg_Oscillator.mq5"
diff --git a/Stg_Demo.mq5 → Stg_Oscillator.mq5 b/Stg_Demo.mq5 → Stg_Oscillator.mq5
@@ -1,14 +1,19 @@
 /**
  * @file
- * Implements Demo strategy.
+ * Implements Oscillator strategy.
  */
 
 // Includes conditional compilation directives.
 #include "config/define.h"
 
 // Includes EA31337 framework.
 #include <EA31337-classes/EA.mqh>
-#include <EA31337-classes/Indicators/Indi_Demo.mqh>
+#include <EA31337-classes/Indicators/Indi_AC.mqh>
+#include <EA31337-classes/Indicators/Indi_AD.mqh>
+#include <EA31337-classes/Indicators/Indi_RSI.mqh>
+#include <EA31337-classes/Indicators/Indi_Stochastic.mqh>
+#include <EA31337-classes/Indicators/Indi_WPR.mqh>
+// #include <EA31337-classes/Indicators/Oscillator/includes.h>
 #include <EA31337-classes/Strategy.mqh>
 
 // Inputs.
@@ -18,13 +23,13 @@ input ENUM_LOG_LEVEL Log_Level = V_INFO;  // Log level.
 input bool Info_On_Chart = true;          // Display info on chart.
 
 // Includes strategy.
-#include "Stg_Demo.mqh"
+#include "Stg_Oscillator.mqh"
 
 // Defines.
-#define ea_name "Strategy Demo"
+#define ea_name "Strategy Oscillator"
 #define ea_version "2.000"
 #define ea_desc "Strategy based on EA31337 framework."
-#define ea_link "https://github.com/EA31337/Strategy-Demo"
+#define ea_link "https://github.com/EA31337/Strategy-Oscillator"
 #define ea_author "EA31337 Ltd"
 
 // Properties.
@@ -50,7 +55,7 @@ int OnInit() {
   bool _result = true;
   EAParams ea_params(__FILE__, Log_Level);
   ea = new EA(ea_params);
-  _result &= ea.StrategyAdd<Stg_Demo>(Active_Tfs);
+  _result &= ea.StrategyAdd<Stg_Oscillator>(Active_Tfs);
   return (_result ? INIT_SUCCEEDED : INIT_FAILED);
 }