diff --git a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs index 59cfefdb3d0096a6fd6f2c454d101bea9fb5acd2..01ffdcf1fd7d6359e6e9bec7083b089766b3000a 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs @@ -217,24 +217,24 @@ namespace TUGraz.VectoCore.OutputData.XML { retVal.Add( new XElement( tns + XMLNames.Report_Results_CO2, new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"), - co2Sum.ConvertToGrammPerKiloMeter().ToMinSignificantDigits(3, 1))); + 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()).ToMinSignificantDigits(3, 1))); + (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().ToMinSignificantDigits(3, 1))); + (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).ToMinSignificantDigits(3, 1))); + (co2Sum.ConvertToGrammPerKiloMeter() / specificResult.PassengerCount.Value).ToMinSignificantDigits(3, 2))); } _weightedPayload += specificResult.Payload * specificResult.WeightingFactor; diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs index 8096a70821f1a0f174f724c6891527135faf745f..c8daa8719d77651195acca2050be83ae42690fd8 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs @@ -465,27 +465,27 @@ namespace TUGraz.VectoCore.OutputData.XML retVal.Add( new XElement( tns + XMLNames.Report_Results_CO2, new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"), - (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter()).ToMinSignificantDigits(3, 1))); + (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter()).ToMinSignificantDigits(3, 2))); retVal.Add( new XElement( tns + XMLNames.Report_Results_CO2, new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/t-km"), (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / - result.Payload.ConvertToTon()).ToMinSignificantDigits(3, 1))); + result.Payload.ConvertToTon()).ToMinSignificantDigits(3, 2))); if (result.CargoVolume > 0) retVal.Add( new XElement( tns + XMLNames.Report_Results_CO2, new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/m³-km"), (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / result.CargoVolume).Value() - .ToMinSignificantDigits(3, 1))); + .ToMinSignificantDigits(3, 2))); if (result.PassengerCount.HasValue && result.PassengerCount.Value > 0) { retVal.Add( new XElement( tns + XMLNames.Report_Results_CO2, new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/p-km"), (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / result.PassengerCount.Value) - .ToMinSignificantDigits(3, 1))); + .ToMinSignificantDigits(3, 2))); } return retVal; } diff --git a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs index d3cfc4fd06902c0a8ec8bb8882d95c56c859a99b..cabaedec7016c2a542cf1013113ee63ebba63e7b 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs @@ -301,24 +301,24 @@ namespace TUGraz.VectoCore.OutputData.XML { retVal.Add( new XElement( tns + XMLNames.Report_Results_CO2, new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"), - co2Sum.ConvertToGrammPerKiloMeter().ToMinSignificantDigits(3, 1))); + 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()).ToMinSignificantDigits(3, 1))); + (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().ToMinSignificantDigits(3, 1))); + (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).ToMinSignificantDigits(3, 1))); + (co2Sum.ConvertToGrammPerKiloMeter() / specificResult.PassengerCount.Value).ToMinSignificantDigits(3, 2))); } return retVal.ToArray(); diff --git a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs index 08eb113541f43e4ee33ec4d87839833e7be8ae3c..53f143197d1af209f704419cc50c248580a20fb3 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs @@ -436,7 +436,7 @@ namespace TUGraz.VectoCore.OutputData.XML retVal.Add( new XElement( tns + XMLNames.Report_Results_CO2, new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"), - (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter()).ToMinSignificantDigits(3, 1))); + (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter()).ToMinSignificantDigits(3, 2))); return retVal.Cast<object>().ToArray(); } diff --git a/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs index a1e03606771e97464528f317613d6cc2549d6ccc..95c3ababe1d173ef14e5aae5beba64e0f45bf67f 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs @@ -288,11 +288,11 @@ namespace TUGraz.VectoCore.OutputData.XML ), new XElement( tns + "Declared", new XAttribute(XMLNames.Report_Results_Unit_Attr, key), - declaredCO2.ToMinSignificantDigits(3, 1) + declaredCO2.ToMinSignificantDigits(3, 2) ), new XElement( tns + "Verified", new XAttribute(XMLNames.Report_Results_Unit_Attr, key), - verifiedCO2.ToMinSignificantDigits(3, 1) + verifiedCO2.ToMinSignificantDigits(3, 2) ) ), new XElement(tns + "C_VTP", cVtp.ToXMLFormat(4)));