gavindiaz/QuanTAlib
1
0
Fork 0
mirror of https://github.com/mihakralj/QuanTAlib.git synced 2026-08-22 20:48:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor IndicatorExtensions: Remove unused methods and optimize price retrieval

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
lib/trends/jma/Jma.Quantower.Tests.cs
+5 -20
View File
@@ -12,7 +12,6 @@ public class JmaIndicatorTests
Assert.Equal(10, indicator.Period);
Assert.Equal(0, indicator.Phase);
Assert.Equal(0.45, indicator.Power);
Assert.Equal(SourceType.Close, indicator.Source);
Assert.True(indicator.ShowColdValues);
Assert.Equal("JMA - Jurik Moving Average", indicator.Name);
@@ -25,19 +24,18 @@ public class JmaIndicatorTests
{
var indicator = new JmaIndicator { Period = 20 };
Assert.Equal(20, indicator.MinHistoryDepths);
Assert.Equal(20, ((IWatchlistIndicator)indicator).MinHistoryDepths);
Assert.Equal(0, JmaIndicator.MinHistoryDepths);
Assert.Equal(0, ((IWatchlistIndicator)indicator).MinHistoryDepths);
}
[Fact]
public void JmaIndicator_ShortName_IncludesParameters()
{
var indicator = new JmaIndicator { Period = 15, Phase = 50, Power = 0.8 };
var indicator = new JmaIndicator { Period = 15, Phase = 50 };
Assert.Contains("JMA", indicator.ShortName);
Assert.Contains("15", indicator.ShortName);
Assert.Contains("50", indicator.ShortName);
Assert.Contains("0.8", indicator.ShortName);
}
[Fact]
@@ -115,16 +113,6 @@ public class JmaIndicatorTests
Assert.True(double.IsFinite(secondValue));
}
[Fact]
public void JmaIndicator_OnPaintChart_DoesNotThrow()
{
var indicator = new JmaIndicator();
indicator.Initialize();
var method = indicator.GetType().GetMethod("OnPaintChart");
Assert.NotNull(method);
Assert.Equal(typeof(JmaIndicator), method.DeclaringType);
}
[Fact]
public void JmaIndicator_MultipleUpdates_ProducesCorrectSequence()
@@ -171,18 +159,15 @@ public class JmaIndicatorTests
[Fact]
public void JmaIndicator_Parameters_CanBeChanged()
{
var indicator = new JmaIndicator { Period = 5, Phase = 10, Power = 0.5 };
var indicator = new JmaIndicator { Period = 5, Phase = 10 };
Assert.Equal(5, indicator.Period);
Assert.Equal(10, indicator.Phase);
Assert.Equal(0.5, indicator.Power);
indicator.Period = 20;
indicator.Phase = -10;
indicator.Power = 0.9;
Assert.Equal(20, indicator.Period);
Assert.Equal(-10, indicator.Phase);
Assert.Equal(0.9, indicator.Power);
Assert.Equal(20, indicator.MinHistoryDepths);
Assert.Equal(0, JmaIndicator.MinHistoryDepths);
}
}
lib/trends/jma/Jma.Quantower.cs
+20 -22
View File
@@ -1,8 +1,10 @@
using System.Drawing;
using System.Runtime.CompilerServices;
using TradingPlatform.BusinessLayer;
namespace QuanTAlib;
[SkipLocalsInit]
public class JmaIndicator : Indicator, IWatchlistIndicator
{
[InputParameter("Period", sortIndex: 1, 1, 1000, 1, 0)]
@@ -11,24 +13,27 @@ public class JmaIndicator : Indicator, IWatchlistIndicator
[InputParameter("Phase", sortIndex: 2, -100, 100, 1, 0)]
public int Phase { get; set; } = 0;
[InputParameter("Power", sortIndex: 3, 0.1, 10.0, 0.1, 1)]
public double Power { get; set; } = 0.45;
[IndicatorExtensions.DataSourceInput]
public SourceType Source { get; set; } = SourceType.Close;
[InputParameter("Show cold values", sortIndex: 21)]
public bool ShowColdValues { get; set; } = true;
[InputParameter("Color", sortIndex: 22)]
public Color LineColor { get; set; } = IndicatorExtensions.Averages;
[InputParameter("Width", sortIndex: 23)]
public int LineWidth { get; set; } = 2;
private Jma? ma;
protected LineSeries? Series;
protected string? SourceName;
private int _warmupBarIndex = -1;
private Func<IHistoryItem, double>? _priceSelector;
public int MinHistoryDepths => Period;
public static int MinHistoryDepths => 0;
int IWatchlistIndicator.MinHistoryDepths => MinHistoryDepths;
public override string ShortName => $"JMA {Period}:{Phase}:{Power}:{SourceName}";
public override string ShortName => $"JMA {Period}:{Phase}:{SourceName}";
public override string SourceCodeLink => "https://github.com/mihakralj/QuanTAlib/blob/main/lib/trends/jma/Jma.Quantower.cs";
public JmaIndicator()
@@ -44,28 +49,21 @@ public class JmaIndicator : Indicator, IWatchlistIndicator
protected override void OnInit()
{
ma = new Jma(Period, Phase, Power);
ma = new Jma(Period, Phase);
SourceName = Source.ToString();
_warmupBarIndex = -1;
_priceSelector = Source.GetPriceSelector();
Series!.Color = LineColor;
Series!.Width = LineWidth;
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);
var item = HistoricalData[Count - 1, SeekOriginHistory.Begin];
TValue result = ma!.Update(new TValue(item.TimeLeft.Ticks, _priceSelector!(item)), isNew: args.IsNewBar());
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);
Series!.SetValue(result.Value, ma.IsHot, ShowColdValues);
}
}