Merge pull request #1 from EA31337/dev

Implements Oscillator Martingale strategy logic
EA31337 · Oct 23, 2023 · 6c59d2b · 6c59d2b
2 parents e50cf89 + 3e35669
commit 6c59d2b
Show file tree

Hide file tree

Showing 7 changed files with 710 additions and 597 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_Oscillator.mq4
+          path: Stg_Oscillator_Martingale.mq4
           verbose: true
       - name: Compile for MQL5
         uses: fx31337/mql-compile-action@master
         with:
           include: .
           mt-version: 5.0.0.2515
-          path: Stg_Oscillator.mq5
+          path: Stg_Oscillator_Martingale.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_Oscillator"
+          TestExpert: "Stg_Oscillator_Martingale"
           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_Oscillator.mq4
+          path: Stg_Oscillator_Martingale.mq4
           verbose: true
       - name: Compile for MQL5
         uses: fx31337/mql-compile-action@master
         with:
           include: .
           mt-version: 5.0.0.2515
-          path: Stg_Oscillator.mq5
+          path: Stg_Oscillator_Martingale.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 Oscillator
+# Strategy Oscillator Martingale
 
 [![Status][gha-image-check-master]][gha-link-check-master]
 [![Status][gha-image-compile-master]][gha-link-compile-master]
@@ -10,7 +10,8 @@
 
 ## Description
 
-Strategy based on selected oscillator-type single-valued indicators.
+Strategy based on oscillator-type single-valued indicators
+with martingale order management.
 
 ## Dependencies
 
@@ -25,12 +26,12 @@ Strategy based on selected oscillator-type single-valued indicators.
 [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-Oscillator
+[gh-edit-link]: https://github.dev/EA31337/Strategy-Oscillator_Martingale
 
-[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
+[gha-link-check-master]: https://github.com/EA31337/Strategy-Oscillator_Martingale/actions?query=workflow:Check+branch%3Amaster
+[gha-image-check-master]: https://github.com/EA31337/Strategy-Oscillator_Martingale/workflows/Check/badge.svg?branch=master
+[gha-link-compile-master]: https://github.com/EA31337/Strategy-Oscillator_Martingale/actions?query=workflow:Compile+branch%3Amaster
+[gha-image-compile-master]: https://github.com/EA31337/Strategy-Oscillator_Martingale/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)