Periods -> Period, DataSource attribute

mihakralj · Nov 9, 2024 · 5bcdf8d · 5bcdf8d
1 parent 61a16bd
commit 5bcdf8d
Show file tree

Hide file tree

Showing 75 changed files with 378 additions and 1,061 deletions.
diff --git a/quantower/Averages/AfirmaIndicator.cs b/quantower/Averages/AfirmaIndicator.cs
@@ -8,8 +8,8 @@ public class AfirmaIndicator : Indicator, IWatchlistIndicator
     [InputParameter("Taps (number of weights)", sortIndex: 1, 1, 2000, 1, 0)]
     public int Taps { get; set; } = 6;
 
-    [InputParameter("Periods for lowpass cutoff", sortIndex: 2, 1, 2000, 1, 0)]
-    public int Periods { get; set; } = 6;
+    [InputParameter("Period for lowpass cutoff", sortIndex: 2, 1, 2000, 1, 0)]
+    public int Period { get; set; } = 6;
 
     [InputParameter("Window Type", sortIndex: 3, variants: [
         "Rectangular", Afirma.WindowType.Rectangular,
@@ -20,26 +20,15 @@ public class AfirmaIndicator : Indicator, IWatchlistIndicator
     ])]
     public Afirma.WindowType Window { get; set; } = Afirma.WindowType.Hanning1;
 
-    [InputParameter("Data source", sortIndex: 4, variants: [
-        "Open", SourceType.Open,
-            "High", SourceType.High,
-            "Low", SourceType.Low,
-            "Close", SourceType.Close,
-            "HL/2 (Median)", SourceType.HL2,
-            "OC/2 (Midpoint)", SourceType.OC2,
-            "OHL/3 (Mean)", SourceType.OHL3,
-            "HLC/3 (Typical)", SourceType.HLC3,
-            "OHLC/4 (Average)", SourceType.OHLC4,
-            "HLCC/4 (Weighted)", SourceType.HLCC4
-    ])]
+    [IndicatorExtensions.DataSourceInput]
     public SourceType Source { get; set; } = SourceType.Close;
 
     [InputParameter("Show cold values", sortIndex: 21)]
     public bool ShowColdValues { get; set; } = true;
     private Afirma? ma;
     protected LineSeries? Series;
     protected string? SourceName;
-    public int MinHistoryDepths => Periods + Taps;
+    public int MinHistoryDepths => Period + Taps;
     int IWatchlistIndicator.MinHistoryDepths => MinHistoryDepths;
 
     public AfirmaIndicator()
@@ -50,13 +39,13 @@ public AfirmaIndicator()
         Name = "AFIRMA - Adaptive Finite Impulse Response Moving Average";
         Description = "Adaptive Finite Impulse Response Moving Average with ARMA component";
 
-        Series = new(name: $"AFIRMA {Taps}:{Periods}:{Window}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
+        Series = new(name: $"AFIRMA {Taps}:{Period}:{Window}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
         AddLineSeries(Series);
     }
 
     protected override void OnInit()
     {
-        ma = new Afirma(periods: Periods, taps: Taps, window: Window);
+        ma = new Afirma(periods: Period, taps: Taps, window: Window);
         SourceName = Source.ToString();
         base.OnInit();
     }
@@ -70,7 +59,7 @@ protected override void OnUpdate(UpdateArgs args)
         Series!.SetValue(result.Value);
     }
 
