diff --git a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
index 3f47fff9c026cf6b4c3d1e5b0887c7a52d156410..068610a21838be77dbdd175c94626fbd4d1f11be 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
@@ -84,7 +84,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Vehicle_CurbMassChassis, modelData.VehicleData.CurbWeight.ToXMLFormat(0)),
new XElement(tns + XMLNames.Report_Vehicle_EngineRatedPower, modelData.EngineData.RatedPowerDeclared.ToXMLFormat(0)),
new XElement(tns + XMLNames.Report_Vehicle_EngineDisplacement,
- modelData.EngineData.Displacement.ConvertToCubicCentiMeter().ToXMLFormat(0)),
+ modelData.EngineData.Displacement.ConvertToCubicCentiMeter().ToXMLFormat(0)),
new XElement(tns + XMLNames.Engine_FuelType, modelData.EngineData.FuelType.ToXMLFormat()),
new XElement(tns + XMLNames.Report_Vehicle_TransmissionCertificationMethod,
modelData.GearboxData.CertificationMethod.ToXMLFormat()),
@@ -165,6 +165,7 @@ namespace TUGraz.VectoCore.OutputData.XML
results.AddFirst(new XElement(tns + XMLNames.Report_Result_Status, allSuccess ? "success" : "error"));
var vehicle = new XElement(VehiclePart);
vehicle.Add(InputDataIntegrity);
+ retVal.Add(new XProcessingInstruction("xml-stylesheet", "href=\"https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css\""));
retVal.Add(new XElement(tns + XMLNames.VectoCustomerReport,
new XAttribute("schemaVersion", CURRENT_SCHEMA_VERSION),
new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName),
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
index 79bc8ca095069000d4d533a6b449a77f6a414bbb..a5876323b2763a1a77581e472f22876a043f240a 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
@@ -176,14 +176,14 @@ namespace TUGraz.VectoCore.OutputData.XML
var retVal = new List<XElement> {
new XElement(tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"),
- (result.FuelConsumptionTotal / result.Distance).ConvertToGrammPerKiloMeter().ToMinSignificantDigits(3, 1)),
+ (result.FuelConsumptionTotal / result.Distance).ConvertToGrammPerKiloMeter().ToMinSignificantDigits(3, 1)),
new XElement(tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/t-km"),
- (result.FuelConsumptionTotal / result.Distance / result.Payload).ConvertToGrammPerTonKilometer().ToMinSignificantDigits(3, 1)),
+ (result.FuelConsumptionTotal / result.Distance / result.Payload).ConvertToGrammPerTonKilometer().ToMinSignificantDigits(3, 1)),
result.CargoVolume > 0
? new XElement(tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/m³-km"),
- (result.FuelConsumptionTotal.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / result.CargoVolume)
+ (result.FuelConsumptionTotal.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / result.CargoVolume)
.Value
().ToMinSignificantDigits(3, 1))
: null
@@ -192,43 +192,43 @@ namespace TUGraz.VectoCore.OutputData.XML
if (fullOutput) {
retVal.Add(new XElement(tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/km"),
- (result.EnergyConsumptionTotal / result.Distance.ConvertToKiloMeter() / 1e6).Value().ToMinSignificantDigits(3, 1)));
+ (result.EnergyConsumptionTotal / result.Distance.ConvertToKiloMeter() / 1e6).Value().ToMinSignificantDigits(3, 1)));
retVal.Add(new XElement(tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/t-km"),
- (result.EnergyConsumptionTotal / result.Distance.ConvertToKiloMeter() / result.Payload.ConvertToTon() / 1e6)
+ (result.EnergyConsumptionTotal / result.Distance.ConvertToKiloMeter() / result.Payload.ConvertToTon() / 1e6)
.Value().ToMinSignificantDigits(3, 1)));
- if (result.CargoVolume > 0)
+ if (result.CargoVolume > 0)
retVal.Add(new XElement(tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/m³-km"),
- (result.EnergyConsumptionTotal / result.Distance.ConvertToKiloMeter() / result.CargoVolume / 1e6).Value()
+ (result.EnergyConsumptionTotal / result.Distance.ConvertToKiloMeter() / result.CargoVolume / 1e6).Value()
.ToMinSignificantDigits(3, 1)));
}
if (fuel.FuelDensity != null) {
retVal.Add(new XElement(tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/100km"),
- (result.FuelConsumptionTotal.ConvertToGramm() / fuel.FuelDensity / result.Distance.ConvertToKiloMeter() * 100)
+ (result.FuelConsumptionTotal.ConvertToGramm() / fuel.FuelDensity / result.Distance.ConvertToKiloMeter() * 100)
.Value().ToMinSignificantDigits(3, 1)));
retVal.Add(new XElement(tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/t-km"),
- (result.FuelConsumptionTotal.ConvertToGramm() / fuel.FuelDensity / result.Distance.ConvertToKiloMeter() /
- result.Payload.ConvertToTon()).Value().ToMinSignificantDigits(3, 1)));
- if (result.CargoVolume > 0)
+ (result.FuelConsumptionTotal.ConvertToGramm() / fuel.FuelDensity / result.Distance.ConvertToKiloMeter() /
+ result.Payload.ConvertToTon()).Value().ToMinSignificantDigits(3, 1)));
+ if (result.CargoVolume > 0)
retVal.Add(new XElement(tns + XMLNames.Report_Results_FuelConsumption,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/m³-km"),
- (result.FuelConsumptionTotal.ConvertToGramm() / fuel.FuelDensity / result.Distance.ConvertToKiloMeter() /
+ (result.FuelConsumptionTotal.ConvertToGramm() / fuel.FuelDensity / result.Distance.ConvertToKiloMeter() /
result.CargoVolume).Value().ToMinSignificantDigits(3, 1)));
}
//CO2
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, 1)));
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)));
- if (result.CargoVolume > 0)
+ (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter() /
+ result.Payload.ConvertToTon()).ToMinSignificantDigits(3, 1)));
+ 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()
+ (result.CO2Total.ConvertToGramm() / result.Distance.ConvertToKiloMeter() / result.CargoVolume).Value()
.ToMinSignificantDigits(3, 1)));
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
index 65cf2403e73f05e7da0ff5310bec03a57a990722..e51859b927dfaff71288a392165b92608d07c782 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
@@ -134,7 +134,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Engine_IdlingSpeed, engineData.IdleSpeed.AsRPM.ToXMLFormat(0)),
new XElement(tns + XMLNames.Engine_RatedSpeed, engineData.RatedSpeedDeclared.AsRPM.ToXMLFormat(0)),
new XElement(tns + XMLNames.Engine_Displacement,
- engineData.Displacement.ConvertToCubicCentiMeter().ToXMLFormat(0)),
+ engineData.Displacement.ConvertToCubicCentiMeter().ToXMLFormat(0)),
new XElement(tns + XMLNames.Engine_FuelType, engineData.FuelType.ToXMLFormat())
);
}
@@ -304,7 +304,7 @@ namespace TUGraz.VectoCore.OutputData.XML
{
return new object[] {
new XElement(tns + XMLNames.Report_ResultEntry_Distance, new XAttribute(XMLNames.Report_Results_Unit_Attr, "km"),
- result.Distance.ConvertToKiloMeter().ToXMLFormat(3)),
+ result.Distance.ConvertToKiloMeter().ToXMLFormat(3)),
new XElement(tns + XMLNames.Report_ResultEntry_SimulationParameters,
new XElement(tns + XMLNames.Report_ResultEntry_TotalVehicleMass,
new XAttribute(XMLNames.Report_Results_Unit_Attr, "kg"), result.TotalVehicleWeight.ToXMLFormat(0)),
@@ -348,6 +348,7 @@ namespace TUGraz.VectoCore.OutputData.XML
results.AddFirst(new XElement(tns + XMLNames.Report_Result_Status, allSuccess ? "success" : "error"));
var vehicle = new XElement(VehiclePart);
vehicle.Add(InputDataIntegrity);
+ retVal.Add(new XProcessingInstruction("xml-stylesheet", "href=\"https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css\""));
retVal.Add(new XElement(tns + XMLNames.VectoManufacturerReport,
new XAttribute("schemaVersion", CURRENT_SCHEMA_VERSION),
new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName),