Refactor IndicatorExtensions: Remove unused methods and optimize price retrieval

This commit is contained in:
Miha Kralj
2025-12-24 13:50:19 -08:00
parent c47b106597
commit 8917575994
101 changed files with 1311 additions and 450292 deletions
+4 -4
View File
@@ -15,7 +15,7 @@ public class KamaIndicatorTests
Assert.Equal(30, indicator.SlowPeriod);
Assert.Equal(SourceType.Close, indicator.Source);
Assert.True(indicator.ShowColdValues);
Assert.Equal("KAMA - Kaufman Adaptive Moving Average", indicator.Name);
Assert.Equal("KAMA - Kaufman's Adaptive Moving Average", indicator.Name);
Assert.False(indicator.SeparateWindow);
Assert.True(indicator.OnBackGround);
}
@@ -25,8 +25,8 @@ public class KamaIndicatorTests
{
var indicator = new KamaIndicator { Period = 20 };
Assert.Equal(20, indicator.MinHistoryDepths);
Assert.Equal(20, ((IWatchlistIndicator)indicator).MinHistoryDepths);
Assert.Equal(0, KamaIndicator.MinHistoryDepths);
Assert.Equal(0, ((IWatchlistIndicator)indicator).MinHistoryDepths);
}
[Fact]
@@ -165,6 +165,6 @@ public class KamaIndicatorTests
indicator.Period = 20;
Assert.Equal(20, indicator.Period);
Assert.Equal(20, indicator.MinHistoryDepths);
Assert.Equal(0, KamaIndicator.MinHistoryDepths);
}
}
+25 -33
View File
@@ -1,17 +1,20 @@
using System;
using System.Drawing;
using System.Runtime.CompilerServices;
using TradingPlatform.BusinessLayer;
namespace QuanTAlib;
public class KamaIndicator : Indicator, IWatchlistIndicator
[SkipLocalsInit]
public sealed class KamaIndicator : Indicator, IWatchlistIndicator
{
[InputParameter("Period", sortIndex: 1, 1, 1000, 1, 0)]
[InputParameter("Period", sortIndex: 1, 1, 2000, 1, 0)]
public int Period { get; set; } = 10;
[InputParameter("Fast Period", sortIndex: 2, 1, 1000, 1, 0)]
[InputParameter("Fast Period", sortIndex: 2, 1, 200, 1, 0)]
public int FastPeriod { get; set; } = 2;
[InputParameter("Slow Period", sortIndex: 3, 1, 1000, 1, 0)]
[InputParameter("Slow Period", sortIndex: 3, 1, 200, 1, 0)]
public int SlowPeriod { get; set; } = 30;
[IndicatorExtensions.DataSourceInput]
@@ -20,51 +23,40 @@ public class KamaIndicator : Indicator, IWatchlistIndicator
[InputParameter("Show cold values", sortIndex: 21)]
public bool ShowColdValues { get; set; } = true;
private Kama? ma;
protected LineSeries? Series;
protected string? SourceName;
private int _warmupBarIndex = -1;
private Kama? _kama;
private readonly LineSeries? _series;
private string? _sourceName;
private Func<IHistoryItem, double>? _priceSelector;
public int MinHistoryDepths => Period;
public static int MinHistoryDepths => 0;
int IWatchlistIndicator.MinHistoryDepths => MinHistoryDepths;
public override string ShortName => $"KAMA {Period}:{SourceName}";
public override string ShortName => $"KAMA {Period}:{_sourceName}";
public KamaIndicator()
{
OnBackGround = true;
SeparateWindow = false;
SourceName = Source.ToString();
Name = "KAMA - Kaufman Adaptive Moving Average";
Description = "Kaufman Adaptive Moving Average";
Series = new(name: $"KAMA {Period}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
AddLineSeries(Series);
Name = "KAMA - Kaufman's Adaptive Moving Average";
Description = "Kaufman's Adaptive Moving Average";
_series = new(name: $"KAMA {Period}", color: IndicatorExtensions.Averages, width: 2, style: LineStyle.Solid);
AddLineSeries(_series);
}
protected override void OnInit()
{
ma = new Kama(Period, FastPeriod, SlowPeriod);
SourceName = Source.ToString();
_warmupBarIndex = -1;
_priceSelector = Source.GetPriceSelector();
_sourceName = Source.ToString();
_kama = new Kama(Period, FastPeriod, SlowPeriod);
base.OnInit();
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
protected override void OnUpdate(UpdateArgs args)
{
TValue input = this.GetInputValue(args, Source);
bool isNew = args.Reason == UpdateReason.NewBar || args.Reason == UpdateReason.HistoricalBar;
TValue result = ma!.Update(input, isNew);
Series!.SetValue(result.Value);
Series!.SetMarker(0, Color.Transparent);
if (_warmupBarIndex < 0 && ma!.IsHot)
_warmupBarIndex = Count;
}
public override void OnPaintChart(PaintChartEventArgs args)
{
base.OnPaintChart(args);
int warmupPeriod = _warmupBarIndex > 0 ? _warmupBarIndex : Count;
this.PaintSmoothCurve(args, Series!, warmupPeriod, showColdValues: ShowColdValues, tension: 0.2);
bool isNew = args.IsNewBar();
var item = HistoricalData[Count - 1, SeekOriginHistory.Begin];
double value = _kama!.Update(new TValue(item.TimeLeft.Ticks, _priceSelector!(item)), isNew).Value;
_series!.SetValue(value, _kama.IsHot, ShowColdValues);
}
}