diff --git a/Pages/Home.razor b/Pages/Home.razor index 2d8d1b2..f870067 100644 --- a/Pages/Home.razor +++ b/Pages/Home.razor @@ -275,19 +275,19 @@
@@ -461,6 +461,7 @@ try { normalCost = calculator.CalculateCostOfEnergyUsage(FluviusDataRaw); + simulatedCost = calculator.CalculateCostOfEnergyUsage(SimulationData); StepData[2].isProcessing = false; StepData[2].Completed = true; StateHasChanged(); @@ -484,7 +485,7 @@ }; // Filter data based on selected period if(FluviusDataRaw.Length > 0) FilteredFluviusData = DataFilter.FilterData(FluviusDataRaw, filterOption); - if(FilteredSimulationData.Length > 0) FilteredSimulationData = DataFilter.FilterData(SimulationData, filterOption); + if(SimulationData.Length > 0) FilteredSimulationData = DataFilter.FilterData(SimulationData, filterOption); StateHasChanged(); } diff --git a/Services/EnergyCostCalculator.cs b/Services/EnergyCostCalculator.cs index 2ca8509..d23d441 100644 --- a/Services/EnergyCostCalculator.cs +++ b/Services/EnergyCostCalculator.cs @@ -67,6 +67,8 @@ namespace BattSim.Services return baseCost + energyCost - returnCost + greenCertificateCost + heatingCertificateCost + dataManagmentCost + capacityCost + usageTariffCost + energyContributionCost + specialTariffsCost + flemishEnergyTarif; } + + private double CalculateYearCapacity(EnergyData[] energyData) { double peakSum = 0;