From 62956f794f0f2a848caa3a2a1ea8b36d696a5943 Mon Sep 17 00:00:00 2001
From: "harald.martini@student.tugraz.at" <harald.martini@student.tugraz.at>
Date: Mon, 28 Jun 2021 15:48:59 +0200
Subject: [PATCH] Revert "Replaced ToMinSignificantDigits with ToXmlFormat in
XMLCustomerReportCompletedBus"
This reverts commit e5a6df6c314145564790648faa2cdef02d8bb876.
---
.../XMLCustomerReportCompletedBus.cs | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportCompletedBus.cs
index 2a978910ae..d89169d70e 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportCompletedBus.cs
@@ -146,7 +146,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
tns + XMLNames.Report_ResultEntry_TotalVehicleMass,
XMLHelper.ValueAsUnit(result.TotalVehicleMass, XMLNames.Unit_kg)),
new XElement(tns + XMLNames.Report_Result_MassPassengers, XMLHelper.ValueAsUnit(result.Payload, XMLNames.Unit_kg)),
- result.PassengerCount.HasValue && result.PassengerCount.Value > 0 ? new XElement(tns + XMLNames.Report_Result_PassengerCount, result.PassengerCount.Value.ToXMLFormat( 1)) : null,
+ result.PassengerCount.HasValue && result.PassengerCount.Value > 0 ? new XElement(tns + XMLNames.Report_Result_PassengerCount, result.PassengerCount.Value.ToMinSignificantDigits(3, 1)) : null,
new XElement(tns + XMLNames.Report_Result_FuelMode, primaryResult.SimulationParameter.FuelMode)
};
}
@@ -170,24 +170,24 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
new XElement(
tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"),
- fcMass.ConvertToGrammPerKiloMeter().ToXMLFormat( 1)),
+ fcMass.ConvertToGrammPerKiloMeter().ToMinSignificantDigits(3, 1)),
//new XElement(
// tns + XMLNames.Report_Results_FuelConsumption,
// new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/t-km"),
// (fcMass / specificResult.Payload)
- // .ConvertToGrammPerTonKilometer().ToXMLFormat(3, 1)),
+ // .ConvertToGrammPerTonKilometer().ToMinSignificantDigits(3, 1)),
specificResult.CargoVolume > 0
? new XElement(
tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/m³-km"),
(fcMass.ConvertToGrammPerKiloMeter() / specificResult.CargoVolume)
- .Value().ToXMLFormat( 1))
+ .Value().ToMinSignificantDigits(3, 1))
: null,
specificResult.PassengerCount.HasValue && specificResult.PassengerCount.Value > 0
? new XElement(
tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/p-km"),
- (fcMass.ConvertToGrammPerKiloMeter() / specificResult.PassengerCount.Value).ToXMLFormat( 1))
+ (fcMass.ConvertToGrammPerKiloMeter() / specificResult.PassengerCount.Value).ToMinSignificantDigits(3, 1))
: null
);
if (fuelData.FuelDensity != null) {
@@ -195,12 +195,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
new XElement(
tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/100km"),
- (fcMass.ConvertToGrammPerKiloMeter() / fuelData.FuelDensity * 100).Value().ToXMLFormat( 1))
+ (fcMass.ConvertToGrammPerKiloMeter() / fuelData.FuelDensity * 100).Value().ToMinSignificantDigits(3, 1))
//new XElement(
// tns + XMLNames.Report_Results_FuelConsumption,
// new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/t-km"),
// (fcMass.ConvertToGrammPerKiloMeter() / fuelData.FuelDensity /
- // specificResult.Payload.ConvertToTon()).Value().ToXMLFormat(3, 1))
+ // specificResult.Payload.ConvertToTon()).Value().ToMinSignificantDigits(3, 1))
);
if (specificResult.CargoVolume > 0) {
fcResult.Add(
@@ -208,7 +208,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/m³-km"),
(fcMass.ConvertToGrammPerKiloMeter() / fuelData.FuelDensity /
- specificResult.CargoVolume).Value().ToXMLFormat( 1)));
+ specificResult.CargoVolume).Value().ToMinSignificantDigits(3, 1)));
}
if (specificResult.PassengerCount.HasValue && specificResult.PassengerCount.Value > 0) {
fcResult.Add(
@@ -216,7 +216,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/p-km"),
(fcMass.ConvertToGrammPerKiloMeter() / fuelData.FuelDensity /
- specificResult.PassengerCount.Value).Value().ToXMLFormat( 1))
+ specificResult.PassengerCount.Value).Value().ToMinSignificantDigits(3, 1))
);
}
}
@@ -227,24 +227,24 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
retVal.Add(
new XElement(
tns + XMLNames.Report_Results_CO2, new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"),
- co2Sum.ConvertToGrammPerKiloMeter().ToXMLFormat( 2)));
+ co2Sum.ConvertToGrammPerKiloMeter().ToMinSignificantDigits(3, 2)));
//retVal.Add(
// new XElement(
// tns + XMLNames.Report_Results_CO2,
// new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/t-km"),
- // (co2Sum.ConvertToGrammPerKiloMeter() / specificResult.Payload.ConvertToTon()).ToXMLFormat( 2)));
+ // (co2Sum.ConvertToGrammPerKiloMeter() / specificResult.Payload.ConvertToTon()).ToMinSignificantDigits(3, 2)));
if (specificResult.CargoVolume > 0)
retVal.Add(
new XElement(
tns + XMLNames.Report_Results_CO2,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/m³-km"),
- (co2Sum.ConvertToGrammPerKiloMeter() / specificResult.CargoVolume).Value().ToXMLFormat( 2)));
+ (co2Sum.ConvertToGrammPerKiloMeter() / specificResult.CargoVolume).Value().ToMinSignificantDigits(3, 2)));
if (specificResult.PassengerCount.HasValue && specificResult.PassengerCount.Value > 0) {
retVal.Add(
new XElement(
tns + XMLNames.Report_Results_CO2,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/p-km"),
- (co2Sum.ConvertToGrammPerKiloMeter() / specificResult.PassengerCount.Value).ToXMLFormat( 2)));
+ (co2Sum.ConvertToGrammPerKiloMeter() / specificResult.PassengerCount.Value).ToMinSignificantDigits(3, 2)));
}
_weightedPayload += specificResult.Payload * specificResult.WeightingFactor;
@@ -270,7 +270,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
new XAttribute(XMLNames.Report_Results_Unit_Attr, "-"),
(_passengerCount / _resultCount).ToXMLFormat(1)
)
- //_passengerCount > 0 ? new XElement(tns + "AveragePAssengerCount", _passengerCount.ToXMLFormat(2)) : null
+ //_passengerCount > 0 ? new XElement(tns + "AveragePAssengerCount", _passengerCount.ToMinSignificantDigits(2)) : null
)
: null;
results.Add(summary);
--
GitLab