-    public override string ShortName => $"AFIRMA {Taps}:{Periods}:{Window}:{SourceName}";
+    public override string ShortName => $"AFIRMA {Taps}:{Period}:{Window}:{SourceName}";
 
     public override void OnPaintChart(PaintChartEventArgs args)
     {

diff --git a/quantower/Averages/AlmaIndicator.cs b/quantower/Averages/AlmaIndicator.cs
@@ -14,18 +14,7 @@ public class AlmaIndicator : Indicator, IWatchlistIndicator
     [InputParameter("Sigma", sortIndex: 3, minimum: 0, maximum: 100, decimalPlaces: 1)]
     public double Sigma { get; set; } = 6.0;
 
-    [InputParameter("Data source", sortIndex: 4, variants: [
-        "Open", SourceType.Open,
-            "High", SourceType.High,
-            "Low", SourceType.Low,
-            "Close", SourceType.Close,
-            "HL/2 (Median)", SourceType.HL2,
-            "OC/2 (Midpoint)", SourceType.OC2,
-            "OHL/3 (Mean)", SourceType.OHL3,
-            "HLC/3 (Typical)", SourceType.HLC3,
-            "OHLC/4 (Average)", SourceType.OHLC4,
-            "HLCC/4 (Weighted)", SourceType.HLCC4
-    ])]
+    [IndicatorExtensions.DataSourceInput]
     public SourceType Source { get; set; } = SourceType.Close;
 
     [InputParameter("Show cold values", sortIndex: 21)]

diff --git a/quantower/Averages/DemaIndicator.cs b/quantower/Averages/DemaIndicator.cs
@@ -8,18 +8,7 @@ public class DemaIndicator : Indicator, IWatchlistIndicator
     [InputParameter("Period", sortIndex: 1, 1, 2000, 1, 0)]
     public int Period { get; set; } = 10;
 
-    [InputParameter("Data source", sortIndex: 2, variants: [
-        "Open", SourceType.Open,
-            "High", SourceType.High,
-            "Low", SourceType.Low,
-            "Close", SourceType.Close,
-            "HL/2 (Median)", SourceType.HL2,
-            "OC/2 (Midpoint)", SourceType.OC2,
-            "OHL/3 (Mean)", SourceType.OHL3,
-            "HLC/3 (Typical)", SourceType.HLC3,
-            "OHLC/4 (Average)", SourceType.OHLC4,
-            "HLCC/4 (Weighted)", SourceType.HLCC4
-    ])]
+    [IndicatorExtensions.DataSourceInput]
     public SourceType Source { get; set; } = SourceType.Close;
 
     [InputParameter("Show cold values", sortIndex: 21)]

diff --git a/quantower/Averages/DsmaIndicator.cs b/quantower/Averages/DsmaIndicator.cs
@@ -11,18 +11,7 @@ public class DsmaIndicator : Indicator, IWatchlistIndicator
     [InputParameter("Scale factor", sortIndex: 2, minimum: 0.01, maximum: 1.0, increment: 0.01, decimalPlaces: 2)]
     public double Scale { get; set; } = 0.5;
 
-    [InputParameter("Data source", sortIndex: 3, variants: [
-        "Open", SourceType.Open,
-            "High", SourceType.High,
-            "Low", SourceType.Low,
-            "Close", SourceType.Close,
-            "HL/2 (Median)", SourceType.HL2,
-            "OC/2 (Midpoint)", SourceType.OC2,
-            "OHL/3 (Mean)", SourceType.OHL3,
-            "HLC/3 (Typical)", SourceType.HLC3,
-            "OHLC/4 (Average)", SourceType.OHLC4,
-            "HLCC/4 (Weighted)", SourceType.HLCC4
-    ])]
+    [IndicatorExtensions.DataSourceInput]
     public SourceType Source { get; set; } = SourceType.Close;
 
     [InputParameter("Show cold values", sortIndex: 21)]

diff --git a/quantower/Averages/DwmaIndicator.cs b/quantower/Averages/DwmaIndicator.cs
@@ -8,18 +8,7 @@ public class DwmaIndicator : Indicator, IWatchlistIndicator
     [InputParameter("Period", sortIndex: 1, 1, 2000, 1, 0)]
     public int Period { get; set; } = 10;
 
-    [InputParameter("Data source", sortIndex: 2, variants: [
-        "Open", SourceType.Open,
-            "High", SourceType.High,
-            "Low", SourceType.Low,
-            "Close", SourceType.Close,
-            "HL/2 (Median)", SourceType.HL2,
-            "OC/2 (Midpoint)", SourceType.OC2,
-            "OHL/3 (Mean)", SourceType.OHL3,
-            "HLC/3 (Typical)", SourceType.HLC3,
-            "OHLC/4 (Average)", SourceType.OHLC4,
-            "HLCC/4 (Weighted)", SourceType.HLCC4
-    ])]
+    [IndicatorExtensions.DataSourceInput]
     public SourceType Source { get; set; } = SourceType.Close;
 
     [InputParameter("Show cold values", sortIndex: 21)]

diff --git a/quantower/Averages/EmaIndicator.cs b/quantower/Averages/EmaIndicator.cs
@@ -5,23 +5,12 @@ namespace QuanTAlib;
 
 public class EmaIndicator : Indicator, IWatchlistIndicator
 {
-    [InputParameter("Periods", sortIndex: 1, 1, 1000, 1, 0)]
-    public int Periods { get; set; } = 10;
+    [InputParameter("Period", sortIndex: 1, 1, 1000, 1, 0)]
+    public int Period { get; set; } = 10;
     [InputParameter("Use SMA for warmup period", sortIndex: 2)]
     public bool UseSMA { get; set; } = false;
 
-    [InputParameter("Data source", sortIndex: 3, variants: [
-        "Open", SourceType.Open,
-        "High", SourceType.High,
-        "Low", SourceType.Low,
-        "Close", SourceType.Close,
-        "HL/2 (Median)", SourceType.HL2,
-        "OC/2 (Midpoint)", SourceType.OC2,
-        "OHL/3 (Mean)", SourceType.OHL3,
-        "HLC/3 (Typical)", SourceType.HLC3,
-        "OHLC/4 (Average)", SourceType.OHLC4,
-        "HLCC/4 (Weighted)", SourceType.HLCC4
-    ])]
+    [IndicatorExtensions.DataSourceInput]
     public SourceType Source { get; set; } = SourceType.Close;
 
     [InputParameter("Show cold values", sortIndex: 21)]
@@ -30,10 +19,10 @@ public class EmaIndicator : Indicator, IWatchlistIndicator
     private Ema? ma;
     protected LineSeries? Series;
     protected string? SourceName;
-    public int MinHistoryDepths => Periods;
+    public int MinHistoryDepths => Period;
     int IWatchlistIndicator.MinHistoryDepths => MinHistoryDepths;
 
-    public override string ShortName => $"EMA {Periods}:{SourceName}";
+    public override string ShortName => $"EMA {Period}:{SourceName}";
 
     public EmaIndicator()
     {
@@ -42,13 +31,13 @@ public EmaIndicator()
         SourceName = Source.ToString();
         Name = "EMA - Exponential Moving Average";
         Description = "Exponential Moving Average";
-        Series = new(name: $"EMA {Periods}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
+        Series = new(name: $"EMA {Period}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
         AddLineSeries(Series);
     }
 
     protected override void OnInit()
     {
-        ma = new Ema(Periods, useSma: UseSMA);
+        ma = new Ema(Period, useSma: UseSMA);
         SourceName = Source.ToString();
         base.OnInit();
     }

diff --git a/quantower/Averages/EpmaIndicator.cs b/quantower/Averages/EpmaIndicator.cs
@@ -5,21 +5,10 @@ namespace QuanTAlib;
 
 public class EpmaIndicator : Indicator, IWatchlistIndicator
 {
-    [InputParameter("Periods", sortIndex: 1, 1, 1000, 1, 0)]
-    public int Periods { get; set; } = 10;
+    [InputParameter("Period", sortIndex: 1, 1, 1000, 1, 0)]
+    public int Period { get; set; } = 10;
 
-    [InputParameter("Data source", sortIndex: 2, variants: [
-        "Open", SourceType.Open,
-        "High", SourceType.High,
-        "Low", SourceType.Low,
-        "Close", SourceType.Close,
-        "HL/2 (Median)", SourceType.HL2,
-        "OC/2 (Midpoint)", SourceType.OC2,
-        "OHL/3 (Mean)", SourceType.OHL3,
-        "HLC/3 (Typical)", SourceType.HLC3,
-        "OHLC/4 (Average)", SourceType.OHLC4,
-        "HLCC/4 (Weighted)", SourceType.HLCC4
-    ])]
+    [IndicatorExtensions.DataSourceInput]
     public SourceType Source { get; set; } = SourceType.Close;
 
     [InputParameter("Show cold values", sortIndex: 21)]
@@ -28,10 +17,10 @@ public class EpmaIndicator : Indicator, IWatchlistIndicator
     private Epma? ma;
     protected LineSeries? Series;
     protected string? SourceName;
-    public int MinHistoryDepths => Periods;
+    public int MinHistoryDepths => Period;
     int IWatchlistIndicator.MinHistoryDepths => MinHistoryDepths;
 
-    public override string ShortName => $"EPMA {Periods}:{SourceName}";
+    public override string ShortName => $"EPMA {Period}:{SourceName}";
 
     public EpmaIndicator()
     {
@@ -40,13 +29,13 @@ public EpmaIndicator()
         SourceName = Source.ToString();
         Name = "EPMA - Exponential Percentage Moving Average";
         Description = "Exponential Percentage Moving Average";
-        Series = new(name: $"EPMA {Periods}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
+        Series = new(name: $"EPMA {Period}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
         AddLineSeries(Series);
     }
 
     protected override void OnInit()
     {
-        ma = new Epma(Periods);
+        ma = new Epma(Period);
         SourceName = Source.ToString();
         base.OnInit();
     }

diff --git a/quantower/Averages/FramaIndicator.cs b/quantower/Averages/FramaIndicator.cs
@@ -5,21 +5,10 @@ namespace QuanTAlib;
 
 public class FramaIndicator : Indicator, IWatchlistIndicator
 {
-    [InputParameter("Periods", sortIndex: 1, 2, 1000, 1, 0)]
-    public int Periods { get; set; } = 10;
+    [InputParameter("Period", sortIndex: 1, 2, 1000, 1, 0)]
+    public int Period { get; set; } = 10;
 
-    [InputParameter("Data source", sortIndex: 2, variants: [
-        "Open", SourceType.Open,
-        "High", SourceType.High,
-        "Low", SourceType.Low,
-        "Close", SourceType.Close,
-        "HL/2 (Median)", SourceType.HL2,
-        "OC/2 (Midpoint)", SourceType.OC2,
-        "OHL/3 (Mean)", SourceType.OHL3,
-        "HLC/3 (Typical)", SourceType.HLC3,
-        "OHLC/4 (Average)", SourceType.OHLC4,
-        "HLCC/4 (Weighted)", SourceType.HLCC4
-    ])]
+    [IndicatorExtensions.DataSourceInput]
     public SourceType Source { get; set; } = SourceType.Close;
 
     [InputParameter("Show cold values", sortIndex: 21)]
@@ -28,10 +17,10 @@ public class FramaIndicator : Indicator, IWatchlistIndicator
     private Frama? ma;
     protected LineSeries? Series;
     protected string? SourceName;
-    public int MinHistoryDepths => Periods * 2;
+    public int MinHistoryDepths => Period * 2;
     int IWatchlistIndicator.MinHistoryDepths => MinHistoryDepths;
 
-    public override string ShortName => $"FRAMA {Periods}:{SourceName}";
+    public override string ShortName => $"FRAMA {Period}:{SourceName}";
 
     public FramaIndicator()
     {
@@ -40,13 +29,13 @@ public FramaIndicator()
         SourceName = Source.ToString();
         Name = "FRAMA - Fractal Adaptive Moving Average";
         Description = "Fractal Adaptive Moving Average";
-        Series = new(name: $"FRAMA {Periods}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
+        Series = new(name: $"FRAMA {Period}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
         AddLineSeries(Series);
     }
 
     protected override void OnInit()
     {
-        ma = new Frama(Periods);
+        ma = new Frama(Period);
         SourceName = Source.ToString();
         base.OnInit();
     }

diff --git a/quantower/Averages/FwmaIndicator.cs b/quantower/Averages/FwmaIndicator.cs
@@ -5,21 +5,10 @@ namespace QuanTAlib;
 
 public class FwmaIndicator : Indicator, IWatchlistIndicator
 {
-    [InputParameter("Periods", sortIndex: 1, 1, 1000, 1, 0)]
-    public int Periods { get; set; } = 10;
+    [InputParameter("Period", sortIndex: 1, 1, 1000, 1, 0)]
+    public int Period { get; set; } = 10;
 
-    [InputParameter("Data source", sortIndex: 2, variants: [
-        "Open", SourceType.Open,
-        "High", SourceType.High,
-        "Low", SourceType.Low,
-        "Close", SourceType.Close,
-        "HL/2 (Median)", SourceType.HL2,
-        "OC/2 (Midpoint)", SourceType.OC2,
-        "OHL/3 (Mean)", SourceType.OHL3,
-        "HLC/3 (Typical)", SourceType.HLC3,
-        "OHLC/4 (Average)", SourceType.OHLC4,
-        "HLCC/4 (Weighted)", SourceType.HLCC4
-    ])]
+    [IndicatorExtensions.DataSourceInput]
     public SourceType Source { get; set; } = SourceType.Close;
 
     [InputParameter("Show cold values", sortIndex: 21)]
@@ -28,10 +17,10 @@ public class FwmaIndicator : Indicator, IWatchlistIndicator
     private Fwma? ma;
     protected LineSeries? Series;
     protected string? SourceName;
-    public int MinHistoryDepths => Periods;
+    public int MinHistoryDepths => Period;
     int IWatchlistIndicator.MinHistoryDepths => MinHistoryDepths;
 
-    public override string ShortName => $"FWMA {Periods}:{SourceName}";
+    public override string ShortName => $"FWMA {Period}:{SourceName}";
 
     public FwmaIndicator()
     {
@@ -40,13 +29,13 @@ public FwmaIndicator()
         SourceName = Source.ToString();
         Name = "FWMA - Fibonacci Weighted Moving Average";
         Description = "Fibonacci Weighted Moving Average";
-        Series = new(name: $"FWMA {Periods}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
+        Series = new(name: $"FWMA {Period}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
         AddLineSeries(Series);
     }
 
     protected override void OnInit()
     {
-        ma = new Fwma(Periods);
+        ma = new Fwma(Period);
         SourceName = Source.ToString();
         base.OnInit();
     }