Skip to content

Commit

Permalink
Merge pull request #1 from EA31337/v2.000-dev
Browse files Browse the repository at this point in the history
Implements Meta RSI strategy logic
  • Loading branch information
kenorb authored Sep 27, 2023
2 parents f238ef2 + 0f93b24 commit 8498b1b
Show file tree
Hide file tree
Showing 7 changed files with 355 additions and 360 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/backtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ jobs:
include: .
init-platform: true
mt-version: 5.0.0.2361
path: Stg_Meta_Trend.mq4
path: Stg_Meta_RSI.mq4
verbose: true
- name: Compile for MQL5
uses: fx31337/mql-compile-action@master
with:
include: .
mt-version: 5.0.0.2515
path: Stg_Meta_Trend.mq5
path: Stg_Meta_RSI.mq5
verbose: true
- name: List compiled files
run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
OptFormatBrief: true
OptFormatJson: true
OptVerbose: true
TestExpert: "Stg_Meta_Trend"
TestExpert: "Stg_Meta_RSI"
TestPeriod: M1
TestReportName: Report-${{ matrix.year }}-${{ matrix.month }}
- name: Upload results
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ jobs:
include: .
init-platform: true
mt-version: 5.0.0.2361
path: Stg_Meta_Trend.mq4
path: Stg_Meta_RSI.mq4
verbose: true
- name: Compile for MQL5
uses: fx31337/mql-compile-action@master
with:
include: .
mt-version: 5.0.0.2515
path: Stg_Meta_Trend.mq5
path: Stg_Meta_RSI.mq5
verbose: true
- name: List compiled files
run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Strategy Meta Trend
# Strategy Meta RSI

[![Status][gha-image-check-master]][gha-link-check-master]
[![Status][gha-image-compile-master]][gha-link-compile-master]
Expand All @@ -7,8 +7,8 @@
[![License][license-image]][license-link]
[![Edit][gh-edit-badge]][gh-edit-link]

Trend meta strategy to filter out
signals of other strategies based on the current trend.
RSI meta strategy to trade with different strategies
based on the current daily RSI value.

## Dependencies

Expand All @@ -22,12 +22,12 @@ signals of other strategies based on the current trend.
[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-Meta_Trend
[gh-edit-link]: https://github.dev/EA31337/Strategy-Meta_RSI

[gha-link-check-master]: https://github.com/EA31337/Strategy-Meta_Trend/actions?query=workflow:Check+branch%3Amaster
[gha-image-check-master]: https://github.com/EA31337/Strategy-Meta_Trend/workflows/Check/badge.svg?branch=master
[gha-link-compile-master]: https://github.com/EA31337/Strategy-Meta_Trend/actions?query=workflow:Compile+branch%3Amaster
[gha-image-compile-master]: https://github.com/EA31337/Strategy-Meta_Trend/workflows/Compile/badge.svg?branch=master
[gha-link-check-master]: https://github.com/EA31337/Strategy-Meta_RSI/actions?query=workflow:Check+branch%3Amaster
[gha-image-check-master]: https://github.com/EA31337/Strategy-Meta_RSI/workflows/Check/badge.svg?branch=master
[gha-link-compile-master]: https://github.com/EA31337/Strategy-Meta_RSI/actions?query=workflow:Compile+branch%3Amaster
[gha-image-compile-master]: https://github.com/EA31337/Strategy-Meta_RSI/workflows/Compile/badge.svg?branch=master

[tg-channel-image]: https://img.shields.io/badge/Telegram-join-0088CC.svg?logo=telegram
[tg-channel-link]: https://t.me/EA31337
Expand Down
4 changes: 2 additions & 2 deletions Stg_Meta_Trend.mq4 → Stg_Meta_RSI.mq4
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

/**
* @file
* Implements Trend meta strategy.
* Implements RSI meta strategy.
*/

// Includes the main code.
#include "Stg_Meta_Trend.mq5"
#include "Stg_Meta_RSI.mq5"
12 changes: 6 additions & 6 deletions Stg_Meta_Trend.mq5 → Stg_Meta_RSI.mq5
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @file
* Implements Trend meta strategy.
* Implements RSI meta strategy.
*/

// Includes conditional compilation directives.
Expand Down Expand Up @@ -32,13 +32,13 @@ input ENUM_LOG_LEVEL Log_Level = V_INFO; // Log level.
input bool Info_On_Chart = true; // Display info on chart.

// Includes strategy class.
#include "Stg_Meta_Trend.mqh"
#include "Stg_Meta_RSI.mqh"

// Defines.
#define ea_name "Strategy Meta Trend"
#define ea_name "Strategy Meta RSI"
#define ea_version "2.000"
#define ea_desc "Trend meta strategy to filter out signals of other strategies based on the current trend."
#define ea_link "https://github.com/EA31337/Strategy-Meta_Trend"
#define ea_desc "RSI meta strategy to trade with different strategies based on the current daily RSI value."
#define ea_link "https://github.com/EA31337/Strategy-Meta_RSI"
#define ea_author "EA31337 Ltd"

// Properties.
Expand All @@ -64,7 +64,7 @@ int OnInit() {
bool _result = true;
EAParams ea_params(__FILE__, Log_Level);
ea = new EA(ea_params);
_result &= ea.StrategyAdd<Stg_Meta_Trend>(Active_Tfs);
_result &= ea.StrategyAdd<Stg_Meta_RSI>(Active_Tfs);
return (_result ? INIT_SUCCEEDED : INIT_FAILED);
}

Expand Down
Loading

0 comments on commit 8498b1b

Please sign in to comment.