Changed from daily records to quarter hour records

This commit is contained in:
douwe
2026-04-13 16:14:54 +02:00
parent 9f1fbcdd5a
commit 992b7f02ea
8 changed files with 105 additions and 271 deletions

View File

@@ -12,31 +12,29 @@ namespace BattSim.Services
foreach (var day in data)
{
// Charge battery from production
var totalProduction = day.DayProduction + day.NightProduction;
var chargedEnergy = System.Math.Min(totalProduction, batteryCapacity);
var excessProduction = totalProduction - chargedEnergy;
// // Charge battery from production
// var chargedEnergy = System.Math.Min(day.TotalProduction, batteryCapacity);
// var excessProduction = day.TotalProduction - chargedEnergy;
// Use battery for consumption
var totalConsumption = day.DayConsumption + day.NightConsumption;
var usedEnergy = System.Math.Min(chargedEnergy + remainingEnergy, totalConsumption);
var remainingAfterUse = chargedEnergy + remainingEnergy - usedEnergy;
// // Use battery for consumption
// var usedEnergy = System.Math.Min(chargedEnergy + remainingEnergy, day.TotalConsumption);
// var remainingAfterUse = chargedEnergy + remainingEnergy - usedEnergy;
// Calculate reduced values
var reducedConsumption = System.Math.Min(usedEnergy, totalConsumption);
var reducedProduction = totalProduction - chargedEnergy;
// // Calculate reduced values
// var reducedConsumption = System.Math.Min(usedEnergy, day.TotalConsumption);
// var reducedProduction = day.TotalProduction - chargedEnergy;
results.Add(new BatteryDayResult
{
Date = day.Date,
ChargedEnergy = chargedEnergy,
UsedEnergy = usedEnergy,
RemainingEnergy = remainingAfterUse,
ReducedConsumption = reducedConsumption,
ReducedProduction = reducedProduction
});
// results.Add(new BatteryDayResult
// {
// Date = day.Date,
// ChargedEnergy = chargedEnergy,
// UsedEnergy = usedEnergy,
// RemainingEnergy = remainingAfterUse,
// ReducedConsumption = reducedConsumption,
// ReducedProduction = reducedProduction
// });
remainingEnergy = remainingAfterUse;
// remainingEnergy = remainingAfterUse;
}
return results;