From 1fe1a8954a1db7c24aee0faceda4c179487db1ba Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 9 Oct 2020 14:18:13 +0200
Subject: [PATCH] use factor method for completed bus calculations
---
.../XML/XMLManufacturerReportCompletedBus.cs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
index b9be89ab2d..d7f2559a67 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
@@ -209,12 +209,12 @@ namespace TUGraz.VectoCore.OutputData.XML {
protected internal static double CalculateFactorMethodFactor(IResult primaryResult,
XMLDeclarationReport.ResultEntry specific, XMLDeclarationReport.ResultEntry generic)
{
- //return specific.EnergyConsumptionTotal.Value() / generic.EnergyConsumptionTotal.Value();
- var energyConsumptionPrimary = primaryResult.EnergyConsumption.Sum(x => x.Value);
- var energyConsumptionCompeted = energyConsumptionPrimary +
- specific.EnergyConsumptionTotal / specific.Distance -
- generic.EnergyConsumptionTotal / generic.Distance;
- return energyConsumptionCompeted / energyConsumptionPrimary;
+ return specific.EnergyConsumptionTotal.Value() / generic.EnergyConsumptionTotal.Value();
+ // var energyConsumptionPrimary = primaryResult.EnergyConsumption.Sum(x => x.Value);
+ //var energyConsumptionCompeted = energyConsumptionPrimary +
+ // specific.EnergyConsumptionTotal / specific.Distance -
+ // generic.EnergyConsumptionTotal / generic.Distance;
+ //return energyConsumptionCompeted / energyConsumptionPrimary;
}
private XElement[] GetFuelConsumptionResults(XMLDeclarationReport.ResultEntry genericResult, XMLDeclarationReport.ResultEntry specificResult, IResult primaryResult)
--
GitLab