Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix disabled subsampling #7656

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Fix disabled subsampling #7656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Common/SeriesSampler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ public SeriesSampler(TimeSpan resolution)
/// <returns>The sampled series</returns>
public virtual BaseSeries Sample(BaseSeries series, DateTime start, DateTime stop, bool truncateValues = false)
{
if (!SubSample && series.Values.Count > 1)
{
var dataDiff = series.Values[1].Time - series.Values[0].Time;
if (dataDiff >= Step)
{
// we don't want to subsample this case, directly return what we are given as long as is within the range
return GetIdentitySeries(series.Clone(empty: true), series, start, stop, truncateValues: false);
}
}

if (series is Series seriesToSample)
{
return SampleSeries(seriesToSample, start, stop, truncateValues);
Expand Down
6 changes: 4 additions & 2 deletions Tests/Common/SeriesSamplerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,8 @@ public void SubSamplesDisabled()
series.AddPoint(_reference, 1m);
series.AddPoint(_reference.AddDays(1), 2m);
series.AddPoint(new ChartPoint(_reference.AddDays(2), null));
series.AddPoint(_reference.AddDays(3), 4m);
// even if the data doesn't fit exactly the expected bar span we expect it to pass through
series.AddPoint(_reference.AddDays(2.8), 4m);
series.AddPoint(_reference.AddDays(4), 5m);
series.AddPoint(_reference.AddDays(5), 6m);

Expand Down Expand Up @@ -791,7 +792,8 @@ public void SamplesCandlestickSeriesWithHigherSamplingResolutionDisabled()
var series = new CandlestickSeries { Name = "name" };
series.AddPoint(_reference, 1m, 2m, 1m, 2m);
series.AddPoint(_reference.AddDays(1), 2m, 3m, 2m, 3m);
series.AddPoint(_reference.AddDays(2), 4m, 4m, 3m, 3m);
// even if the data doesn't fit exactly the expected bar span we expect it to pass through
series.AddPoint(_reference.AddDays(1.6), 4m, 4m, 3m, 3m);

var sampler = new SeriesSampler(TimeSpan.FromDays(0.25)) { SubSample = false };

Expand Down
Loading