Merge pull request #1 from EA31337/dev

Implements initial strategy trading logic
EA31337 · Sep 2, 2023 · f01bf6d · f01bf6d
2 parents 42092cd + d540f86
commit f01bf6d
Show file tree

Hide file tree

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

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

diff --git a/Stg_Oscillator_Cross.mqh b/Stg_Oscillator_Cross.mqh
diff --git a/Stg_Oscillator_Cross.mq4 → Stg_Oscillator_Cross_Zero.mq4 b/Stg_Oscillator_Cross.mq4 → Stg_Oscillator_Cross_Zero.mq4
@@ -6,8 +6,8 @@
 
 /**
  * @file
- * Implements Oscillator Cross strategy.
+ * Implements Oscillator Cross Zero strategy.
  */
 
 // Includes the main code.
-#include "Stg_Oscillator_Cross.mq5"
+#include "Stg_Oscillator_Cross_Zero.mq5"
diff --git a/Stg_Oscillator_Cross.mq5 → Stg_Oscillator_Cross_Zero.mq5 b/Stg_Oscillator_Cross.mq5 → Stg_Oscillator_Cross_Zero.mq5
@@ -1,6 +1,6 @@
 /**
  * @file
- * Implements Oscillator Cross strategy.
+ * Implements Oscillator Cross Zero strategy.
  */
 
 // Includes conditional compilation directives.
@@ -23,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_Oscillator_Cross.mqh"
+#include "Stg_Oscillator_Cross_Zero.mqh"
 
 // Defines.
-#define ea_name "Strategy Oscillator_Cross"
+#define ea_name "Strategy Oscillator Cross Zero"
 #define ea_version "2.000"
-#define ea_desc "Strategy based on EA31337 framework."
-#define ea_link "https://github.com/EA31337/Strategy-Oscillator_Cross"
+#define ea_desc "Strategy based on selected oscillator-type zero-crossable indicators."
+#define ea_link "https://github.com/EA31337/Strategy-Oscillator_Cross_Zero"
 #define ea_author "EA31337 Ltd"
 
 // Properties.
@@ -55,7 +55,7 @@ int OnInit() {
   bool _result = true;
   EAParams ea_params(__FILE__, Log_Level);
   ea = new EA(ea_params);
-  _result &= ea.StrategyAdd<Stg_Oscillator_Cross>(Active_Tfs);
+  _result &= ea.StrategyAdd<Stg_Oscillator_Cross_Zero>(Active_Tfs);
   return (_result ? INIT_SUCCEEDED : INIT_FAILED);
 }