Skip to content

Commit

Permalink
Renames Multi to Cross
Browse files Browse the repository at this point in the history
  • Loading branch information
kenorb committed Aug 29, 2023
1 parent 552b240 commit 6117fcc
Show file tree
Hide file tree
Showing 6 changed files with 112 additions and 112 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/backtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ jobs:
include: .
init-platform: true
mt-version: 5.0.0.2361
path: Stg_Oscillator_Multi.mq4
path: Stg_Oscillator_Cross.mq4
verbose: true
- name: Compile for MQL5
uses: fx31337/mql-compile-action@master
with:
include: .
mt-version: 5.0.0.2515
path: Stg_Oscillator_Multi.mq5
path: Stg_Oscillator_Cross.mq5
verbose: true
- name: List compiled files
run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
OptFormatBrief: true
OptFormatJson: true
OptVerbose: true
TestExpert: "Stg_Oscillator_Multi"
TestExpert: "Stg_Oscillator_Cross"
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 @@ -39,14 +39,14 @@ jobs:
include: .
init-platform: true
mt-version: 5.0.0.2361
path: Stg_Oscillator_Multi.mq4
path: Stg_Oscillator_Cross.mq4
verbose: true
- name: Compile for MQL5
uses: fx31337/mql-compile-action@master
with:
include: .
mt-version: 5.0.0.2515
path: Stg_Oscillator_Multi.mq5
path: Stg_Oscillator_Cross.mq5
verbose: true
- name: List compiled files
run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Strategy Oscillator Multi
# Strategy Oscillator Cross

[![Status][gha-image-check-master]][gha-link-check-master]
[![Status][gha-image-compile-master]][gha-link-compile-master]
Expand All @@ -10,7 +10,7 @@

## Description

Strategy based on selected oscillator-type multi-valued indicators.
Strategy based on selected oscillator-type line-crossable cross-valued indicators.

## Dependencies

Expand All @@ -25,12 +25,12 @@ Strategy based on selected oscillator-type multi-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_Multi
[gh-edit-link]: https://github.dev/EA31337/Strategy-Oscillator_Cross

[gha-link-check-master]: https://github.com/EA31337/Strategy-Oscillator_Multi/actions?query=workflow:Check+branch%3Amaster
[gha-image-check-master]: https://github.com/EA31337/Strategy-Oscillator_Multi/workflows/Check/badge.svg?branch=master
[gha-link-compile-master]: https://github.com/EA31337/Strategy-Oscillator_Multi/actions?query=workflow:Compile+branch%3Amaster
[gha-image-compile-master]: https://github.com/EA31337/Strategy-Oscillator_Multi/workflows/Compile/badge.svg?branch=master
[gha-link-check-master]: https://github.com/EA31337/Strategy-Oscillator_Cross/actions?query=workflow:Check+branch%3Amaster
[gha-image-check-master]: https://github.com/EA31337/Strategy-Oscillator_Cross/workflows/Check/badge.svg?branch=master
[gha-link-compile-master]: https://github.com/EA31337/Strategy-Oscillator_Cross/actions?query=workflow:Compile+branch%3Amaster
[gha-image-compile-master]: https://github.com/EA31337/Strategy-Oscillator_Cross/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)
Expand Down
6 changes: 3 additions & 3 deletions Stg_Oscillator_Multi.mq4 → Stg_Oscillator_Cross.mq4
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
//+------------------------------------------------------------------+
//| EA31337 - multi-strategy advanced trading robot |
//| EA31337 - cross-strategy advanced trading robot |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

/**
* @file
* Implements Oscillator Multi strategy.
* Implements Oscillator Cross strategy.
*/

// Includes the main code.
#include "Stg_Oscillator_Multi.mq5"
#include "Stg_Oscillator_Cross.mq5"
12 changes: 6 additions & 6 deletions Stg_Oscillator_Multi.mq5 → Stg_Oscillator_Cross.mq5
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @file
* Implements Oscillator Multi strategy.
* Implements Oscillator Cross strategy.
*/

// Includes conditional compilation directives.
Expand All @@ -14,7 +14,7 @@
#include <EA31337-classes/Indicators/Indi_Gator.mqh>
#include <EA31337-classes/Indicators/Indi_MACD.mqh>
#include <EA31337-classes/Indicators/Indi_RVI.mqh>
// #include <EA31337-classes/Indicators/Oscillator_Multi/includes.h>
// #include <EA31337-classes/Indicators/Oscillators/includes.h>
#include <EA31337-classes/Strategy.mqh>

// Inputs.
Expand All @@ -24,13 +24,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_Oscillator_Multi.mqh"
#include "Stg_Oscillator_Cross.mqh"

// Defines.
#define ea_name "Strategy Oscillator_Multi"
#define ea_name "Strategy Oscillator_Cross"
#define ea_version "2.000"
#define ea_desc "Strategy based on EA31337 framework."
#define ea_link "https://github.com/EA31337/Strategy-Oscillator_Multi"
#define ea_link "https://github.com/EA31337/Strategy-Oscillator_Cross"
#define ea_author "EA31337 Ltd"

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

Expand Down
Loading

0 comments on commit 6117fcc

Please sign in to comment.