Skip to content

EM datasource didn't filter out-of-range emission data #572

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

Merged
merged 1 commit into from
Oct 15, 2024
Merged

EM datasource didn't filter out-of-range emission data #572

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
22 changes: 11 additions & 11 deletions ...ware.DataSources/CarbonAware.DataSources.ElectricityMaps/src/ElectricityMapsDataSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,18 +138,18 @@ private async Task<IEnumerable<CarbonIntensity>> GetRecentCarbonInstensityData(L

private IEnumerable<EmissionsData> HistoryCarbonIntensityToEmissionsData(Location location, IEnumerable<CarbonIntensity> data, DateTimeOffset startTime, DateTimeOffset endTime)
{
IEnumerable<EmissionsData> emissions;
var duration = GetDurationFromHistoryDataPointsOrDefault(data, TimeSpan.Zero);
emissions = data.Select(d =>
{
var emission = (EmissionsData) d;
emission.Location = location.Name ?? string.Empty;
emission.Time = d.DateTime;
emission.Duration = duration;
return emission;
});

return emissions;
return data.Where(d => ((startTime <= d.DateTime) && (d.DateTime < endTime)) ||
((startTime <= d.DateTime.Add(duration)) && (d.DateTime.Add(duration) < endTime)) ||
((d.DateTime < startTime) && (endTime < d.DateTime.Add(duration))))
.Select(d =>
{
var emission = (EmissionsData)d;
emission.Location = location.Name ?? string.Empty;
emission.Time = d.DateTime;
emission.Duration = duration;
return emission;
});
}

private TimeSpan GetDurationFromHistoryDataPointsOrDefault(IEnumerable<CarbonIntensity> carbonIntensityDataPoints, TimeSpan defaultValue)
Expand Down
22 changes: 16 additions & 6 deletions ...ataSources/CarbonAware.DataSources.ElectricityMaps/test/ElectricityMapsDataSourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ public async Task GetCarbonIntensity_CallsExpectedClientEndpoint(int startTimeOf
public async Task GetCarbonIntensity_DateRangeWithin24Hours_ReturnsResultsWhenRecordsFound()
{
var startDate = DateTimeOffset.UtcNow.AddHours(-10);
var expectedDate = startDate.AddMinutes(-10);
var endDate = startDate.AddHours(1);
var expectedCarbonIntensity = 100;

Expand All @@ -145,10 +146,12 @@ public async Task GetCarbonIntensity_DateRangeWithin24Hours_ReturnsResultsWhenRe
{
new CarbonIntensity()
{
Value = expectedCarbonIntensity,
DateTime = startDate.AddMinutes(-40), // out of range
Value = 0,
},
new CarbonIntensity()
{
DateTime = expectedDate,
Value = expectedCarbonIntensity,
}
}
Expand All @@ -162,10 +165,11 @@ public async Task GetCarbonIntensity_DateRangeWithin24Hours_ReturnsResultsWhenRe
var result = await this._dataSource.GetCarbonIntensityAsync(new List<Location>() { _defaultLocation }, startDate, endDate);

Assert.IsNotNull(result);
Assert.That(result.Count(), Is.EqualTo(2));
Assert.That(result.Count(), Is.EqualTo(1));

var first = result.First();
Assert.IsNotNull(first);
Assert.That(expectedDate, Is.EqualTo(first.Time));
Assert.That(first.Rating, Is.EqualTo(expectedCarbonIntensity));
Assert.That(first.Location, Is.EqualTo(_defaultLocation.Name));

Expand All @@ -176,6 +180,7 @@ public async Task GetCarbonIntensity_DateRangeWithin24Hours_ReturnsResultsWhenRe
public async Task GetCarbonIntensity_DateRangeMore24Hours_ReturnsResultsWhenRecordsFound()
{
var startDate = _defaultDataStartTime;
var expectedDate = startDate.AddMinutes(-10);
var endDate = startDate.AddHours(1);
var expectedCarbonIntensity = 100;

Expand All @@ -187,10 +192,12 @@ public async Task GetCarbonIntensity_DateRangeMore24Hours_ReturnsResultsWhenReco
{
new CarbonIntensity()
{
Value = expectedCarbonIntensity,
DateTime = startDate.AddMinutes(-40), // out of range
Value = 0,
},
new CarbonIntensity()
{
DateTime = expectedDate,
Value = expectedCarbonIntensity,
}
}
Expand All @@ -206,10 +213,11 @@ public async Task GetCarbonIntensity_DateRangeMore24Hours_ReturnsResultsWhenReco
var result = await this._dataSource.GetCarbonIntensityAsync(new List<Location>() { _defaultLocation }, startDate, endDate);

Assert.IsNotNull(result);
Assert.That(result.Count(), Is.EqualTo(2));
Assert.That(result.Count(), Is.EqualTo(1));

var first = result.First();
Assert.IsNotNull(first);
Assert.That(expectedDate, Is.EqualTo(first.Time));
Assert.That(first.Rating, Is.EqualTo(expectedCarbonIntensity));
Assert.That(first.Location, Is.EqualTo(_defaultLocation.Name));

Expand Down Expand Up @@ -261,7 +269,9 @@ public async Task GetDurationBetweenHistoryDataPoints_ReturnsDefaultDuration_Whe
{
HistoryData = new List<CarbonIntensity>()
{
new CarbonIntensity()
new CarbonIntensity(){
DateTime = startDate.AddMinutes(30),
},
}
};

Expand All @@ -285,7 +295,7 @@ public async Task GetDurationBetweenHistoryDataPoints_WhenMultipleDataPoints_Ret
{
var startDate = DateTimeOffset.UtcNow.AddHours(-8);
var endDate = startDate.AddHours(1);
var expectedDuration = TimeSpan.FromHours(1);
var expectedDuration = TimeSpan.FromMinutes(59);
// Arrange
_locationSource.Setup(l => l.ToGeopositionLocationAsync(_defaultLocation)).Returns(Task.FromResult(_defaultLocation));

Expand Down
Loading