Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit fc962773 authored by Harald MARTINI's avatar Harald MARTINI
Browse files

Revert "Replaced ToMinSignificationDigits with to XMLFormat in XMLDeclarationReport" 

This reverts commit 070b6f47.
parent 047c3c89
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+ 17
− 17
View file @ fc962773
...@@ -298,26 +298,26 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -298,26 +298,26 @@ namespace TUGraz.VectoCore.OutputData.XML
tns + XMLNames.Report_Results_FuelConsumption, tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"),
entry.FC_FINAL_KM entry.FC_FINAL_KM
.ConvertToGrammPerKiloMeter().ToXMLFormat(1), .ConvertToGrammPerKiloMeter().ToMinSignificantDigits(3, 1)),
new XElement( new XElement(
tns + XMLNames.Report_Results_FuelConsumption, tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/t-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/t-km"),
(entry.FC_FINAL_KM / result.Payload) (entry.FC_FINAL_KM / result.Payload)
.ConvertToGrammPerTonKilometer().ToXMLFormat(1))), .ConvertToGrammPerTonKilometer().ToMinSignificantDigits(3, 1)),
result.CargoVolume > 0 result.CargoVolume > 0
? new XElement( ? new XElement(
tns + XMLNames.Report_Results_FuelConsumption, tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/m³-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/m³-km"),
(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / (entry.TotalFuelConsumptionCorrected.ConvertToGramm() / result.Distance.ConvertToKiloMeter() /
result.CargoVolume) result.CargoVolume)
.Value().ToXMLFormat( 1)) .Value().ToMinSignificantDigits(3, 1))
: null, : null,
result.PassengerCount.HasValue && result.PassengerCount.Value > 0 result.PassengerCount.HasValue && result.PassengerCount.Value > 0
? new XElement( ? new XElement(
tns + XMLNames.Report_Results_FuelConsumption, tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/p-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/p-km"),
(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / (entry.TotalFuelConsumptionCorrected.ConvertToGramm() / result.Distance.ConvertToKiloMeter() /
result.PassengerCount.Value).ToXMLFormat( 1)) result.PassengerCount.Value).ToMinSignificantDigits(3, 1))
: null : null
); );
...@@ -330,20 +330,20 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -330,20 +330,20 @@ namespace TUGraz.VectoCore.OutputData.XML
new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/km"),
(entry.EnergyDemand / (entry.EnergyDemand /
result.Distance.ConvertToKiloMeter() / 1e6) result.Distance.ConvertToKiloMeter() / 1e6)
.Value().ToXMLFormat( 1)), .Value().ToMinSignificantDigits(3, 1)),
new XElement( new XElement(
tns + XMLNames.Report_Results_FuelConsumption, tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/t-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/t-km"),
(entry.EnergyDemand / (entry.EnergyDemand /
result.Distance.ConvertToKiloMeter() / result.Payload.ConvertToTon() / 1e6) result.Distance.ConvertToKiloMeter() / result.Payload.ConvertToTon() / 1e6)
.Value().ToXMLFormat( 1))); .Value().ToMinSignificantDigits(3, 1)));
if (result.CargoVolume > 0) { if (result.CargoVolume > 0) {
fcResult.Add( fcResult.Add(
new XElement( new XElement(
tns + XMLNames.Report_Results_FuelConsumption, tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/m³-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/m³-km"),
(entry.EnergyDemand / (entry.EnergyDemand /
result.Distance.ConvertToKiloMeter() / result.CargoVolume / 1e6).Value().ToXMLFormat( 1))); result.Distance.ConvertToKiloMeter() / result.CargoVolume / 1e6).Value().ToMinSignificantDigits(3, 1)));
} }
if (result.PassengerCount.HasValue) { if (result.PassengerCount.HasValue) {
fcResult.Add( fcResult.Add(
...@@ -351,7 +351,7 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -351,7 +351,7 @@ namespace TUGraz.VectoCore.OutputData.XML
tns + XMLNames.Report_Results_FuelConsumption, tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/p-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/p-km"),
(entry.EnergyDemand / (entry.EnergyDemand /
result.Distance.ConvertToKiloMeter() / result.PassengerCount.Value / 1e6).Value().ToXMLFormat(1)) result.Distance.ConvertToKiloMeter() / result.PassengerCount.Value / 1e6).Value().ToMinSignificantDigits(3, 1))
); );
} }
} }
...@@ -362,13 +362,13 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -362,13 +362,13 @@ namespace TUGraz.VectoCore.OutputData.XML
new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/100km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/100km"),
(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity / (entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity /
result.Distance.ConvertToKiloMeter() * 100) result.Distance.ConvertToKiloMeter() * 100)
.Value().ToXMLFormat( 1)), .Value().ToMinSignificantDigits(3, 1)),
new XElement( new XElement(
tns + XMLNames.Report_Results_FuelConsumption, tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/t-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/t-km"),
(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity / (entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity /
result.Distance.ConvertToKiloMeter() / result.Distance.ConvertToKiloMeter() /
result.Payload.ConvertToTon()).Value().ToXMLFormat( 1))); result.Payload.ConvertToTon()).Value().ToMinSignificantDigits(3, 1)));
if (result.CargoVolume > 0) { if (result.CargoVolume > 0) {
fcResult.Add( fcResult.Add(
new XElement( new XElement(
...@@ -376,7 +376,7 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -376,7 +376,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/m³-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/m³-km"),
(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity / (entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity /
result.Distance.ConvertToKiloMeter() / result.Distance.ConvertToKiloMeter() /
result.CargoVolume).Value().ToXMLFormat( 1))); result.CargoVolume).Value().ToMinSignificantDigits(3, 1)));
} }
if (result.PassengerCount.HasValue && result.PassengerCount.Value > 0) { if (result.PassengerCount.HasValue && result.PassengerCount.Value > 0) {
fcResult.Add( fcResult.Add(
...@@ -384,7 +384,7 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -384,7 +384,7 @@ namespace TUGraz.VectoCore.OutputData.XML
tns + XMLNames.Report_Results_FuelConsumption, tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/p-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/p-km"),
(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity / (entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity /
result.Distance.ConvertToKiloMeter() / result.PassengerCount.Value).Value().ToXMLFormat( 1)) result.Distance.ConvertToKiloMeter() / result.PassengerCount.Value).Value().ToMinSignificantDigits(3, 1))
); );
} }
} }
...@@ -395,27 +395,27 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -395,27 +395,27 @@ namespace TUGraz.VectoCore.OutputData.XML
retVal.Add( retVal.Add(
new XElement( new XElement(
tns + XMLNames.Report_Results_CO2, new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"), tns + XMLNames.Report_Results_CO2, new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"),
(result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter()).ToXMLFormat( 2))); (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter()).ToMinSignificantDigits(3, 2)));
retVal.Add( retVal.Add(
new XElement( new XElement(
tns + XMLNames.Report_Results_CO2, tns + XMLNames.Report_Results_CO2,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/t-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/t-km"),
(result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter() /
result.Payload.ConvertToTon()).ToXMLFormat(2))); result.Payload.ConvertToTon()).ToMinSignificantDigits(3, 2)));
if (result.CargoVolume > 0) if (result.CargoVolume > 0)
retVal.Add( retVal.Add(
new XElement( new XElement(
tns + XMLNames.Report_Results_CO2, tns + XMLNames.Report_Results_CO2,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/m³-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/m³-km"),
(result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / result.CargoVolume).Value() (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / result.CargoVolume).Value()
.ToXMLFormat( 2))); .ToMinSignificantDigits(3, 2)));
if (result.PassengerCount.HasValue && result.PassengerCount.Value > 0) { if (result.PassengerCount.HasValue && result.PassengerCount.Value > 0) {
retVal.Add( retVal.Add(
new XElement( new XElement(
tns + XMLNames.Report_Results_CO2, tns + XMLNames.Report_Results_CO2,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/p-km"), new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/p-km"),
(result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / result.PassengerCount.Value) (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / result.PassengerCount.Value)
.ToXMLFormat( 2))); .ToMinSignificantDigits(3, 2)));
} }
return retVal; return retVal;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about